scsi: libsas: Simplify the return expression of sas_discover_* functions

Simplify the return expression.

Link: https://lore.kernel.org/r/20200921134558.3478922-1-liushixin2@huawei.com
Reviewed-by: Jason Yan <yanaijie@huawei.com>
Signed-off-by: Liu Shixin <liushixin2@huawei.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/scsi/libsas/sas_ata.c b/drivers/scsi/libsas/sas_ata.c
index 8b424c8ab834f7e7f629fce3a792b3cf846ab54b..6f58ace9a37761aae44033d4e1a2a39d912c913b 100644 (file)
--- a/drivers/scsi/libsas/sas_ata.c
+++ b/drivers/scsi/libsas/sas_ata.c
@@ -726,19 +726,13 @@ void sas_resume_sata(struct asd_sas_port *port)
  */
 int sas_discover_sata(struct domain_device *dev)
 {
-       int res;
-
        if (dev->dev_type == SAS_SATA_PM)
                return -ENODEV;
 
        dev->sata_dev.class = sas_get_ata_command_set(dev);
        sas_fill_in_rphy(dev, dev->rphy);
 
-       res = sas_notify_lldd_dev_found(dev);
-       if (res)
-               return res;
-
-       return 0;
+       return sas_notify_lldd_dev_found(dev);
 }
 
 static void async_sas_ata_eh(void *data, async_cookie_t cookie)

diff --git a/drivers/scsi/libsas/sas_discover.c b/drivers/scsi/libsas/sas_discover.c
index 13ad2b3d314e27bdd4621d05124ac44da55febd2..0f86a1fc64683feb54c2988b4779615ad2b54a6c 100644 (file)
--- a/drivers/scsi/libsas/sas_discover.c
+++ b/drivers/scsi/libsas/sas_discover.c
@@ -278,13 +278,7 @@ static void sas_resume_devices(struct work_struct *work)
  */
 int sas_discover_end_dev(struct domain_device *dev)
 {
-       int res;
-
-       res = sas_notify_lldd_dev_found(dev);
-       if (res)
-               return res;
-
-       return 0;
+       return sas_notify_lldd_dev_found(dev);
 }
 
 /* ---------- Device registration and unregistration ---------- */