Re: [PATCH] libata-scsi: Delete an unnecessary variable in ata_scsi_slave_config()

[Tejun Heo]

On Fri, Feb 16, 2018 at 06:26:30PM +0100, SF Markus Elfring wrote:
> From: Markus Elfring <elfring@xxxxxxxxxxxxxxxxxxxxx>
> Date: Fri, 16 Feb 2018 18:19:13 +0100
> 
> * Return a result code without storing it in an intermediate variable.
> 
> * Reduce the needed source code.
> 
> Signed-off-by: Markus Elfring <elfring@xxxxxxxxxxxxxxxxxxxxx>
> ---
>  drivers/ata/libata-scsi.c | 7 +------
>  1 file changed, 1 insertion(+), 6 deletions(-)
> 
> diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c
> index 66be961c93a4..93456cff051b 100644
> --- a/drivers/ata/libata-scsi.c
> +++ b/drivers/ata/libata-scsi.c
> @@ -1345,14 +1345,9 @@ int ata_scsi_slave_config(struct scsi_device *sdev)
>  {
>  	struct ata_port *ap = ata_shost_to_port(sdev->host);
>  	struct ata_device *dev = __ata_scsi_find_dev(ap, sdev);
> -	int rc = 0;
>  
>  	ata_scsi_sdev_config(sdev);
> -
> -	if (dev)
> -		rc = ata_scsi_dev_config(sdev, dev);
> -
> -	return rc;
> +	return dev ? ata_scsi_dev_config(sdev, dev) : 0;

Let's do the following instead.

	if (dev)
		return ata_scsi..;
	else
		return 0;

Thanks.

-- 
tejun