| Message ID | 20230913122748.29530-9-ilpo.jarvinen@linux.intel.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | PCI/treewide: PCIe capability access cleanups | expand |
On Wed, 13 Sep 2023 15:27:46 +0300 Ilpo Järvinen <ilpo.jarvinen@linux.intel.com> wrote: > Use FIELD_GET() to extract PCIe capability registers field instead of > custom masking and shifting. > > Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com> Reviewed-by: Jonathan Cameron <Jonathan.Cameron@huawei.com> > --- > drivers/scsi/qla2xxx/qla_os.c | 5 +++-- > 1 file changed, 3 insertions(+), 2 deletions(-) > > diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c > index 50db08265c51..7e103d711825 100644 > --- a/drivers/scsi/qla2xxx/qla_os.c > +++ b/drivers/scsi/qla2xxx/qla_os.c > @@ -5,6 +5,7 @@ > */ > #include "qla_def.h" > > +#include <linux/bitfield.h> > #include <linux/moduleparam.h> > #include <linux/vmalloc.h> > #include <linux/delay.h> > @@ -633,8 +634,8 @@ qla24xx_pci_info_str(struct scsi_qla_host *vha, char *str, size_t str_len) > const char *speed_str; > > pcie_capability_read_dword(ha->pdev, PCI_EXP_LNKCAP, &lstat); > - lspeed = lstat & PCI_EXP_LNKCAP_SLS; > - lwidth = (lstat & PCI_EXP_LNKCAP_MLW) >> 4; > + lspeed = FIELD_GET(PCI_EXP_LNKCAP_SLS, lstat); > + lwidth = FIELD_GET(PCI_EXP_LNKCAP_MLW, lstat); > > switch (lspeed) { > case 1:
Ilpo, > Use FIELD_GET() to extract PCIe capability registers field instead of > custom masking and shifting. Applied to 6.7/scsi-staging, thanks!
diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c index 50db08265c51..7e103d711825 100644 --- a/drivers/scsi/qla2xxx/qla_os.c +++ b/drivers/scsi/qla2xxx/qla_os.c @@ -5,6 +5,7 @@ */ #include "qla_def.h" +#include <linux/bitfield.h> #include <linux/moduleparam.h> #include <linux/vmalloc.h> #include <linux/delay.h> @@ -633,8 +634,8 @@ qla24xx_pci_info_str(struct scsi_qla_host *vha, char *str, size_t str_len) const char *speed_str; pcie_capability_read_dword(ha->pdev, PCI_EXP_LNKCAP, &lstat); - lspeed = lstat & PCI_EXP_LNKCAP_SLS; - lwidth = (lstat & PCI_EXP_LNKCAP_MLW) >> 4; + lspeed = FIELD_GET(PCI_EXP_LNKCAP_SLS, lstat); + lwidth = FIELD_GET(PCI_EXP_LNKCAP_MLW, lstat); switch (lspeed) { case 1:
Use FIELD_GET() to extract PCIe capability registers field instead of custom masking and shifting. Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com> --- drivers/scsi/qla2xxx/qla_os.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)