2020-09-21 08:06:55

by Liu Shixin

Subject: [PATCH -next] scsi: libsas: simplify the return expression of sas_discover_end_dev

Simplify the return expression.

Signed-off-by: Liu Shixin <[email protected]>
---
drivers/scsi/libsas/sas_discover.c | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/drivers/scsi/libsas/sas_discover.c b/drivers/scsi/libsas/sas_discover.c
index d0f9e90e3279..161c9b387da7 100644
--- 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 ---------- */
--
2.25.1

2020-09-21 13:10:19

by John Garry

Subject: Re: [PATCH -next] scsi: libsas: simplify the return expression of sas_discover_end_dev

On 21/09/2020 09:24, Liu Shixin wrote:
> Simplify the return expression.
>
> Signed-off-by: Liu Shixin <[email protected]>
> ---
> drivers/scsi/libsas/sas_discover.c | 8 +-------
> 1 file changed, 1 insertion(+), 7 deletions(-)
>
> diff --git a/drivers/scsi/libsas/sas_discover.c b/drivers/scsi/libsas/sas_discover.c
> index d0f9e90e3279..161c9b387da7 100644
> --- 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 ---------- */
>

You can make a similar change at the end of sas_discover_data() [and
include in the same patch]

2020-09-21 13:27:11

by Liu Shixin

Subject: [PATCH -next] scsi: libsas: simplify the return expression of sas_discover_* functions

Simplify the return expression.

Signed-off-by: Liu Shixin <[email protected]>
---
drivers/scsi/libsas/sas_ata.c | 8 +-------
drivers/scsi/libsas/sas_discover.c | 8 +-------
2 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/drivers/scsi/libsas/sas_ata.c b/drivers/scsi/libsas/sas_ata.c
index a4887985aad6..024e5a550759 100644
--- 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 d0f9e90e3279..161c9b387da7 100644
--- 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 ---------- */
--
2.25.1

2020-09-21 13:48:40

by Jason Yan

Subject: Re: [PATCH -next] scsi: libsas: simplify the return expression of sas_discover_* functions

?? 2020/9/21 21:45, Liu Shixin д??:
> Simplify the return expression.
>
> Signed-off-by: Liu Shixin <[email protected]>
> ---
> drivers/scsi/libsas/sas_ata.c | 8 +-------
> drivers/scsi/libsas/sas_discover.c | 8 +-------
> 2 files changed, 2 insertions(+), 14 deletions(-)
>
> diff --git a/drivers/scsi/libsas/sas_ata.c b/drivers/scsi/libsas/sas_ata.c
> index a4887985aad6..024e5a550759 100644
> --- 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 d0f9e90e3279..161c9b387da7 100644
> --- 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 ---------- */
>

Please add a version descriptor and describe the change against the
first version next time . Otherwise this looks good to me.

Reviewed-by: Jason Yan <[email protected]>

Thanks,
Jason

2020-09-23 01:04:06

by Martin K. Petersen

Subject: Re: [PATCH -next] scsi: libsas: simplify the return expression of sas_discover_* functions

Liu,

> Simplify the return expression.

Applied to 5.10/scsi-staging, thanks!

--
Martin K. Petersen Oracle Linux Engineering

2020-09-30 03:36:49

by Martin K. Petersen

Subject: Re: [PATCH -next] scsi: libsas: simplify the return expression of sas_discover_* functions

On Mon, 21 Sep 2020 21:45:58 +0800, Liu Shixin wrote:

> Simplify the return expression.

Applied to 5.10/scsi-queue, thanks!

[1/1] scsi: libsas: Simplify the return expression of sas_discover_* functions
https://git.kernel.org/mkp/scsi/c/3d1a99e2b540

--
Martin K. Petersen Oracle Linux Engineering