diff options
| author | Chaehyun Lim | 2015-09-20 08:51:24 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2015-09-21 04:05:09 +0200 |
| commit | a9a1682344107cfefa35cf6c14c1019c67288f88 (patch) | |
| tree | ae57c42c55ddf7214bdac988d1aa381bcf6b2a59 | |
| parent | staging: wilc1000: replace s32 with int (diff) | |
| download | kernel-qcow2-linux-a9a1682344107cfefa35cf6c14c1019c67288f88.tar.gz kernel-qcow2-linux-a9a1682344107cfefa35cf6c14c1019c67288f88.tar.xz kernel-qcow2-linux-a9a1682344107cfefa35cf6c14c1019c67288f88.zip | |
staging: wilc1000: rename WILC_WFI_DeInitHostInt
This patch replaces WILC_WFI_DeInitHostInt with wilc_deinit_host_int to
avoid CamelCase.
Signed-off-by: Chaehyun Lim <chaehyun.lim@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/staging/wilc1000/linux_wlan.c | 6 | ||||
| -rw-r--r-- | drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 2 | ||||
| -rw-r--r-- | drivers/staging/wilc1000/wilc_wfi_cfgoperations.h | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/drivers/staging/wilc1000/linux_wlan.c b/drivers/staging/wilc1000/linux_wlan.c index 7a33543ddcba..6f0a74132e26 100644 --- a/drivers/staging/wilc1000/linux_wlan.c +++ b/drivers/staging/wilc1000/linux_wlan.c @@ -1437,7 +1437,7 @@ int mac_open(struct net_device *ndev) ret = wilc1000_wlan_init(ndev, nic); if (ret < 0) { PRINT_ER("Failed to initialize wilc1000\n"); - WILC_WFI_DeInitHostInt(ndev); + wilc_deinit_host_int(ndev); return ret; } @@ -1474,7 +1474,7 @@ int mac_open(struct net_device *ndev) return 0; _err_: - WILC_WFI_DeInitHostInt(ndev); + wilc_deinit_host_int(ndev); wilc1000_wlan_deinit(g_linux_wlan); return ret; } @@ -1667,7 +1667,7 @@ int mac_close(struct net_device *ndev) /* Stop the network interface queue */ netif_stop_queue(nic->wilc_netdev); - WILC_WFI_DeInitHostInt(nic->wilc_netdev); + wilc_deinit_host_int(nic->wilc_netdev); } if (g_linux_wlan->open_ifcs == 0) { diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c index 41dd1c3ed88e..7222359a3839 100644 --- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c +++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c @@ -3642,7 +3642,7 @@ int WILC_WFI_InitHostInt(struct net_device *net) * @date 01 MAR 2012 * @version 1.0 */ -int WILC_WFI_DeInitHostInt(struct net_device *net) +int wilc_deinit_host_int(struct net_device *net) { int s32Error = 0; diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.h b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.h index 579bf2b129b1..91856732e2d8 100644 --- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.h +++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.h @@ -95,7 +95,7 @@ struct wireless_dev *WILC_WFI_CfgAlloc(void); struct wireless_dev *wilc_create_wiphy(struct net_device *net); void wilc_free_wiphy(struct net_device *net); int WILC_WFI_update_stats(struct wiphy *wiphy, u32 pktlen, u8 changed); -int WILC_WFI_DeInitHostInt(struct net_device *net); +int wilc_deinit_host_int(struct net_device *net); int WILC_WFI_InitHostInt(struct net_device *net); void WILC_WFI_monitor_rx(u8 *buff, u32 size); int WILC_WFI_deinit_mon_interface(void); |