driver-core: make devt_attr and uevent_attr static

devt_attr and uevent_attr are either allocated dynamically with or
embedded in device and class_device as they needed their owner field
set to the module implementing the driver.  Now that sysfs implements
immediate disconnect and owner field removed from struct attribute,
there is no reason to do this.  Remove these attributes from
[class_]device and use static attribute structures instead.

Signed-off-by: Tejun Heo <htejun@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

2 files changed, 31 insertions, 58 deletions

diff --git a/drivers/base/class.c b/drivers/base/class.c
index 9cbfde23b9e..4d2222618b7 100644
--- a/drivers/base/class.c
+++ b/drivers/base/class.c
@@ -312,9 +312,6 @@ static void class_dev_release(struct kobject * kobj)
 
         pr_debug("device class '%s': release.\n", cd->class_id);
 
-        kfree(cd->devt_attr);
-        cd->devt_attr = NULL;
-
         if (cd->release)
                 cd->release(cd);
         else if (cls->release)
@@ -547,6 +544,9 @@ static ssize_t show_dev(struct class_device *class_dev, char *buf)
         return print_dev_t(buf, class_dev->devt);
 }
 
+static struct class_device_attribute class_devt_attr =
+        __ATTR(dev, S_IRUGO, show_dev, NULL);
+
 static ssize_t store_uevent(struct class_device *class_dev,
                             const char *buf, size_t count)
 {
@@ -554,6 +554,9 @@ static ssize_t store_uevent(struct class_device *class_dev,
         return count;
 }
 
+static struct class_device_attribute class_uevent_attr =
+        __ATTR(uevent, S_IWUSR, NULL, store_uevent);
+
 void class_device_initialize(struct class_device *class_dev)
 {
         kobj_set_kset_s(class_dev, class_obj_subsys);
@@ -603,30 +606,15 @@ int class_device_add(struct class_device *class_dev)
                                   &parent_class->subsys.kobj, "subsystem");
         if (error)
                 goto out3;
-        class_dev->uevent_attr.attr.name = "uevent";
-        class_dev->uevent_attr.attr.mode = S_IWUSR;
-        class_dev->uevent_attr.store = store_uevent;
-        error = class_device_create_file(class_dev, &class_dev->uevent_attr);
+
+        error = class_device_create_file(class_dev, &class_uevent_attr);
         if (error)
                 goto out3;
 
         if (MAJOR(class_dev->devt)) {
-                struct class_device_attribute *attr;
-                attr = kzalloc(sizeof(*attr), GFP_KERNEL);
-                if (!attr) {
-                        error = -ENOMEM;
-                        goto out4;
-                }
-                attr->attr.name = "dev";
-                attr->attr.mode = S_IRUGO;
-                attr->show = show_dev;
-                error = class_device_create_file(class_dev, attr);
-                if (error) {
-                        kfree(attr);
+                error = class_device_create_file(class_dev, &class_devt_attr);
+                if (error)
                         goto out4;
-                }
-
-                class_dev->devt_attr = attr;
         }
 
         error = class_device_add_attrs(class_dev);
@@ -669,10 +657,10 @@ int class_device_add(struct class_device *class_dev)
  out6:
         class_device_remove_attrs(class_dev);
  out5:
-        if (class_dev->devt_attr)
-                class_device_remove_file(class_dev, class_dev->devt_attr);
+        if (MAJOR(class_dev->devt))
+                class_device_remove_file(class_dev, &class_devt_attr);
  out4:
-        class_device_remove_file(class_dev, &class_dev->uevent_attr);
+        class_device_remove_file(class_dev, &class_uevent_attr);
  out3:
         kobject_del(&class_dev->kobj);
  out2:
@@ -772,9 +760,9 @@ void class_device_del(struct class_device *class_dev)
                 sysfs_remove_link(&class_dev->kobj, "device");
         }
         sysfs_remove_link(&class_dev->kobj, "subsystem");
-        class_device_remove_file(class_dev, &class_dev->uevent_attr);
-        if (class_dev->devt_attr)
-                class_device_remove_file(class_dev, class_dev->devt_attr);
+        class_device_remove_file(class_dev, &class_uevent_attr);
+        if (MAJOR(class_dev->devt))
+                class_device_remove_file(class_dev, &class_devt_attr);
         class_device_remove_attrs(class_dev);
         class_device_remove_groups(class_dev);
 
diff --git a/drivers/base/core.c b/drivers/base/core.c
index e3fb87bfc6e..0455aa78fa1 100644
--- a/drivers/base/core.c
+++ b/drivers/base/core.c
@@ -310,6 +310,9 @@ static ssize_t store_uevent(struct device *dev, struct device_attribute *attr,
         return count;
 }
 
+static struct device_attribute uevent_attr =
+        __ATTR(uevent, S_IRUGO | S_IWUSR, show_uevent, store_uevent);
+
 static int device_add_attributes(struct device *dev,
                                  struct device_attribute *attrs)
 {
@@ -423,6 +426,9 @@ static ssize_t show_dev(struct device *dev, struct device_attribute *attr,
         return print_dev_t(buf, dev->devt);
 }
 
+static struct device_attribute devt_attr =
+        __ATTR(dev, S_IRUGO, show_dev, NULL);
+
 /*
  *      devices_subsys - structure to be registered with kobject core.
  */
@@ -681,31 +687,14 @@ int device_add(struct device *dev)
                 blocking_notifier_call_chain(&dev->bus->bus_notifier,
                                              BUS_NOTIFY_ADD_DEVICE, dev);
 
-        dev->uevent_attr.attr.name = "uevent";
-        dev->uevent_attr.attr.mode = S_IRUGO | S_IWUSR;
-        dev->uevent_attr.store = store_uevent;
-        dev->uevent_attr.show = show_uevent;
-        error = device_create_file(dev, &dev->uevent_attr);
+        error = device_create_file(dev, &uevent_attr);
         if (error)
                 goto attrError;
 
         if (MAJOR(dev->devt)) {
-                struct device_attribute *attr;
-                attr = kzalloc(sizeof(*attr), GFP_KERNEL);
-                if (!attr) {
-                        error = -ENOMEM;
-                        goto ueventattrError;
-                }
-                attr->attr.name = "dev";
-                attr->attr.mode = S_IRUGO;
-                attr->show = show_dev;
-                error = device_create_file(dev, attr);
-                if (error) {
-                        kfree(attr);
+                error = device_create_file(dev, &devt_attr);
+                if (error)
                         goto ueventattrError;
-                }
-
-                dev->devt_attr = attr;
         }
 
         if (dev->class) {
@@ -766,10 +755,8 @@ int device_add(struct device *dev)
                                              BUS_NOTIFY_DEL_DEVICE, dev);
         device_remove_attrs(dev);
  AttrsError:
-        if (dev->devt_attr) {
-                device_remove_file(dev, dev->devt_attr);
-                kfree(dev->devt_attr);
-        }
+        if (MAJOR(dev->devt))
+                device_remove_file(dev, &devt_attr);
 
         if (dev->class) {
                 sysfs_remove_link(&dev->kobj, "subsystem");
@@ -791,7 +778,7 @@ int device_add(struct device *dev)
                 }
         }
  ueventattrError:
-        device_remove_file(dev, &dev->uevent_attr);
+        device_remove_file(dev, &uevent_attr);
  attrError:
         kobject_uevent(&dev->kobj, KOBJ_REMOVE);
         kobject_del(&dev->kobj);
@@ -868,10 +855,8 @@ void device_del(struct device * dev)
 
         if (parent)
                 klist_del(&dev->knode_parent);
-        if (dev->devt_attr) {
-                device_remove_file(dev, dev->devt_attr);
-                kfree(dev->devt_attr);
-        }
+        if (MAJOR(dev->devt))
+                device_remove_file(dev, &devt_attr);
         if (dev->class) {
                 sysfs_remove_link(&dev->kobj, "subsystem");
                 /* If this is not a "fake" compatible device, remove the
@@ -925,7 +910,7 @@ void device_del(struct device * dev)
                         up(&dev->class->sem);
                 }
         }
-        device_remove_file(dev, &dev->uevent_attr);
+        device_remove_file(dev, &uevent_attr);
         device_remove_attrs(dev);
         bus_remove_device(dev);