Commit 26743707 authored by Felix N. Kimbu's avatar Felix N. Kimbu Committed by Greg Kroah-Hartman
Browse files

staging: wlan-ng: Rename 'wlan_unsetup' to 'wlan_teardown' 



Rename function identifier 'wlan_unsetup' to 'wlan_teardown' in files
p80211netdev.c, p80211netdev.h and prism2usb.c, a pairing function for
'wlan_setup' to match common kernel coding style.

Signed-off-by: default avatarFelix N. Kimbu <felixkimbu1@gmail.com>
Reviewed-by: default avatarDan Carpenter <dan.carpenter@linaro.org>
Link: https://lore.kernel.org/r/ZfGG093fyjI4G/ci@MOLeToid


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent f119f9e0

drivers/staging/wlan-ng/p80211netdev.c

+2 −2
Original line number Diff line number Diff line
@@ -689,7 +689,7 @@ int wlan_setup(struct wlandevice *wlandev, struct device *physdev) 
}



/*----------------------------------------------------------------

 * wlan_unsetup

 * wlan_teardown

 *

 * This function is paired with the wlan_setup routine.  It should

 * be called after unregister_wlandev.  Basically, all it does is
@@ -708,7 +708,7 @@ int wlan_setup(struct wlandevice *wlandev, struct device *physdev) 
 *	context of the kernel startup code.

 *----------------------------------------------------------------

 */

void wlan_unsetup(struct wlandevice *wlandev)

void wlan_teardown(struct wlandevice *wlandev)

{

	struct wireless_dev *wdev;

drivers/staging/wlan-ng/p80211netdev.h

+1 −1
Original line number Diff line number Diff line
@@ -204,7 +204,7 @@ int wep_encrypt(struct wlandevice *wlandev, u8 *buf, u8 *dst, u32 len, 
		int keynum, u8 *iv, u8 *icv);



int wlan_setup(struct wlandevice *wlandev, struct device *physdev);

void wlan_unsetup(struct wlandevice *wlandev);

void wlan_teardown(struct wlandevice *wlandev);

int register_wlandev(struct wlandevice *wlandev);

int unregister_wlandev(struct wlandevice *wlandev);

void p80211netdev_rx(struct wlandevice *wlandev, struct sk_buff *skb);

drivers/staging/wlan-ng/prism2usb.c

+2 −2
Original line number Diff line number Diff line
@@ -128,7 +128,7 @@ static int prism2sta_probe_usb(struct usb_interface *interface, 
failed_register:

	usb_put_dev(dev);

failed_reset:

	wlan_unsetup(wlandev);

	wlan_teardown(wlandev);

failed:

	kfree(wlandev);

	kfree(hw);
@@ -208,7 +208,7 @@ static void prism2sta_disconnect_usb(struct usb_interface *interface) 


		/* Unhook the wlandev */

		unregister_wlandev(wlandev);

		wlan_unsetup(wlandev);

		wlan_teardown(wlandev);



		usb_put_dev(hw->usb);