sysfs.h: remove attr_name() macro

Gotta love a macro that doesn't reduce the typing you have to do.

Also, only the driver core, and one network driver uses this.  The
driver core functions will be going away soon, and I'll convert the
network driver soon to not need this as well, so delete it for now
before anyone else gets some bright ideas and wants to use it.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/base/bus.c b/drivers/base/bus.c
index f099af0b41af951e76fc5bafb369910cb6fe75b6..235e2b06ac0550df4ee0ae7471ae775151ae43ed 100644 (file)
--- a/drivers/base/bus.c
+++ b/drivers/base/bus.c
@@ -460,7 +460,7 @@ static int device_add_attrs(struct bus_type *bus, struct device *dev)
        if (!bus->dev_attrs)
                return 0;
 
-       for (i = 0; attr_name(bus->dev_attrs[i]); i++) {
+       for (i = 0; bus->dev_attrs[i].attr.name; i++) {
                error = device_create_file(dev, &bus->dev_attrs[i]);
                if (error) {
                        while (--i >= 0)
@@ -476,7 +476,7 @@ static void device_remove_attrs(struct bus_type *bus, struct device *dev)
        int i;
 
        if (bus->dev_attrs) {
-               for (i = 0; attr_name(bus->dev_attrs[i]); i++)
+               for (i = 0; bus->dev_attrs[i].attr.name; i++)
                        device_remove_file(dev, &bus->dev_attrs[i]);
        }
 }
@@ -596,7 +596,7 @@ static int driver_add_attrs(struct bus_type *bus, struct device_driver *drv)
        int i;
 
        if (bus->drv_attrs) {
-               for (i = 0; attr_name(bus->drv_attrs[i]); i++) {
+               for (i = 0; bus->drv_attrs[i].attr.name; i++) {
                        error = driver_create_file(drv, &bus->drv_attrs[i]);
                        if (error)
                                goto err;
@@ -616,7 +616,7 @@ static void driver_remove_attrs(struct bus_type *bus,
        int i;
 
        if (bus->drv_attrs) {
-               for (i = 0; attr_name(bus->drv_attrs[i]); i++)
+               for (i = 0; bus->drv_attrs[i].attr.name; i++)
                        driver_remove_file(drv, &bus->drv_attrs[i]);
        }
 }
@@ -857,7 +857,7 @@ static int bus_add_attrs(struct bus_type *bus)
        int i;
 
        if (bus->bus_attrs) {
-               for (i = 0; attr_name(bus->bus_attrs[i]); i++) {
+               for (i = 0; bus->bus_attrs[i].attr.name; i++) {
                        error = bus_create_file(bus, &bus->bus_attrs[i]);
                        if (error)
                                goto err;
@@ -876,7 +876,7 @@ static void bus_remove_attrs(struct bus_type *bus)
        int i;
 
        if (bus->bus_attrs) {
-               for (i = 0; attr_name(bus->bus_attrs[i]); i++)
+               for (i = 0; bus->bus_attrs[i].attr.name; i++)
                        bus_remove_file(bus, &bus->bus_attrs[i]);
        }
 }

diff --git a/drivers/base/class.c b/drivers/base/class.c
index 3ce8454713275a2bc7ab15a808e0c66dcfbece83..8b7818b800569b287536cb366080af3e92f393f2 100644 (file)
--- a/drivers/base/class.c
+++ b/drivers/base/class.c
@@ -135,7 +135,7 @@ static int add_class_attrs(struct class *cls)
        int error = 0;
 
        if (cls->class_attrs) {
-               for (i = 0; attr_name(cls->class_attrs[i]); i++) {
+               for (i = 0; cls->class_attrs[i].attr.name; i++) {
                        error = class_create_file(cls, &cls->class_attrs[i]);
                        if (error)
                                goto error;
@@ -154,7 +154,7 @@ static void remove_class_attrs(struct class *cls)
        int i;
 
        if (cls->class_attrs) {
-               for (i = 0; attr_name(cls->class_attrs[i]); i++)
+               for (i = 0; cls->class_attrs[i].attr.name; i++)
                        class_remove_file(cls, &cls->class_attrs[i]);
        }
 }

diff --git a/drivers/base/core.c b/drivers/base/core.c
index d743dcee1e77ddcdc1cab0808f48ff262359e54c..ae1acdf21bd304d48608a00e73e68a72565aeebe 100644 (file)
--- a/drivers/base/core.c
+++ b/drivers/base/core.c
@@ -440,7 +440,7 @@ static int device_add_attributes(struct device *dev,
        int i;
 
        if (attrs) {
-               for (i = 0; attr_name(attrs[i]); i++) {
+               for (i = 0; attrs[i].attr.name; i++) {
                        error = device_create_file(dev, &attrs[i]);
                        if (error)
                                break;
@@ -458,7 +458,7 @@ static void device_remove_attributes(struct device *dev,
        int i;
 
        if (attrs)
-               for (i = 0; attr_name(attrs[i]); i++)
+               for (i = 0; attrs[i].attr.name; i++)
                        device_remove_file(dev, &attrs[i]);
 }
 
@@ -469,7 +469,7 @@ static int device_add_bin_attributes(struct device *dev,
        int i;
 
        if (attrs) {
-               for (i = 0; attr_name(attrs[i]); i++) {
+               for (i = 0; attrs[i].attr.name; i++) {
                        error = device_create_bin_file(dev, &attrs[i]);
                        if (error)
                                break;
@@ -487,7 +487,7 @@ static void device_remove_bin_attributes(struct device *dev,
        int i;
 
        if (attrs)
-               for (i = 0; attr_name(attrs[i]); i++)
+               for (i = 0; attrs[i].attr.name; i++)
                        device_remove_bin_file(dev, &attrs[i]);
 }
 

diff --git a/drivers/net/ethernet/sun/niu.c b/drivers/net/ethernet/sun/niu.c
index fa322409bff33376dbedc59f6921a2337a60eebc..52b2adf63cbf1abd78de6f338e18a937da7bc307 100644 (file)
--- a/drivers/net/ethernet/sun/niu.c
+++ b/drivers/net/ethernet/sun/niu.c
@@ -9478,7 +9478,7 @@ static struct niu_parent *niu_new_parent(struct niu *np,
        if (IS_ERR(plat_dev))
                return NULL;
 
-       for (i = 0; attr_name(niu_parent_attributes[i]); i++) {
+       for (i = 0; niu_parent_attributes[i].attr.name; i++) {
                int err = device_create_file(&plat_dev->dev,
                                             &niu_parent_attributes[i]);
                if (err)

diff --git a/include/linux/sysfs.h b/include/linux/sysfs.h
index a864b8d918ee2bd7b2eac541f0b142600dee64f6..b5a9d9b26bd4b55f7de031896fbedaa0ea15ee91 100644 (file)
--- a/include/linux/sysfs.h
+++ b/include/linux/sysfs.h
@@ -108,8 +108,6 @@ static const struct attribute_group _name##_group = {               \
 };                                                             \
 __ATTRIBUTE_GROUPS(_name)
 
-#define attr_name(_attr) (_attr).attr.name
-
 struct file;
 struct vm_area_struct;