Commit 81a7dc3d authored by Ajay Singh's avatar Ajay Singh Committed by Greg Kroah-Hartman

staging: wilc1000: rename wlan init and deinit function prefixed with wil1000

Rename wilc1000_wlan_init() & wilc1000_wlan_deinit() function to avoid
unecessary 'wilc1000' prefix in function to be inline with other
function naming convension.
Signed-off-by: default avatarAjay Singh <ajay.kathat@microchip.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 824ea37b
...@@ -604,7 +604,7 @@ static int linux_wlan_init_test_config(struct net_device *dev, ...@@ -604,7 +604,7 @@ static int linux_wlan_init_test_config(struct net_device *dev,
return -1; return -1;
} }
void wilc1000_wlan_deinit(struct net_device *dev) void wilc_wlan_deinitialize(struct net_device *dev)
{ {
struct wilc_vif *vif; struct wilc_vif *vif;
struct wilc *wl; struct wilc *wl;
...@@ -719,7 +719,7 @@ static void wlan_deinitialize_threads(struct net_device *dev) ...@@ -719,7 +719,7 @@ static void wlan_deinitialize_threads(struct net_device *dev)
} }
} }
int wilc1000_wlan_init(struct net_device *dev, struct wilc_vif *vif) int wilc_wlan_initialize(struct net_device *dev, struct wilc_vif *vif)
{ {
int ret = 0; int ret = 0;
struct wilc *wl = vif->wilc; struct wilc *wl = vif->wilc;
...@@ -846,7 +846,7 @@ static int wilc_mac_open(struct net_device *ndev) ...@@ -846,7 +846,7 @@ static int wilc_mac_open(struct net_device *ndev)
if (ret < 0) if (ret < 0)
return ret; return ret;
ret = wilc1000_wlan_init(ndev, vif); ret = wilc_wlan_initialize(ndev, vif);
if (ret < 0) { if (ret < 0) {
wilc_deinit_host_int(ndev); wilc_deinit_host_int(ndev);
return ret; return ret;
...@@ -869,7 +869,7 @@ static int wilc_mac_open(struct net_device *ndev) ...@@ -869,7 +869,7 @@ static int wilc_mac_open(struct net_device *ndev)
if (!is_valid_ether_addr(ndev->dev_addr)) { if (!is_valid_ether_addr(ndev->dev_addr)) {
netdev_err(ndev, "Wrong MAC address\n"); netdev_err(ndev, "Wrong MAC address\n");
wilc_deinit_host_int(ndev); wilc_deinit_host_int(ndev);
wilc1000_wlan_deinit(ndev); wilc_wlan_deinitialize(ndev);
return -EINVAL; return -EINVAL;
} }
...@@ -1038,7 +1038,7 @@ static int wilc_mac_close(struct net_device *ndev) ...@@ -1038,7 +1038,7 @@ static int wilc_mac_close(struct net_device *ndev)
if (wl->open_ifcs == 0) { if (wl->open_ifcs == 0) {
netdev_dbg(ndev, "Deinitializing wilc1000\n"); netdev_dbg(ndev, "Deinitializing wilc1000\n");
wl->close = 1; wl->close = 1;
wilc1000_wlan_deinit(ndev); wilc_wlan_deinitialize(ndev);
WILC_WFI_deinit_mon_interface(); WILC_WFI_deinit_mon_interface();
} }
......
...@@ -218,14 +218,14 @@ struct WILC_WFI_mon_priv { ...@@ -218,14 +218,14 @@ struct WILC_WFI_mon_priv {
struct net_device *real_ndev; struct net_device *real_ndev;
}; };
int wilc1000_wlan_init(struct net_device *dev, struct wilc_vif *vif); int wilc_wlan_initialize(struct net_device *dev, struct wilc_vif *vif);
void wilc_frmw_to_linux(struct wilc *wilc, u8 *buff, u32 size, u32 pkt_offset); void wilc_frmw_to_linux(struct wilc *wilc, u8 *buff, u32 size, u32 pkt_offset);
void wilc_mac_indicate(struct wilc *wilc, int flag); void wilc_mac_indicate(struct wilc *wilc, int flag);
void wilc_netdev_cleanup(struct wilc *wilc); void wilc_netdev_cleanup(struct wilc *wilc);
int wilc_netdev_init(struct wilc **wilc, struct device *dev, int io_type, int wilc_netdev_init(struct wilc **wilc, struct device *dev, int io_type,
int gpio, const struct wilc_hif_func *ops); int gpio, const struct wilc_hif_func *ops);
void wilc1000_wlan_deinit(struct net_device *dev); void wilc_wlan_deinitialize(struct net_device *dev);
void wilc_wfi_mgmt_rx(struct wilc *wilc, u8 *buff, u32 size); void wilc_wfi_mgmt_rx(struct wilc *wilc, u8 *buff, u32 size);
int wilc_wlan_get_firmware(struct net_device *dev); int wilc_wlan_get_firmware(struct net_device *dev);
int wilc_wlan_set_bssid(struct net_device *wilc_netdev, u8 *bssid, u8 mode); int wilc_wlan_set_bssid(struct net_device *wilc_netdev, u8 *bssid, u8 mode);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment