git.openwrt.org Git - openwrt/staging/wigyori.git/blob

   1 From 7aa8defd3495208289abcc629946af26a2af3391 Mon Sep 17 00:00:00 2001
   2 From: Lorenzo Bianconi <lorenzo@kernel.org>
   3 Date: Tue, 24 Oct 2023 00:01:30 +0200
   4 Subject: [PATCH 2/5] net: ethernet: mtk_wed: remove wo pointer in
   5  wo_r32/wo_w32 signature
   6
   7 wo pointer is no longer used in wo_r32 and wo_w32 routines so get rid of
   8 it.
   9
  10 Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
  11 Link: https://lore.kernel.org/r/530537db0872f7523deff21f0a5dfdd9b75fdc9d.1698098459.git.lorenzo@kernel.org
  12 Signed-off-by: Jakub Kicinski <kuba@kernel.org>
  13 ---
  14  drivers/net/ethernet/mediatek/mtk_wed_mcu.c | 12 ++++++------
  15  1 file changed, 6 insertions(+), 6 deletions(-)
  16
  17 --- a/drivers/net/ethernet/mediatek/mtk_wed_mcu.c
  18 +++ b/drivers/net/ethernet/mediatek/mtk_wed_mcu.c
  19 @@ -32,12 +32,12 @@ static struct mtk_wed_wo_memory_region m
  20         },
  21  };
  22
  23 -static u32 wo_r32(struct mtk_wed_wo *wo, u32 reg)
  24 +static u32 wo_r32(u32 reg)
  25  {
  26         return readl(mem_region[MTK_WED_WO_REGION_BOOT].addr + reg);
  27  }
  28
  29 -static void wo_w32(struct mtk_wed_wo *wo, u32 reg, u32 val)
  30 +static void wo_w32(u32 reg, u32 val)
  31  {
  32         writel(val, mem_region[MTK_WED_WO_REGION_BOOT].addr + reg);
  33  }
  34 @@ -373,13 +373,13 @@ mtk_wed_mcu_load_firmware(struct mtk_wed
  35                 boot_cr = MTK_WO_MCU_CFG_LS_WA_BOOT_ADDR_ADDR;
  36         else
  37                 boot_cr = MTK_WO_MCU_CFG_LS_WM_BOOT_ADDR_ADDR;
  38 -       wo_w32(wo, boot_cr, mem_region[MTK_WED_WO_REGION_EMI].phy_addr >> 16);
  39 +       wo_w32(boot_cr, mem_region[MTK_WED_WO_REGION_EMI].phy_addr >> 16);
  40         /* wo firmware reset */
  41 -       wo_w32(wo, MTK_WO_MCU_CFG_LS_WF_MCCR_CLR_ADDR, 0xc00);
  42 +       wo_w32(MTK_WO_MCU_CFG_LS_WF_MCCR_CLR_ADDR, 0xc00);
  43
  44 -       val = wo_r32(wo, MTK_WO_MCU_CFG_LS_WF_MCU_CFG_WM_WA_ADDR) |
  45 +       val = wo_r32(MTK_WO_MCU_CFG_LS_WF_MCU_CFG_WM_WA_ADDR) |
  46               MTK_WO_MCU_CFG_LS_WF_WM_WA_WM_CPU_RSTB_MASK;
  47 -       wo_w32(wo, MTK_WO_MCU_CFG_LS_WF_MCU_CFG_WM_WA_ADDR, val);
  48 +       wo_w32(MTK_WO_MCU_CFG_LS_WF_MCU_CFG_WM_WA_ADDR, val);
  49  out:
  50         release_firmware(fw);
  51