Message ID | 20220217132956.484818-6-damien.lemoal@opensource.wdc.com (mailing list archive) |
---|---|
State | Superseded |
Headers | show |
Series | libsas and pm8001 fixes | expand |
On Thu, Feb 17, 2022 at 2:30 PM Damien Le Moal <damien.lemoal@opensource.wdc.com> wrote: > > The declaration of the local variable destination1 in > pm80xx_pci_mem_copy() as a pointer to a u32 results in the sparse > warning: > > warning: incorrect type in assignment (different base types) > expected unsigned int [usertype] > got restricted __le32 [usertype] > > Furthermore, the destination" argument of pm80xx_pci_mem_copy() is > wrongly declared with the const attribute. > > Fix both problems by changing the type of the "destination" argument > to "__le32 *" and use this argument directly inside the > pm80xx_pci_mem_copy() function, thus removing the need for the > destination1 local variable. > > Signed-off-by: Damien Le Moal <damien.lemoal@opensource.wdc.com> Reviewed-by: Jack Wang <jinpu.wang@ionos.com> thx! > --- > drivers/scsi/pm8001/pm80xx_hwi.c | 8 +++----- > 1 file changed, 3 insertions(+), 5 deletions(-) > > diff --git a/drivers/scsi/pm8001/pm80xx_hwi.c b/drivers/scsi/pm8001/pm80xx_hwi.c > index f1663a10693a..0b3386a3c508 100644 > --- a/drivers/scsi/pm8001/pm80xx_hwi.c > +++ b/drivers/scsi/pm8001/pm80xx_hwi.c > @@ -67,18 +67,16 @@ int pm80xx_bar4_shift(struct pm8001_hba_info *pm8001_ha, u32 shift_value) > } > > static void pm80xx_pci_mem_copy(struct pm8001_hba_info *pm8001_ha, u32 soffset, > - const void *destination, > + __le32 *destination, > u32 dw_count, u32 bus_base_number) > { > u32 index, value, offset; > - u32 *destination1; > - destination1 = (u32 *)destination; > > - for (index = 0; index < dw_count; index += 4, destination1++) { > + for (index = 0; index < dw_count; index += 4, destination++) { > offset = (soffset + index); > if (offset < (64 * 1024)) { > value = pm8001_cr32(pm8001_ha, bus_base_number, offset); > - *destination1 = cpu_to_le32(value); > + *destination = cpu_to_le32(value); > } > } > return; > -- > 2.34.1 >
diff --git a/drivers/scsi/pm8001/pm80xx_hwi.c b/drivers/scsi/pm8001/pm80xx_hwi.c index f1663a10693a..0b3386a3c508 100644 --- a/drivers/scsi/pm8001/pm80xx_hwi.c +++ b/drivers/scsi/pm8001/pm80xx_hwi.c @@ -67,18 +67,16 @@ int pm80xx_bar4_shift(struct pm8001_hba_info *pm8001_ha, u32 shift_value) } static void pm80xx_pci_mem_copy(struct pm8001_hba_info *pm8001_ha, u32 soffset, - const void *destination, + __le32 *destination, u32 dw_count, u32 bus_base_number) { u32 index, value, offset; - u32 *destination1; - destination1 = (u32 *)destination; - for (index = 0; index < dw_count; index += 4, destination1++) { + for (index = 0; index < dw_count; index += 4, destination++) { offset = (soffset + index); if (offset < (64 * 1024)) { value = pm8001_cr32(pm8001_ha, bus_base_number, offset); - *destination1 = cpu_to_le32(value); + *destination = cpu_to_le32(value); } } return;
The declaration of the local variable destination1 in pm80xx_pci_mem_copy() as a pointer to a u32 results in the sparse warning: warning: incorrect type in assignment (different base types) expected unsigned int [usertype] got restricted __le32 [usertype] Furthermore, the destination" argument of pm80xx_pci_mem_copy() is wrongly declared with the const attribute. Fix both problems by changing the type of the "destination" argument to "__le32 *" and use this argument directly inside the pm80xx_pci_mem_copy() function, thus removing the need for the destination1 local variable. Signed-off-by: Damien Le Moal <damien.lemoal@opensource.wdc.com> --- drivers/scsi/pm8001/pm80xx_hwi.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)