| Message ID | 20241212221817.78940-2-pmenzel@molgen.mpg.de (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | [1/2] scsi: mpt3sas: Add details to EEDPTagMode error message | expand |
[Remove non-working @lsi.com addresses] Am 12.12.24 um 23:18 schrieb Paul Menzel: > Currently, the code does: > > if (x == 0) { > x &= ~0x3; > x |= 0x1; > } > > Zeroing bits 0 and 1 of a variable that is 0 is not necessary. So > directly set the variable to 1. > > Cc: Sreekanth Reddy <sreekanth.reddy@broadcom.com> > Fixes: f92363d12359 ("[SCSI] mpt3sas: add new driver supporting 12GB SAS") > Signed-off-by: Paul Menzel <pmenzel@molgen.mpg.de> > --- > drivers/scsi/mpt3sas/mpt3sas_base.c | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/drivers/scsi/mpt3sas/mpt3sas_base.c b/drivers/scsi/mpt3sas/mpt3sas_base.c > index 87fcafce947c..2cd0bb606d88 100644 > --- a/drivers/scsi/mpt3sas/mpt3sas_base.c > +++ b/drivers/scsi/mpt3sas/mpt3sas_base.c > @@ -5629,8 +5629,7 @@ _base_static_config_pages(struct MPT3SAS_ADAPTER *ioc) > if (!ioc->is_gen35_ioc && ioc->manu_pg11.EEDPTagMode == 0) { > pr_err("%s: overriding NVDATA EEDPTagMode setting from 0 to 1.\n", > ioc->name); > - ioc->manu_pg11.EEDPTagMode &= ~0x3; > - ioc->manu_pg11.EEDPTagMode |= 0x1; > + ioc->manu_pg11.EEDPTagMode = 0x1; > mpt3sas_config_set_manufacturing_pg11(ioc, &mpi_reply, > &ioc->manu_pg11); > }
diff --git a/drivers/scsi/mpt3sas/mpt3sas_base.c b/drivers/scsi/mpt3sas/mpt3sas_base.c index 87fcafce947c..2cd0bb606d88 100644 --- a/drivers/scsi/mpt3sas/mpt3sas_base.c +++ b/drivers/scsi/mpt3sas/mpt3sas_base.c @@ -5629,8 +5629,7 @@ _base_static_config_pages(struct MPT3SAS_ADAPTER *ioc) if (!ioc->is_gen35_ioc && ioc->manu_pg11.EEDPTagMode == 0) { pr_err("%s: overriding NVDATA EEDPTagMode setting from 0 to 1.\n", ioc->name); - ioc->manu_pg11.EEDPTagMode &= ~0x3; - ioc->manu_pg11.EEDPTagMode |= 0x1; + ioc->manu_pg11.EEDPTagMode = 0x1; mpt3sas_config_set_manufacturing_pg11(ioc, &mpi_reply, &ioc->manu_pg11); }
Currently, the code does: if (x == 0) { x &= ~0x3; x |= 0x1; } Zeroing bits 0 and 1 of a variable that is 0 is not necessary. So directly set the variable to 1. Cc: Sreekanth Reddy <sreekanth.reddy@broadcom.com> Fixes: f92363d12359 ("[SCSI] mpt3sas: add new driver supporting 12GB SAS") Signed-off-by: Paul Menzel <pmenzel@molgen.mpg.de> --- drivers/scsi/mpt3sas/mpt3sas_base.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)