[PATCH rdma-next] IB/i40iw: Avoid typecast from void to pci_dev

[PATCH rdma-next] IB/i40iw: Avoid typecast from void to pci_dev

[Parav Pandit]

From: Parav Pandit <parav@nvidia.com>

hw_context stores pci device pointer. Use the pci_dev pointer instead of
void * and avoid typecasts.

Signed-off-by: Parav Pandit <parav@nvidia.com>
---
 drivers/infiniband/hw/i40iw/i40iw_main.c  | 2 +-
 drivers/infiniband/hw/i40iw/i40iw_pble.c  | 4 ++--
 drivers/infiniband/hw/i40iw/i40iw_type.h  | 3 ++-
 drivers/infiniband/hw/i40iw/i40iw_utils.c | 4 ++--
 drivers/infiniband/hw/i40iw/i40iw_verbs.c | 2 +-
 5 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/drivers/infiniband/hw/i40iw/i40iw_main.c b/drivers/infiniband/hw/i40iw/i40iw_main.c
index c0cdb25440bf..2408b279e4c2 100644
--- a/drivers/infiniband/hw/i40iw/i40iw_main.c
+++ b/drivers/infiniband/hw/i40iw/i40iw_main.c
@@ -1573,7 +1573,7 @@ static enum i40iw_status_code i40iw_setup_init_state(struct i40iw_handler *hdl,
 	status = i40iw_save_msix_info(iwdev, ldev);
 	if (status)
 		return status;
-	iwdev->hw.dev_context = (void *)ldev->pcidev;
+	iwdev->hw.pcidev = ldev->pcidev;
 	iwdev->hw.hw_addr = ldev->hw_addr;
 	status = i40iw_allocate_dma_mem(&iwdev->hw,
 					&iwdev->obj_mem, 8192, 4096);
diff --git a/drivers/infiniband/hw/i40iw/i40iw_pble.c b/drivers/infiniband/hw/i40iw/i40iw_pble.c
index 540aab5e502d..5f97643e22e5 100644
--- a/drivers/infiniband/hw/i40iw/i40iw_pble.c
+++ b/drivers/infiniband/hw/i40iw/i40iw_pble.c
@@ -167,7 +167,7 @@ static enum i40iw_status_code add_sd_direct(struct i40iw_sc_dev *dev,
  */
 static void i40iw_free_vmalloc_mem(struct i40iw_hw *hw, struct i40iw_chunk *chunk)
 {
-	struct pci_dev *pcidev = (struct pci_dev *)hw->dev_context;
+	struct pci_dev *pcidev = hw->pcidev;
 	int i;
 
 	if (!chunk->pg_cnt)
@@ -193,7 +193,7 @@ static enum i40iw_status_code i40iw_get_vmalloc_mem(struct i40iw_hw *hw,
 						    struct i40iw_chunk *chunk,
 						    int pg_cnt)
 {
-	struct pci_dev *pcidev = (struct pci_dev *)hw->dev_context;
+	struct pci_dev *pcidev = hw->pcidev;
 	struct page *page;
 	u8 *addr;
 	u32 size;
diff --git a/drivers/infiniband/hw/i40iw/i40iw_type.h b/drivers/infiniband/hw/i40iw/i40iw_type.h
index 54c323c40d96..c3babf3cbb8e 100644
--- a/drivers/infiniband/hw/i40iw/i40iw_type.h
+++ b/drivers/infiniband/hw/i40iw/i40iw_type.h
@@ -73,6 +73,7 @@ struct i40iw_pd_ops;
 struct i40iw_priv_qp_ops;
 struct i40iw_priv_cq_ops;
 struct i40iw_hmc_ops;
+struct pci_dev;
 
 enum i40iw_page_size {
 	I40IW_PAGE_SIZE_4K,
@@ -261,7 +262,7 @@ struct i40iw_vsi_pestat {
 
 struct i40iw_hw {
 	u8 __iomem *hw_addr;
-	void *dev_context;
+	struct pci_dev *pcidev;
 	struct i40iw_hmc_info hmc;
 };
 
diff --git a/drivers/infiniband/hw/i40iw/i40iw_utils.c b/drivers/infiniband/hw/i40iw/i40iw_utils.c
index e07fb37af086..4ab8e0dcfd4c 100644
--- a/drivers/infiniband/hw/i40iw/i40iw_utils.c
+++ b/drivers/infiniband/hw/i40iw/i40iw_utils.c
@@ -751,7 +751,7 @@ enum i40iw_status_code i40iw_allocate_dma_mem(struct i40iw_hw *hw,
 					      u64 size,
 					      u32 alignment)
 {
-	struct pci_dev *pcidev = (struct pci_dev *)hw->dev_context;
+	struct pci_dev *pcidev = hw->pcidev;
 
 	if (!mem)
 		return I40IW_ERR_PARAM;
@@ -770,7 +770,7 @@ enum i40iw_status_code i40iw_allocate_dma_mem(struct i40iw_hw *hw,
  */
 void i40iw_free_dma_mem(struct i40iw_hw *hw, struct i40iw_dma_mem *mem)
 {
-	struct pci_dev *pcidev = (struct pci_dev *)hw->dev_context;
+	struct pci_dev *pcidev = hw->pcidev;
 
 	if (!mem || !mem->va)
 		return;
diff --git a/drivers/infiniband/hw/i40iw/i40iw_verbs.c b/drivers/infiniband/hw/i40iw/i40iw_verbs.c
index b51339328a51..90baa4c7f208 100644
--- a/drivers/infiniband/hw/i40iw/i40iw_verbs.c
+++ b/drivers/infiniband/hw/i40iw/i40iw_verbs.c
@@ -2668,7 +2668,7 @@ static struct i40iw_ib_device *i40iw_init_rdma_device(struct i40iw_device *iwdev
 {
 	struct i40iw_ib_device *iwibdev;
 	struct net_device *netdev = iwdev->netdev;
-	struct pci_dev *pcidev = (struct pci_dev *)iwdev->hw.dev_context;
+	struct pci_dev *pcidev = iwdev->hw.pcidev;
 
 	iwibdev = ib_alloc_device(i40iw_ib_device, ibdev);
 	if (!iwibdev) {
-- 
2.26.2

RE: [PATCH rdma-next] IB/i40iw: Avoid typecast from void to pci_dev

[Saleem, Shiraz]

> Subject: [PATCH rdma-next] IB/i40iw: Avoid typecast from void to pci_dev
> 
> From: Parav Pandit <parav@nvidia.com>
> 
> hw_context stores pci device pointer. Use the pci_dev pointer instead of void *
> and avoid typecasts.
> 
> Signed-off-by: Parav Pandit <parav@nvidia.com>
> ---
>  drivers/infiniband/hw/i40iw/i40iw_main.c  | 2 +-
> drivers/infiniband/hw/i40iw/i40iw_pble.c  | 4 ++--
> drivers/infiniband/hw/i40iw/i40iw_type.h  | 3 ++-
> drivers/infiniband/hw/i40iw/i40iw_utils.c | 4 ++--
> drivers/infiniband/hw/i40iw/i40iw_verbs.c | 2 +-
>  5 files changed, 8 insertions(+), 7 deletions(-)
> 

Looks good. Thanks Parav!

Acked-by: Shiraz Saleem <shiraz.saleem@intel.com>

Re: [PATCH rdma-next] IB/i40iw: Avoid typecast from void to pci_dev

[Jason Gunthorpe]

On Mon, Sep 14, 2020 at 03:35:28PM +0300, Parav Pandit wrote:
> From: Parav Pandit <parav@nvidia.com>
> 
> hw_context stores pci device pointer. Use the pci_dev pointer instead of
> void * and avoid typecasts.
> 
> Signed-off-by: Parav Pandit <parav@nvidia.com>
> Acked-by: Shiraz Saleem <shiraz.saleem@intel.com>
> ---
>  drivers/infiniband/hw/i40iw/i40iw_main.c  | 2 +-
>  drivers/infiniband/hw/i40iw/i40iw_pble.c  | 4 ++--
>  drivers/infiniband/hw/i40iw/i40iw_type.h  | 3 ++-
>  drivers/infiniband/hw/i40iw/i40iw_utils.c | 4 ++--
>  drivers/infiniband/hw/i40iw/i40iw_verbs.c | 2 +-
>  5 files changed, 8 insertions(+), 7 deletions(-)

Applied to for-next, thanks

Jason