Skip to content

Commit 51e4aa8

Browse files
TropicaoKalle Valo
authored andcommitted
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
1 parent 059d0e3 commit 51e4aa8

File tree

2 files changed

+11
-11
lines changed

2 files changed

+11
-11
lines changed

drivers/net/wireless/microchip/wilc1000/hif.c

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1567,11 +1567,11 @@ int wilc_deinit(struct wilc_vif *vif)
15671567

15681568
void wilc_network_info_received(struct wilc *wilc, u8 *buffer, u32 length)
15691569
{
1570-
int result;
1571-
struct host_if_msg *msg;
1572-
int id;
15731570
struct host_if_drv *hif_drv;
1571+
struct host_if_msg *msg;
15741572
struct wilc_vif *vif;
1573+
int result;
1574+
int id;
15751575

15761576
id = get_unaligned_le32(&buffer[length - 4]);
15771577
vif = wilc_get_vif_from_idx(wilc, id);
@@ -1608,11 +1608,11 @@ void wilc_network_info_received(struct wilc *wilc, u8 *buffer, u32 length)
16081608

16091609
void wilc_gnrl_async_info_received(struct wilc *wilc, u8 *buffer, u32 length)
16101610
{
1611-
int result;
1612-
struct host_if_msg *msg;
1613-
int id;
16141611
struct host_if_drv *hif_drv;
1612+
struct host_if_msg *msg;
16151613
struct wilc_vif *vif;
1614+
int result;
1615+
int id;
16161616

16171617
mutex_lock(&wilc->deinit_lock);
16181618

@@ -1654,10 +1654,10 @@ void wilc_gnrl_async_info_received(struct wilc *wilc, u8 *buffer, u32 length)
16541654

16551655
void wilc_scan_complete_received(struct wilc *wilc, u8 *buffer, u32 length)
16561656
{
1657-
int result;
1658-
int id;
16591657
struct host_if_drv *hif_drv;
16601658
struct wilc_vif *vif;
1659+
int result;
1660+
int id;
16611661

16621662
id = get_unaligned_le32(&buffer[length - 4]);
16631663
vif = wilc_get_vif_from_idx(wilc, id);

drivers/net/wireless/microchip/wilc1000/netdev.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -814,12 +814,12 @@ static int wilc_mac_close(struct net_device *ndev)
814814
void wilc_frmw_to_host(struct wilc *wilc, u8 *buff, u32 size,
815815
u32 pkt_offset)
816816
{
817-
unsigned int frame_len = 0;
818-
int stats;
819817
unsigned char *buff_to_send = NULL;
820-
struct sk_buff *skb;
821818
struct net_device *wilc_netdev;
819+
unsigned int frame_len = 0;
822820
struct wilc_vif *vif;
821+
struct sk_buff *skb;
822+
int stats;
823823

824824
if (!wilc)
825825
return;

0 commit comments

Comments
 (0)