wifi: wilc1000: fix declarations ordering

Fix reverse-christmas tree order in some functions before adding more
variables

Signed-off-by: Alexis Lothoré <alexis.lothore@bootlin.com>
Signed-off-by: Kalle Valo <kvalo@kernel.org>
Link: https://msgid.link/20240215-wilc_fix_rcu_usage-v1-3-f610e46c6f82@bootlin.com

diff --git a/drivers/net/wireless/microchip/wilc1000/hif.c b/drivers/net/wireless/microchip/wilc1000/hif.c
index f3800aa9e9f8a977d9e40a78e188a664379f46dd..c42859a727c3be1db16dac55e3cc460132e7260b 100644 (file)
--- a/drivers/net/wireless/microchip/wilc1000/hif.c
+++ b/drivers/net/wireless/microchip/wilc1000/hif.c
@@ -1567,11 +1567,11 @@ int wilc_deinit(struct wilc_vif *vif)
 
 void wilc_network_info_received(struct wilc *wilc, u8 *buffer, u32 length)
 {
-       int result;
-       struct host_if_msg *msg;
-       int id;
        struct host_if_drv *hif_drv;
+       struct host_if_msg *msg;
        struct wilc_vif *vif;
+       int result;
+       int id;
 
        id = get_unaligned_le32(&buffer[length - 4]);
        vif = wilc_get_vif_from_idx(wilc, id);
@@ -1608,11 +1608,11 @@ void wilc_network_info_received(struct wilc *wilc, u8 *buffer, u32 length)
 
 void wilc_gnrl_async_info_received(struct wilc *wilc, u8 *buffer, u32 length)
 {
-       int result;
-       struct host_if_msg *msg;
-       int id;
        struct host_if_drv *hif_drv;
+       struct host_if_msg *msg;
        struct wilc_vif *vif;
+       int result;
+       int id;
 
        mutex_lock(&wilc->deinit_lock);
 
@@ -1654,10 +1654,10 @@ void wilc_gnrl_async_info_received(struct wilc *wilc, u8 *buffer, u32 length)
 
 void wilc_scan_complete_received(struct wilc *wilc, u8 *buffer, u32 length)
 {
-       int result;
-       int id;
        struct host_if_drv *hif_drv;
        struct wilc_vif *vif;
+       int result;
+       int id;
 
        id = get_unaligned_le32(&buffer[length - 4]);
        vif = wilc_get_vif_from_idx(wilc, id);

diff --git a/drivers/net/wireless/microchip/wilc1000/netdev.c b/drivers/net/wireless/microchip/wilc1000/netdev.c
index 96f239adc078a498b3f378f9c0aa982ee4e458c3..092801d339154ec6bc813d35924cbe0a6b4bf996 100644 (file)
--- a/drivers/net/wireless/microchip/wilc1000/netdev.c
+++ b/drivers/net/wireless/microchip/wilc1000/netdev.c
@@ -814,12 +814,12 @@ static int wilc_mac_close(struct net_device *ndev)
 void wilc_frmw_to_host(struct wilc *wilc, u8 *buff, u32 size,
                       u32 pkt_offset)
 {
-       unsigned int frame_len = 0;
-       int stats;
        unsigned char *buff_to_send = NULL;
-       struct sk_buff *skb;
        struct net_device *wilc_netdev;
+       unsigned int frame_len = 0;
        struct wilc_vif *vif;
+       struct sk_buff *skb;
+       int stats;
 
        if (!wilc)
                return;