From 26743707e13ed88612a98c303d924d3d623ee88c Mon Sep 17 00:00:00 2001 From: "Felix N. Kimbu" Date: Wed, 13 Mar 2024 11:58:27 +0100 Subject: [PATCH] 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: Felix N. Kimbu Reviewed-by: Dan Carpenter Link: https://lore.kernel.org/r/ZfGG093fyjI4G/ci@MOLeToid Signed-off-by: Greg Kroah-Hartman --- drivers/staging/wlan-ng/p80211netdev.c | 4 ++-- drivers/staging/wlan-ng/p80211netdev.h | 2 +- drivers/staging/wlan-ng/prism2usb.c | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/staging/wlan-ng/p80211netdev.c b/drivers/staging/wlan-ng/p80211netdev.c index 8634fc89a6c22..284c1c12e1d1a 100644 --- a/drivers/staging/wlan-ng/p80211netdev.c +++ b/drivers/staging/wlan-ng/p80211netdev.c @@ -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; diff --git a/drivers/staging/wlan-ng/p80211netdev.h b/drivers/staging/wlan-ng/p80211netdev.h index 485f2c697f5f7..e3eefb67aae1b 100644 --- a/drivers/staging/wlan-ng/p80211netdev.h +++ b/drivers/staging/wlan-ng/p80211netdev.h @@ -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); diff --git a/drivers/staging/wlan-ng/prism2usb.c b/drivers/staging/wlan-ng/prism2usb.c index 0e0ccef4871e9..416127e5d7135 100644 --- a/drivers/staging/wlan-ng/prism2usb.c +++ b/drivers/staging/wlan-ng/prism2usb.c @@ -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); -- 2.30.2