wifi: wilc1000: Fold chip_allow_sleep()/chip_wakeup() into wlan.c

Neither chip_allow_sleep()/chip_wakeup() is used outside of wlan.c .
Make both functions static and remove both the exported symbol and
entries from wlan.h .

Make chip_allow_sleep() return error code in preparation for the
follow up patches.

Move acquire_bus() and release_bus() to avoid forward declaration
of chip_allow_sleep()/chip_wakeup().

Reviewed-by: Alexis Lothoré <alexis.lothore@bootlin.com>
Signed-off-by: Marek Vasut <marex@denx.de>
Signed-off-by: Kalle Valo <kvalo@kernel.org>
Link: https://patch.msgid.link/20241004114551.40236-3-marex@denx.de

diff --git a/drivers/net/wireless/microchip/wilc1000/wlan.c b/drivers/net/wireless/microchip/wilc1000/wlan.c
index 28212ff28c1123b657d4d76a475c56dce1e8e123..875f0bb8af6737b349198c693a0cd5252f6f21a1 100644 (file)
--- a/drivers/net/wireless/microchip/wilc1000/wlan.c
+++ b/drivers/net/wireless/microchip/wilc1000/wlan.c
@@ -12,20 +12,6 @@
 
 #define WAKE_UP_TRIAL_RETRY            10000
 
-static inline void acquire_bus(struct wilc *wilc, enum bus_acquire acquire)
-{
-       mutex_lock(&wilc->hif_cs);
-       if (acquire == WILC_BUS_ACQUIRE_AND_WAKEUP && wilc->power_save_mode)
-               chip_wakeup(wilc);
-}
-
-static inline void release_bus(struct wilc *wilc, enum bus_release release)
-{
-       if (release == WILC_BUS_RELEASE_ALLOW_SLEEP && wilc->power_save_mode)
-               chip_allow_sleep(wilc);
-       mutex_unlock(&wilc->hif_cs);
-}
-
 static void wilc_wlan_txq_remove(struct wilc *wilc, u8 q_num,
                                 struct txq_entry_t *tqe)
 {
@@ -555,7 +541,7 @@ static struct rxq_entry_t *wilc_wlan_rxq_remove(struct wilc *wilc)
        return rqe;
 }
 
-void chip_allow_sleep(struct wilc *wilc)
+static int chip_allow_sleep(struct wilc *wilc)
 {
        u32 reg = 0;
        const struct wilc_hif_func *hif_func = wilc->hif_func;
@@ -584,7 +570,7 @@ void chip_allow_sleep(struct wilc *wilc)
        while (--trials) {
                ret = hif_func->hif_read_reg(wilc, to_host_from_fw_reg, &reg);
                if (ret)
-                       return;
+                       return ret;
                if ((reg & to_host_from_fw_bit) == 0)
                        break;
        }
@@ -594,28 +580,28 @@ void chip_allow_sleep(struct wilc *wilc)
        /* Clear bit 1 */
        ret = hif_func->hif_read_reg(wilc, wakeup_reg, &reg);
        if (ret)
-               return;
+               return ret;
        if (reg & wakeup_bit) {
                reg &= ~wakeup_bit;
                ret = hif_func->hif_write_reg(wilc, wakeup_reg, reg);
                if (ret)
-                       return;
+                       return ret;
        }
 
        ret = hif_func->hif_read_reg(wilc, from_host_to_fw_reg, &reg);
        if (ret)
-               return;
+               return ret;
        if (reg & from_host_to_fw_bit) {
                reg &= ~from_host_to_fw_bit;
                ret = hif_func->hif_write_reg(wilc, from_host_to_fw_reg, reg);
                if (ret)
-                       return;
-
+                       return ret;
        }
+
+       return 0;
 }
-EXPORT_SYMBOL_GPL(chip_allow_sleep);
 
-void chip_wakeup(struct wilc *wilc)
+static void chip_wakeup(struct wilc *wilc)
 {
        u32 ret = 0;
        u32 clk_status_val = 0, trials = 0;
@@ -674,7 +660,20 @@ void chip_wakeup(struct wilc *wilc)
        if (wilc->io_type == WILC_HIF_SPI)
                wilc->hif_func->hif_reset(wilc);
 }
-EXPORT_SYMBOL_GPL(chip_wakeup);
+
+static inline void acquire_bus(struct wilc *wilc, enum bus_acquire acquire)
+{
+       mutex_lock(&wilc->hif_cs);
+       if (acquire == WILC_BUS_ACQUIRE_AND_WAKEUP && wilc->power_save_mode)
+               chip_wakeup(wilc);
+}
+
+static inline void release_bus(struct wilc *wilc, enum bus_release release)
+{
+       if (release == WILC_BUS_RELEASE_ALLOW_SLEEP && wilc->power_save_mode)
+               chip_allow_sleep(wilc);
+       mutex_unlock(&wilc->hif_cs);
+}
 
 void host_wakeup_notify(struct wilc *wilc)
 {

diff --git a/drivers/net/wireless/microchip/wilc1000/wlan.h b/drivers/net/wireless/microchip/wilc1000/wlan.h
index 44dce53d24916666f3c18636bf42745f0d1cd103..90ba76cf14dd18f30f5278b5ac6fa784ac085d14 100644 (file)
--- a/drivers/net/wireless/microchip/wilc1000/wlan.h
+++ b/drivers/net/wireless/microchip/wilc1000/wlan.h
@@ -438,8 +438,6 @@ void wilc_wfi_p2p_rx(struct wilc_vif *vif, u8 *buff, u32 size);
 bool wilc_wfi_mgmt_frame_rx(struct wilc_vif *vif, u8 *buff, u32 size);
 void host_wakeup_notify(struct wilc *wilc);
 void host_sleep_notify(struct wilc *wilc);
-void chip_allow_sleep(struct wilc *wilc);
-void chip_wakeup(struct wilc *wilc);
 int wilc_send_config_pkt(struct wilc_vif *vif, u8 mode, struct wid *wids,
                         u32 count);
 int wilc_wlan_init(struct net_device *dev);