[SCSI] zfcp: cleanup port sysfs attribute usage

Let the driver core handle device attribute creation and removal. This
will simplify the code and eliminates races between attribute
availability and userspace notification via uevents.

Reviewed-by: Steffen Maier <maier@linux.vnet.ibm.com>
Signed-off-by: Sebastian Ott <sebott@linux.vnet.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: Steffen Maier <maier@linux.vnet.ibm.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>

5 files changed, 10 insertions, 15 deletions

diff --git a/drivers/s390/scsi/zfcp_aux.c b/drivers/s390/scsi/zfcp_aux.c
index f6adde44f226..aa2aee64e60b 100644
--- a/drivers/s390/scsi/zfcp_aux.c
+++ b/drivers/s390/scsi/zfcp_aux.c
@@ -530,6 +530,7 @@ struct zfcp_port *zfcp_port_enqueue(struct zfcp_adapter *adapter, u64 wwpn,
         port->wwpn = wwpn;
         port->rport_task = RPORT_NONE;
         port->dev.parent = &adapter->ccw_device->dev;
+        port->dev.groups = zfcp_port_attr_groups;
         port->dev.release = zfcp_port_release;
 
         if (dev_set_name(&port->dev, "0x%016llx", (unsigned long long)wwpn)) {
@@ -543,10 +544,6 @@ struct zfcp_port *zfcp_port_enqueue(struct zfcp_adapter *adapter, u64 wwpn,
                 goto err_out;
         }
 
-        if (sysfs_create_group(&port->dev.kobj,
-                               &zfcp_sysfs_port_attrs))
-                goto err_out_put;
-
         write_lock_irq(&adapter->port_list_lock);
         list_add_tail(&port->list, &adapter->port_list);
         write_unlock_irq(&adapter->port_list_lock);
@@ -555,8 +552,6 @@ struct zfcp_port *zfcp_port_enqueue(struct zfcp_adapter *adapter, u64 wwpn,
 
         return port;
 
-err_out_put:
-        device_unregister(&port->dev);
 err_out:
         zfcp_ccw_adapter_put(adapter);
         return ERR_PTR(retval);
diff --git a/drivers/s390/scsi/zfcp_ccw.c b/drivers/s390/scsi/zfcp_ccw.c
index f2dd3a0a39eb..202f39572880 100644
--- a/drivers/s390/scsi/zfcp_ccw.c
+++ b/drivers/s390/scsi/zfcp_ccw.c
@@ -132,7 +132,7 @@ static void zfcp_ccw_remove(struct ccw_device *cdev)
                 zfcp_device_unregister(&unit->dev, &zfcp_sysfs_unit_attrs);
 
         list_for_each_entry_safe(port, p, &port_remove_lh, list)
-                zfcp_device_unregister(&port->dev, &zfcp_sysfs_port_attrs);
+                device_unregister(&port->dev);
 
         zfcp_adapter_unregister(adapter);
 }
diff --git a/drivers/s390/scsi/zfcp_ext.h b/drivers/s390/scsi/zfcp_ext.h
index 1d3dd3f7d699..695b133364a8 100644
--- a/drivers/s390/scsi/zfcp_ext.h
+++ b/drivers/s390/scsi/zfcp_ext.h
@@ -160,7 +160,7 @@ extern void zfcp_scsi_dif_sense_error(struct scsi_cmnd *, int);
 /* zfcp_sysfs.c */
 extern struct attribute_group zfcp_sysfs_unit_attrs;
 extern struct attribute_group zfcp_sysfs_adapter_attrs;
-extern struct attribute_group zfcp_sysfs_port_attrs;
+extern const struct attribute_group *zfcp_port_attr_groups[];
 extern struct mutex zfcp_sysfs_port_units_mutex;
 extern struct device_attribute *zfcp_sysfs_sdev_attrs[];
 extern struct device_attribute *zfcp_sysfs_shost_attrs[];
diff --git a/drivers/s390/scsi/zfcp_fc.c b/drivers/s390/scsi/zfcp_fc.c
index ff598cd68b2d..ca28e1c66115 100644
--- a/drivers/s390/scsi/zfcp_fc.c
+++ b/drivers/s390/scsi/zfcp_fc.c
@@ -668,7 +668,7 @@ static int zfcp_fc_eval_gpn_ft(struct zfcp_fc_req *fc_req,
 
         list_for_each_entry_safe(port, tmp, &remove_lh, list) {
                 zfcp_erp_port_shutdown(port, 0, "fcegpf2");
-                zfcp_device_unregister(&port->dev, &zfcp_sysfs_port_attrs);
+                device_unregister(&port->dev);
         }
 
         return ret;
diff --git a/drivers/s390/scsi/zfcp_sysfs.c b/drivers/s390/scsi/zfcp_sysfs.c
index 1e0eb089dfba..d9261264a2b6 100644
--- a/drivers/s390/scsi/zfcp_sysfs.c
+++ b/drivers/s390/scsi/zfcp_sysfs.c
@@ -268,7 +268,7 @@ static ssize_t zfcp_sysfs_port_remove_store(struct device *dev,
         put_device(&port->dev);
 
         zfcp_erp_port_shutdown(port, 0, "syprs_1");
-        zfcp_device_unregister(&port->dev, &zfcp_sysfs_port_attrs);
+        device_unregister(&port->dev);
  out:
         zfcp_ccw_adapter_put(adapter);
         return retval ? retval : (ssize_t) count;
@@ -340,13 +340,13 @@ static struct attribute *zfcp_port_attrs[] = {
         &dev_attr_port_access_denied.attr,
         NULL
 };
-
-/**
- * zfcp_sysfs_port_attrs - sysfs attributes for all other ports
- */
-struct attribute_group zfcp_sysfs_port_attrs = {
+static struct attribute_group zfcp_port_attr_group = {
         .attrs = zfcp_port_attrs,
 };
+const struct attribute_group *zfcp_port_attr_groups[] = {
+        &zfcp_port_attr_group,
+        NULL,
+};
 
 static struct attribute *zfcp_unit_attrs[] = {
         &dev_attr_unit_failed.attr,