[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>

1 files changed, 1 insertions, 6 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);