From: Zong-Zhe Yang To make IO wrappers of pack/unpack/udely/mdely can intuitively call the loaded IO ops as others do, add corresponding instances for them. And, expect all rtw89_io_ops initializers should assign all members. Signed-off-by: Zong-Zhe Yang Signed-off-by: Ping-Ke Shih --- drivers/net/wireless/realtek/rtw89/core.h | 38 ++++++++++++++--------- drivers/net/wireless/realtek/rtw89/fw.c | 10 +++--- 2 files changed, 29 insertions(+), 19 deletions(-) diff --git a/drivers/net/wireless/realtek/rtw89/core.h b/drivers/net/wireless/realtek/rtw89/core.h index fc51419a1782..128667fb95b0 100644 --- a/drivers/net/wireless/realtek/rtw89/core.h +++ b/drivers/net/wireless/realtek/rtw89/core.h @@ -8097,36 +8097,44 @@ struct rtw89_tx_skb_data *RTW89_TX_SKB_CB(struct sk_buff *skb) return (struct rtw89_tx_skb_data *)info->driver_data; } -static inline int rtw89_io_pack(struct rtw89_dev *rtwdev) +static inline int rtw89_raw_io_pack(struct rtw89_dev *rtwdev) { - if (rtwdev->io->pack) - return rtwdev->io->pack(rtwdev); + return 0; +} +static inline int rtw89_raw_io_unpack(struct rtw89_dev *rtwdev) +{ return 0; } -static inline int rtw89_io_unpack(struct rtw89_dev *rtwdev) +static inline void rtw89_raw_io_udelay(struct rtw89_dev *rtwdev, u32 us) { - if (rtwdev->io->unpack) - return rtwdev->io->unpack(rtwdev); + udelay(us); +} - return 0; +static inline void rtw89_raw_io_mdelay(struct rtw89_dev *rtwdev, u32 ms) +{ + mdelay(ms); +} + +static inline int rtw89_io_pack(struct rtw89_dev *rtwdev) +{ + return rtwdev->io->pack(rtwdev); +} + +static inline int rtw89_io_unpack(struct rtw89_dev *rtwdev) +{ + return rtwdev->io->unpack(rtwdev); } static inline void rtw89_io_udelay(struct rtw89_dev *rtwdev, u32 us) { - if (rtwdev->io->do_udelay) - rtwdev->io->do_udelay(rtwdev, us); - else - udelay(us); + rtwdev->io->do_udelay(rtwdev, us); } static inline void rtw89_io_mdelay(struct rtw89_dev *rtwdev, u32 ms) { - if (rtwdev->io->do_mdelay) - rtwdev->io->do_mdelay(rtwdev, ms); - else - mdelay(ms); + rtwdev->io->do_mdelay(rtwdev, ms); } static inline u8 rtw89_read8(struct rtw89_dev *rtwdev, u32 addr) diff --git a/drivers/net/wireless/realtek/rtw89/fw.c b/drivers/net/wireless/realtek/rtw89/fw.c index 535cc2ad8611..7cf51e78ce98 100644 --- a/drivers/net/wireless/realtek/rtw89/fw.c +++ b/drivers/net/wireless/realtek/rtw89/fw.c @@ -12916,8 +12916,10 @@ static int rtw89_fw_cmd_ofld_enqueue(struct rtw89_dev *rtwdev, } static const struct rtw89_io_ops rtw89_raw_io = { - .pack = NULL, - .unpack = NULL, + .pack = rtw89_raw_io_pack, + .unpack = rtw89_raw_io_unpack, + .do_udelay = rtw89_raw_io_udelay, + .do_mdelay = rtw89_raw_io_mdelay, .write8 = rtw89_raw_write8, .write16 = rtw89_raw_write16, .write32 = rtw89_raw_write32, @@ -13096,7 +13098,7 @@ static void rtw89_fw_cmd_ofld_udelay(struct rtw89_dev *rtwdev, u32 us) ret = rtw89_fw_cmd_ofld_enqueue(rtwdev, &cmd); if (ret) - udelay(us); + rtw89_raw_io.do_udelay(rtwdev, us); } static void rtw89_fw_cmd_ofld_mdelay(struct rtw89_dev *rtwdev, u32 ms) @@ -13110,7 +13112,7 @@ static void rtw89_fw_cmd_ofld_mdelay(struct rtw89_dev *rtwdev, u32 ms) ret = rtw89_fw_cmd_ofld_enqueue(rtwdev, &cmd); if (ret) - mdelay(ms); + rtw89_raw_io.do_mdelay(rtwdev, ms); } static const struct rtw89_io_ops rtw89_fw_cmd_ofld_io = { -- 2.25.1