Message ID | 20180105153106.17605-1-colin.king@canonical.com (mailing list archive) |
---|---|
State | Accepted |
Headers | show |
> -----Original Message----- > From: Colin King [mailto:colin.king@canonical.com] > Sent: Friday, January 5, 2018 7:31 AM > To: dl-esc-Aacraid Linux Driver <aacraid@microsemi.com>; James E . J . > Bottomley <jejb@linux.vnet.ibm.com>; Martin K . Petersen > <martin.petersen@oracle.com>; linux-scsi@vger.kernel.org > Cc: kernel-janitors@vger.kernel.org; linux-kernel@vger.kernel.org > Subject: [PATCH][scsi-next] scsi: aacraid: remove redundant setting of > variable c > > EXTERNAL EMAIL > > > From: Colin Ian King <colin.king@canonical.com> > > A previous commit no longer stores the contents of c, so we now have > a situation where c is being updated but the value is never read. Clean > up the code by removing the now redundant setting of variable c. > > Cleans up clang warning: > drivers/scsi/aacraid/aachba.c:943:3: warning: Value stored to 'c' is > never read > > Fixes: f4e8708d3104 ("scsi: aacraid: Fix udev inquiry race condition") > Signed-off-by: Colin Ian King <colin.king@canonical.com> > --- Reviewed-by :Raghava Aditya Renukunta <RaghavaAditya.Renukunta@microsemi.com>
Colin, > A previous commit no longer stores the contents of c, so we now have a > situation where c is being updated but the value is never read. Clean > up the code by removing the now redundant setting of variable c. Applied to 4.16/scsi-queue. Thanks!
diff --git a/drivers/scsi/aacraid/aachba.c b/drivers/scsi/aacraid/aachba.c index a2bdd7931cf1..525d72fcbf3e 100644 --- a/drivers/scsi/aacraid/aachba.c +++ b/drivers/scsi/aacraid/aachba.c @@ -940,11 +940,8 @@ static void setinqstr(struct aac_dev *dev, void *data, int tindex) while (*cp == ' ') ++cp; /* last six chars reserved for vol type */ - c = 0; - if (strlen(cp) > sizeof(str->pid)) { - c = cp[sizeof(str->pid)]; + if (strlen(cp) > sizeof(str->pid)) cp[sizeof(str->pid)] = '\0'; - } inqstrcpy (cp, str->pid); kfree(cname);