sysfs.h: remove attr_name() macro

[cascardo/linux.git] / drivers / base / bus.c

diff --git a/drivers/base/bus.c b/drivers/base/bus.c
index f099af0..235e2b0 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]);
        }
 }