2015-11-30 14:32:16

by Luis de Bethencourt

Subject: [RESEND] scsi: mvsas: fix misleading indentation

Fix a smatch warning:
drivers/scsi/mvsas/mv_sas.c:740 mvs_task_prep() warn: curly braces intended?

The code is correct, the indention is misleading. When the device is not
ready we want to return SAS_PHY_DOWN. But current indentation makes it
look like we only do so in the else branch of if (mvi_dev).

Signed-off-by: Luis de Bethencourt <[email protected]>
Reviewed-by: Johannes Thumshirn <[email protected]>
---

Hi,

This is a resend of a patch from October 19th [0]

Adding Andrew Morton to the CC list, as recommended at Korea Linux Forum.

Thanks,
Luis

[0] https://lkml.org/lkml/2015/10/19/775

drivers/scsi/mvsas/mv_sas.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/scsi/mvsas/mv_sas.c b/drivers/scsi/mvsas/mv_sas.c
index 9c78074..e712fe7 100644
--- a/drivers/scsi/mvsas/mv_sas.c
+++ b/drivers/scsi/mvsas/mv_sas.c
@@ -737,8 +737,8 @@ static int mvs_task_prep(struct sas_task *task, struct mvs_info *mvi, int is_tmf
mv_dprintk("device %016llx not ready.\n",
SAS_ADDR(dev->sas_addr));

- rc = SAS_PHY_DOWN;
- return rc;
+ rc = SAS_PHY_DOWN;
+ return rc;
}
tei.port = dev->port->lldd_port;
if (tei.port && !tei.port->port_attached && !tmf) {
--
2.5.3

2015-12-01 01:56:17

by Martin K. Petersen

Subject: Re: [RESEND] scsi: mvsas: fix misleading indentation

>>>>> "Luis" == Luis de Bethencourt <[email protected]> writes:

Luis> Fix a smatch warning: drivers/scsi/mvsas/mv_sas.c:740
Luis> mvs_task_prep() warn: curly braces intended?

Luis> The code is correct, the indention is misleading. When the device
Luis> is not ready we want to return SAS_PHY_DOWN. But current
Luis> indentation makes it look like we only do so in the else branch of
Luis> if (mvi_dev).

Applied to 4.5/scsi-queue.

Thank you!

--
Martin K. Petersen Oracle Linux Engineering