scsi: mptfusion: Remove unnecessarily casts
Subsystems (2)
PATCH 1/1 scsi: mptfusion: Remove unnecessarily casts
In a number of places, the value returned from pci_alloc_consistent() is unnecessarily cast from void*. Remove these casts.
Issue identified with Coccinelle.
--- drivers/message/fusion/mptbase.c | 6 +++--- drivers/message/fusion/mptctl.c | 5 ++--- drivers/message/fusion/mptfc.c | 8 ++++---- 3 files changed, 9 insertions(+), 10 deletions(-)
drivers/message/fusion/mptbase.c +3 -3
@@ -4975,7 +4975,7 @@ GetLanConfigPages(MPT_ADAPTER *ioc)if (hdr.PageLength >0 ) { data_sz = hdr.PageLength *4 ; - ppage0_alloc = (LANPage0_t *)pci_alloc_consistent (ioc->pcidev, data_sz, &page0_dma); + ppage0_alloc =pci_alloc_consistent (ioc->pcidev, data_sz, &page0_dma); rc = -ENOMEM ;if (ppage0_alloc) {memset ((u8 *)ppage0_alloc,0 , data_sz);
@@ -5021,7 +5021,7 @@ GetLanConfigPages(MPT_ADAPTER *ioc) data_sz = hdr.PageLength *4 ; rc = -ENOMEM ; - ppage1_alloc = (LANPage1_t *)pci_alloc_consistent (ioc->pcidev, data_sz, &page1_dma); + ppage1_alloc =pci_alloc_consistent (ioc->pcidev, data_sz, &page1_dma);if (ppage1_alloc) {memset ((u8 *)ppage1_alloc,0 , data_sz); cfg.physAddr = page1_dma;
@@ -5322,7 +5322,7 @@ GetIoUnitPage2(MPT_ADAPTER *ioc)/* Read the config page */ data_sz = hdr.PageLength *4 ; rc = -ENOMEM ; - ppage_alloc = (IOUnitPage2_t *)pci_alloc_consistent (ioc->pcidev, data_sz, &page_dma); + ppage_alloc =pci_alloc_consistent (ioc->pcidev, data_sz, &page_dma);if (ppage_alloc) {memset ((u8 *)ppage_alloc,0 , data_sz); cfg.physAddr = page_dma;
drivers/message/fusion/mptctl.c +2 -3
@@ -2593,7 +2593,7 @@ mptctl_hp_targetinfo(MPT_ADAPTER *ioc, unsigned long arg)/* Get the data transfer speeds */ data_sz = ioc->spi_data.sdp0length *4 ; - pg0_alloc = (SCSIDevicePage0_t *)pci_alloc_consistent (ioc->pcidev, data_sz, &page_dma); + pg0_alloc =pci_alloc_consistent (ioc->pcidev, data_sz, &page_dma);if (pg0_alloc) { hdr.PageVersion = ioc->spi_data.sdp0version; hdr.PageLength = data_sz;
@@ -2657,8 +2657,7 @@ mptctl_hp_targetinfo(MPT_ADAPTER *ioc, unsigned long arg)/* Issue the second config page request */ cfg.action =MPI_CONFIG_ACTION_PAGE_READ_CURRENT ; data_sz = (int ) cfg.cfghdr.hdr->PageLength *4 ; - pg3_alloc = (SCSIDevicePage3_t *)pci_alloc_consistent ( - ioc->pcidev, data_sz, &page_dma); + pg3_alloc =pci_alloc_consistent (ioc->pcidev, data_sz, &page_dma);if (pg3_alloc) { cfg.physAddr = page_dma; cfg.pageAddr = (karg.hdr.channel <<8 ) | karg.hdr.id;
drivers/message/fusion/mptfc.c +4 -4
@@ -763,7 +763,7 @@ mptfc_GetFcPortPage0(MPT_ADAPTER *ioc, int portnum) data_sz = hdr.PageLength *4 ; rc = -ENOMEM ; - ppage0_alloc = (FCPortPage0_t *)pci_alloc_consistent (ioc->pcidev, data_sz, &page0_dma); + ppage0_alloc =pci_alloc_consistent (ioc->pcidev, data_sz, &page0_dma);if (ppage0_alloc) { try_again:
@@ -904,9 +904,9 @@ mptfc_GetFcPortPage1(MPT_ADAPTER *ioc, int portnum)if (data_sz <sizeof (FCPortPage1_t)) data_sz =sizeof (FCPortPage1_t); - page1_alloc = (FCPortPage1_t *)pci_alloc_consistent (ioc->pcidev, - data_sz, - &page1_dma); + page1_alloc =pci_alloc_consistent (ioc->pcidev, + data_sz, + &page1_dma);if (!page1_alloc)return -ENOMEM ; }
Signature · 1 line
2.28.0
Quoted 2 lines · Alex Dewar
In a number of places, the value returned from
pci_alloc_consistent()is unnecessarily cast from void*. Remove these casts.
[]
drivers/message/fusion/mptbase.c
Quoted 1 line
drivers/message/fusion/mptbase.c +0
-0
[]
drivers/message/fusion/mptbase.c GetLanConfigPages(MPT_ADAPTER *ioc) · line 4981
Quoted 9 lines
drivers/message/fusion/mptbase.c +1
-1@@ -4975,7 +4975,7 @@ GetLanConfigPages(MPT_ADAPTER *ioc)if (hdr.PageLength >0 ) { data_sz = hdr.PageLength *4 ; - ppage0_alloc = (LANPage0_t *)pci_alloc_consistent (ioc->pcidev, data_sz, &page0_dma); + ppage0_alloc =pci_alloc_consistent (ioc->pcidev, data_sz, &page0_dma); rc = -ENOMEM ;if (ppage0_alloc) {memset ((u8 *)ppage0_alloc,0 , data_sz);
If you are removing unnecessary casts, it'd be better to remove all of them in the same file or subsystem at once.
Also this memset and cast isn't actually necessary any more as pci_alloc_consistent already zeros memory.
etc...
Quoted 19 lines · Joe Perches
Quoted 2 lines · Alex Dewar
In a number of places, the value returned from
pci_alloc_consistent()is unnecessarily cast from void*. Remove these casts.[]
drivers/message/fusion/mptbase.c
Quoted 1 line
drivers/message/fusion/mptbase.c +0
-0[]
drivers/message/fusion/mptbase.c GetLanConfigPages(MPT_ADAPTER *ioc) · line 4981
Quoted 9 lines
drivers/message/fusion/mptbase.c +1
-1@@ -4975,7 +4975,7 @@ GetLanConfigPages(MPT_ADAPTER *ioc)if (hdr.PageLength >0 ) { data_sz = hdr.PageLength *4 ; - ppage0_alloc = (LANPage0_t *)pci_alloc_consistent (ioc->pcidev, data_sz, &page0_dma); + ppage0_alloc =pci_alloc_consistent (ioc->pcidev, data_sz, &page0_dma); rc = -ENOMEM ;if (ppage0_alloc) {memset ((u8 *)ppage0_alloc,0 , data_sz);If you are removing unnecessary casts, it'd be better to remove all of them in the same file or subsystem at once.
Quoted 5 lines
Also this memset and cast isn't actually necessary any more as
pci_alloc_consistentalready zeros memory.etc...
Good suggestion. Thanks for the feedback :-)