Merge branch 'linux-2.6'

3 files changed, 66 insertions, 90 deletions

diff --git a/drivers/pci/hotplug/acpiphp_ibm.c b/drivers/pci/hotplug/acpiphp_ibm.c
index 47d26b65e99a..750ebd7a4c10 100644
--- a/drivers/pci/hotplug/acpiphp_ibm.c
+++ b/drivers/pci/hotplug/acpiphp_ibm.c
@@ -429,7 +429,7 @@ static int __init ibm_acpiphp_init(void)
         int retval = 0;
         acpi_status status;
         struct acpi_device *device;
-        struct kobject *sysdir = &pci_hotplug_slots_subsys.kobj;
+        struct kobject *sysdir = &pci_hotplug_slots_kset->kobj;
 
         dbg("%s\n", __FUNCTION__);
 
@@ -476,7 +476,7 @@ init_return:
 static void __exit ibm_acpiphp_exit(void)
 {
         acpi_status status;
-        struct kobject *sysdir = &pci_hotplug_slots_subsys.kobj;
+        struct kobject *sysdir = &pci_hotplug_slots_kset->kobj;
 
         dbg("%s\n", __FUNCTION__);
 
diff --git a/drivers/pci/hotplug/pci_hotplug_core.c b/drivers/pci/hotplug/pci_hotplug_core.c
index 01c351c176ac..47bb0e1ff3fa 100644
--- a/drivers/pci/hotplug/pci_hotplug_core.c
+++ b/drivers/pci/hotplug/pci_hotplug_core.c
@@ -61,7 +61,7 @@ static int debug;
 
 static LIST_HEAD(pci_hotplug_slot_list);
 
-struct kset pci_hotplug_slots_subsys;
+struct kset *pci_hotplug_slots_kset;
 
 static ssize_t hotplug_slot_attr_show(struct kobject *kobj,
                 struct attribute *attr, char *buf)
@@ -96,8 +96,6 @@ static struct kobj_type hotplug_slot_ktype = {
         .release = &hotplug_slot_release,
 };
 
-decl_subsys_name(pci_hotplug_slots, slots, &hotplug_slot_ktype, NULL);
-
 /* these strings match up with the values in pci_bus_speed */
 static char *pci_bus_speed_strings[] = {
         "33 MHz PCI",           /* 0x00 */
@@ -632,18 +630,19 @@ int pci_hp_register (struct hotplug_slot *slot)
                 return -EINVAL;
         }
 
-        kobject_set_name(&slot->kobj, "%s", slot->name);
-        kobj_set_kset_s(slot, pci_hotplug_slots_subsys);
-
         /* this can fail if we have already registered a slot with the same name */
-        if (kobject_register(&slot->kobj)) {
-                err("Unable to register kobject");
+        slot->kobj.kset = pci_hotplug_slots_kset;
+        result = kobject_init_and_add(&slot->kobj, &hotplug_slot_ktype, NULL,
+                                      "%s", slot->name);
+        if (result) {
+                err("Unable to register kobject '%s'", slot->name);
                 return -EINVAL;
         }
-                
+
         list_add (&slot->slot_list, &pci_hotplug_slot_list);
 
         result = fs_add_slot (slot);
+        kobject_uevent(&slot->kobj, KOBJ_ADD);
         dbg ("Added slot %s to the list\n", slot->name);
         return result;
 }
@@ -672,7 +671,7 @@ int pci_hp_deregister (struct hotplug_slot *slot)
 
         fs_remove_slot (slot);
         dbg ("Removed slot %s from the list\n", slot->name);
-        kobject_unregister(&slot->kobj);
+        kobject_put(&slot->kobj);
         return 0;
 }
 
@@ -700,11 +699,15 @@ int __must_check pci_hp_change_slot_info(struct hotplug_slot *slot,
 static int __init pci_hotplug_init (void)
 {
         int result;
+        struct kset *pci_bus_kset;
 
-        kobj_set_kset_s(&pci_hotplug_slots_subsys, pci_bus_type.subsys);
-        result = subsystem_register(&pci_hotplug_slots_subsys);
-        if (result) {
-                err("Register subsys with error %d\n", result);
+        pci_bus_kset = bus_get_kset(&pci_bus_type);
+
+        pci_hotplug_slots_kset = kset_create_and_add("slots", NULL,
+                                                     &pci_bus_kset->kobj);
+        if (!pci_hotplug_slots_kset) {
+                result = -ENOMEM;
+                err("Register subsys error\n");
                 goto exit;
         }
         result = cpci_hotplug_init(debug);
@@ -715,9 +718,9 @@ static int __init pci_hotplug_init (void)
 
         info (DRIVER_DESC " version: " DRIVER_VERSION "\n");
         goto exit;
-        
+
 err_subsys:
-        subsystem_unregister(&pci_hotplug_slots_subsys);
+        kset_unregister(pci_hotplug_slots_kset);
 exit:
         return result;
 }
@@ -725,7 +728,7 @@ exit:
 static void __exit pci_hotplug_exit (void)
 {
         cpci_hotplug_exit();
-        subsystem_unregister(&pci_hotplug_slots_subsys);
+        kset_unregister(pci_hotplug_slots_kset);
 }
 
 module_init(pci_hotplug_init);
@@ -737,7 +740,7 @@ MODULE_LICENSE("GPL");
 module_param(debug, bool, 0644);
 MODULE_PARM_DESC(debug, "Debugging mode enabled or not");
 
-EXPORT_SYMBOL_GPL(pci_hotplug_slots_subsys);
+EXPORT_SYMBOL_GPL(pci_hotplug_slots_kset);
 EXPORT_SYMBOL_GPL(pci_hp_register);
 EXPORT_SYMBOL_GPL(pci_hp_deregister);
 EXPORT_SYMBOL_GPL(pci_hp_change_slot_info);
diff --git a/drivers/pci/hotplug/rpadlpar_sysfs.c b/drivers/pci/hotplug/rpadlpar_sysfs.c
index a080fedf0332..e32148a8fa12 100644
--- a/drivers/pci/hotplug/rpadlpar_sysfs.c
+++ b/drivers/pci/hotplug/rpadlpar_sysfs.c
@@ -23,44 +23,13 @@
 
 #define MAX_DRC_NAME_LEN 64
 
-/* Store return code of dlpar operation in attribute struct */
-struct dlpar_io_attr {
-        int rc;
-        struct attribute attr;
-        ssize_t (*store)(struct dlpar_io_attr *dlpar_attr, const char *buf,
-                size_t nbytes);
-};
 
-/* Common show callback for all attrs, display the return code
- * of the dlpar op */
-static ssize_t
-dlpar_attr_show(struct kobject * kobj, struct attribute * attr, char * buf)
-{
-        struct dlpar_io_attr *dlpar_attr = container_of(attr,
-                                                struct dlpar_io_attr, attr);
-        return sprintf(buf, "%d\n", dlpar_attr->rc);
-}
-
-static ssize_t
-dlpar_attr_store(struct kobject * kobj, struct attribute * attr,
-                 const char *buf, size_t nbytes)
-{
-        struct dlpar_io_attr *dlpar_attr = container_of(attr,
-                                                struct dlpar_io_attr, attr);
-        return dlpar_attr->store ?
-                dlpar_attr->store(dlpar_attr, buf, nbytes) : -EIO;
-}
-
-static struct sysfs_ops dlpar_attr_sysfs_ops = {
-        .show = dlpar_attr_show,
-        .store = dlpar_attr_store,
-};
-
-static ssize_t add_slot_store(struct dlpar_io_attr *dlpar_attr,
-                                const char *buf, size_t nbytes)
+static ssize_t add_slot_store(struct kobject *kobj, struct kobj_attribute *attr,
+                              const char *buf, size_t nbytes)
 {
         char drc_name[MAX_DRC_NAME_LEN];
         char *end;
+        int rc;
 
         if (nbytes >= MAX_DRC_NAME_LEN)
                 return 0;
@@ -72,15 +41,25 @@ static ssize_t add_slot_store(struct dlpar_io_attr *dlpar_attr,
                 end = &drc_name[nbytes];
         *end = '\0';
 
-        dlpar_attr->rc = dlpar_add_slot(drc_name);
+        rc = dlpar_add_slot(drc_name);
+        if (rc)
+                return rc;
 
         return nbytes;
 }
 
-static ssize_t remove_slot_store(struct dlpar_io_attr *dlpar_attr,
-                                const char *buf, size_t nbytes)
+static ssize_t add_slot_show(struct kobject *kobj,
+                             struct kobj_attribute *attr, char *buf)
+{
+        return sprintf(buf, "0\n");
+}
+
+static ssize_t remove_slot_store(struct kobject *kobj,
+                                 struct kobj_attribute *attr,
+                                 const char *buf, size_t nbytes)
 {
         char drc_name[MAX_DRC_NAME_LEN];
+        int rc;
         char *end;
 
         if (nbytes >= MAX_DRC_NAME_LEN)
@@ -93,22 +72,24 @@ static ssize_t remove_slot_store(struct dlpar_io_attr *dlpar_attr,
                 end = &drc_name[nbytes];
         *end = '\0';
 
-        dlpar_attr->rc = dlpar_remove_slot(drc_name);
+        rc = dlpar_remove_slot(drc_name);
+        if (rc)
+                return rc;
 
         return nbytes;
 }
 
-static struct dlpar_io_attr add_slot_attr = {
-        .rc = 0,
-        .attr = { .name = ADD_SLOT_ATTR_NAME, .mode = 0644, },
-        .store = add_slot_store,
-};
+static ssize_t remove_slot_show(struct kobject *kobj,
+                                struct kobj_attribute *attr, char *buf)
+{
+        return sprintf(buf, "0\n");
+}
 
-static struct dlpar_io_attr remove_slot_attr = {
-        .rc = 0,
-        .attr = { .name = REMOVE_SLOT_ATTR_NAME, .mode = 0644},
-        .store = remove_slot_store,
-};
+static struct kobj_attribute add_slot_attr =
+        __ATTR(ADD_SLOT_ATTR_NAME, 0644, add_slot_show, add_slot_store);
+
+static struct kobj_attribute remove_slot_attr =
+        __ATTR(REMOVE_SLOT_ATTR_NAME, 0644, remove_slot_show, remove_slot_store);
 
 static struct attribute *default_attrs[] = {
         &add_slot_attr.attr,
@@ -116,37 +97,29 @@ static struct attribute *default_attrs[] = {
         NULL,
 };
 
-static void dlpar_io_release(struct kobject *kobj)
-{
-        /* noop */
-        return;
-}
-
-struct kobj_type ktype_dlpar_io = {
-        .release = dlpar_io_release,
-        .sysfs_ops = &dlpar_attr_sysfs_ops,
-        .default_attrs = default_attrs,
+static struct attribute_group dlpar_attr_group = {
+        .attrs = default_attrs,
 };
 
-struct kset dlpar_io_kset = {
-        .kobj = {.ktype = &ktype_dlpar_io,
-                 .parent = &pci_hotplug_slots_subsys.kobj},
-        .ktype = &ktype_dlpar_io,
-};
+static struct kobject *dlpar_kobj;
 
 int dlpar_sysfs_init(void)
 {
-        kobject_set_name(&dlpar_io_kset.kobj, DLPAR_KOBJ_NAME);
-        if (kset_register(&dlpar_io_kset)) {
-                printk(KERN_ERR "rpadlpar_io: cannot register kset for %s\n",
-                                kobject_name(&dlpar_io_kset.kobj));
+        int error;
+
+        dlpar_kobj = kobject_create_and_add(DLPAR_KOBJ_NAME,
+                                            &pci_hotplug_slots_kset->kobj);
+        if (!dlpar_kobj)
                 return -EINVAL;
-        }
 
-        return 0;
+        error = sysfs_create_group(dlpar_kobj, &dlpar_attr_group);
+        if (error)
+                kobject_put(dlpar_kobj);
+        return error;
 }
 
 void dlpar_sysfs_exit(void)
 {
-        kset_unregister(&dlpar_io_kset);
+        sysfs_remove_group(dlpar_kobj, &dlpar_attr_group);
+        kobject_put(dlpar_kobj);
 }