Have the `put_device()` call after `device_unregister()` in both
`zfcp_unit_remove()` and `zfcp_sysfs_port_remove_store()` to make
it more natural, for put_device() ought to be the last time we
touch the object in both functions.

Suggested-by: Benjamin Block <bbl...@linux.ibm.com>
Signed-off-by: Qinglang Miao <miaoqingl...@huawei.com>
---
 drivers/s390/scsi/zfcp_sysfs.c | 4 ++--
 drivers/s390/scsi/zfcp_unit.c  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/s390/scsi/zfcp_sysfs.c b/drivers/s390/scsi/zfcp_sysfs.c
index 8d9662e8b..edfeed4ba 100644
--- a/drivers/s390/scsi/zfcp_sysfs.c
+++ b/drivers/s390/scsi/zfcp_sysfs.c
@@ -327,10 +327,10 @@ static ssize_t zfcp_sysfs_port_remove_store(struct device 
*dev,
        list_del(&port->list);
        write_unlock_irq(&adapter->port_list_lock);
 
-       put_device(&port->dev);
-
        zfcp_erp_port_shutdown(port, 0, "syprs_1");
        device_unregister(&port->dev);
+
+       put_device(&port->dev);
  out:
        zfcp_ccw_adapter_put(adapter);
        return retval ? retval : (ssize_t) count;
diff --git a/drivers/s390/scsi/zfcp_unit.c b/drivers/s390/scsi/zfcp_unit.c
index e67bf7388..4ee355ae1 100644
--- a/drivers/s390/scsi/zfcp_unit.c
+++ b/drivers/s390/scsi/zfcp_unit.c
@@ -255,9 +255,9 @@ int zfcp_unit_remove(struct zfcp_port *port, u64 fcp_lun)
                scsi_device_put(sdev);
        }
 
-       put_device(&unit->dev);
-
        device_unregister(&unit->dev);
 
+       put_device(&unit->dev);
+
        return 0;
 }
-- 
2.23.0

Reply via email to