octeontx2: Annotate mmio regions as __iomem

This patch removes unnecessary typecasts by marking the
mbox_regions array as __iomem since it is used to store
pointers to memory-mapped I/O (MMIO) regions. Also simplified
the call to readq() in PF driver by removing redundant type casts.

Signed-off-by: Subbaraya Sundeep <sbhatta@marvell.com>
Link: https://patch.msgid.link/1749484309-3434-1-git-send-email-sbhatta@marvell.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/ethernet/marvell/octeontx2/af/rvu.c b/drivers/net/ethernet/marvell/octeontx2/af/rvu.c
index a8025f0486c9f16277aae312c17c91dbda04fcc2..43eea74bf541363ead32d96406bdfe3cb011bdb5 100644 (file)
--- a/drivers/net/ethernet/marvell/octeontx2/af/rvu.c
+++ b/drivers/net/ethernet/marvell/octeontx2/af/rvu.c
@@ -2364,7 +2364,7 @@ static inline void rvu_afvf_mbox_up_handler(struct work_struct *work)
        __rvu_mbox_up_handler(mwork, TYPE_AFVF);
 }
 
-static int rvu_get_mbox_regions(struct rvu *rvu, void **mbox_addr,
+static int rvu_get_mbox_regions(struct rvu *rvu, void __iomem **mbox_addr,
                                int num, int type, unsigned long *pf_bmap)
 {
        struct rvu_hwinfo *hw = rvu->hw;
@@ -2389,7 +2389,7 @@ static int rvu_get_mbox_regions(struct rvu *rvu, void **mbox_addr,
                                bar4 = rvupf_read64(rvu, RVU_PF_VF_BAR4_ADDR);
                                bar4 += region * MBOX_SIZE;
                        }
-                       mbox_addr[region] = (void *)ioremap_wc(bar4, MBOX_SIZE);
+                       mbox_addr[region] = ioremap_wc(bar4, MBOX_SIZE);
                        if (!mbox_addr[region])
                                goto error;
                }
@@ -2412,7 +2412,7 @@ static int rvu_get_mbox_regions(struct rvu *rvu, void **mbox_addr,
                                          RVU_AF_PF_BAR4_ADDR);
                        bar4 += region * MBOX_SIZE;
                }
-               mbox_addr[region] = (void *)ioremap_wc(bar4, MBOX_SIZE);
+               mbox_addr[region] = ioremap_wc(bar4, MBOX_SIZE);
                if (!mbox_addr[region])
                        goto error;
        }
@@ -2420,7 +2420,7 @@ static int rvu_get_mbox_regions(struct rvu *rvu, void **mbox_addr,
 
 error:
        while (region--)
-               iounmap((void __iomem *)mbox_addr[region]);
+               iounmap(mbox_addr[region]);
        return -ENOMEM;
 }
 
@@ -2430,10 +2430,10 @@ static int rvu_mbox_init(struct rvu *rvu, struct mbox_wq_info *mw,
                         void (mbox_up_handler)(struct work_struct *))
 {
        int err = -EINVAL, i, dir, dir_up;
+       void __iomem **mbox_regions;
        void __iomem *reg_base;
        struct rvu_work *mwork;
        unsigned long *pf_bmap;
-       void **mbox_regions;
        const char *name;
        u64 cfg;
 
@@ -2456,7 +2456,7 @@ static int rvu_mbox_init(struct rvu *rvu, struct mbox_wq_info *mw,
 
        mutex_init(&rvu->mbox_lock);
 
-       mbox_regions = kcalloc(num, sizeof(void *), GFP_KERNEL);
+       mbox_regions = kcalloc(num, sizeof(void __iomem *), GFP_KERNEL);
        if (!mbox_regions) {
                err = -ENOMEM;
                goto free_bitmap;

diff --git a/drivers/net/ethernet/marvell/octeontx2/nic/otx2_pf.c b/drivers/net/ethernet/marvell/octeontx2/nic/otx2_pf.c
index db7c466fdc39ee4c71b7ad6c13c8dd6b6eba9124..83deebc37b34d2ce7ff7f468ac78011c1922213c 100644 (file)
--- a/drivers/net/ethernet/marvell/octeontx2/nic/otx2_pf.c
+++ b/drivers/net/ethernet/marvell/octeontx2/nic/otx2_pf.c
@@ -602,8 +602,7 @@ static int otx2_pfvf_mbox_init(struct otx2_nic *pf, int numvfs)
                base = pci_resource_start(pf->pdev, PCI_MBOX_BAR_NUM) +
                       MBOX_SIZE;
        else
-               base = readq((void __iomem *)((u64)pf->reg_base +
-                                             RVU_PF_VF_BAR4_ADDR));
+               base = readq(pf->reg_base + RVU_PF_VF_BAR4_ADDR);
 
        hwbase = ioremap_wc(base, MBOX_SIZE * pf->total_vfs);
        if (!hwbase) {