| Message ID | 20230911121501.21910-8-ilpo.jarvinen@linux.intel.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | PCI/treewide: PCIe Link Width field access cleanup | expand |
On Mon, 11 Sep 2023 15:15:00 +0300 Ilpo Järvinen <ilpo.jarvinen@linux.intel.com> wrote: > Use FIELD_GET() to extract PCIe Negotiated and Maximum Link Width fields > instead of custom masking and shifting. > > Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com> > --- > drivers/scsi/esas2r/esas2r_ioctl.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/drivers/scsi/esas2r/esas2r_ioctl.c b/drivers/scsi/esas2r/esas2r_ioctl.c > index 055d2e87a2c8..3252780fd099 100644 > --- a/drivers/scsi/esas2r/esas2r_ioctl.c > +++ b/drivers/scsi/esas2r/esas2r_ioctl.c > @@ -41,6 +41,8 @@ > * USA. > */ > > +#include <linux/bitfield.h> > + > #include "esas2r.h" > > /* > @@ -797,11 +799,9 @@ static int hba_ioctl_callback(struct esas2r_adapter *a, > gai->pci.link_speed_max = > (u8)(caps & PCI_EXP_LNKCAP_SLS); Better to convert the other field gets as well. I'm curious as to why the u8 casts are here. The masking should have kept the compiler happy that it is fine to assign these without the casts and no chance of overflow. > gai->pci.link_width_curr = > - (u8)((stat & PCI_EXP_LNKSTA_NLW) > - >> PCI_EXP_LNKSTA_NLW_SHIFT); > + (u8)FIELD_GET(PCI_EXP_LNKSTA_NLW, stat); > gai->pci.link_width_max = > - (u8)((caps & PCI_EXP_LNKCAP_MLW) > - >> 4); > + (u8)FIELD_GET(PCI_EXP_LNKCAP_MLW, caps); > } > > gai->pci.msi_vector_cnt = 1;
diff --git a/drivers/scsi/esas2r/esas2r_ioctl.c b/drivers/scsi/esas2r/esas2r_ioctl.c index 055d2e87a2c8..3252780fd099 100644 --- a/drivers/scsi/esas2r/esas2r_ioctl.c +++ b/drivers/scsi/esas2r/esas2r_ioctl.c @@ -41,6 +41,8 @@ * USA. */ +#include <linux/bitfield.h> + #include "esas2r.h" /* @@ -797,11 +799,9 @@ static int hba_ioctl_callback(struct esas2r_adapter *a, gai->pci.link_speed_max = (u8)(caps & PCI_EXP_LNKCAP_SLS); gai->pci.link_width_curr = - (u8)((stat & PCI_EXP_LNKSTA_NLW) - >> PCI_EXP_LNKSTA_NLW_SHIFT); + (u8)FIELD_GET(PCI_EXP_LNKSTA_NLW, stat); gai->pci.link_width_max = - (u8)((caps & PCI_EXP_LNKCAP_MLW) - >> 4); + (u8)FIELD_GET(PCI_EXP_LNKCAP_MLW, caps); } gai->pci.msi_vector_cnt = 1;
Use FIELD_GET() to extract PCIe Negotiated and Maximum Link Width fields instead of custom masking and shifting. Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com> --- drivers/scsi/esas2r/esas2r_ioctl.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)