Staging: wlan-ng: prism2usb.c: Coding style cleanups
Signed-off-by: Moritz Muehlenhoff <jmm@debian.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Moritz Muehlenhoff
Greg Kroah-Hartman
Родитель
ec7466f091
Коммит
f4ee0f42a7
|
|
@ -11,44 +11,70 @@ static struct usb_device_id usb_prism_tbl[] = {
|
|||
{PRISM_USB_DEVICE(0x04bb, 0x0922, "IOData AirPort WN-B11/USBS")},
|
||||
{PRISM_USB_DEVICE(0x07aa, 0x0012, "Corega Wireless LAN USB Stick-11")},
|
||||
{PRISM_USB_DEVICE(0x09aa, 0x3642, "Prism2.x 11Mbps WLAN USB Adapter")},
|
||||
{PRISM_USB_DEVICE(0x1668, 0x0408, "Actiontec Prism2.5 11Mbps WLAN USB Adapter")},
|
||||
{PRISM_USB_DEVICE(0x1668, 0x0421, "Actiontec Prism2.5 11Mbps WLAN USB Adapter")},
|
||||
{PRISM_USB_DEVICE(0x1915, 0x2236, "Linksys WUSB11v3.0 11Mbps WLAN USB Adapter")},
|
||||
{PRISM_USB_DEVICE(0x066b, 0x2212, "Linksys WUSB11v2.5 11Mbps WLAN USB Adapter")},
|
||||
{PRISM_USB_DEVICE(0x066b, 0x2213, "Linksys WUSB12v1.1 11Mbps WLAN USB Adapter")},
|
||||
{PRISM_USB_DEVICE(0x067c, 0x1022, "Siemens SpeedStream 1022 11Mbps WLAN USB Adapter")},
|
||||
{PRISM_USB_DEVICE(0x049f, 0x0033, "Compaq/Intel W100 PRO/Wireless 11Mbps multiport WLAN Adapter")},
|
||||
{PRISM_USB_DEVICE(0x0411, 0x0016, "Melco WLI-USB-S11 11Mbps WLAN Adapter")},
|
||||
{PRISM_USB_DEVICE(0x08de, 0x7a01, "PRISM25 IEEE 802.11 Mini USB Adapter")},
|
||||
{PRISM_USB_DEVICE(0x8086, 0x1111, "Intel PRO/Wireless 2011B LAN USB Adapter")},
|
||||
{PRISM_USB_DEVICE(0x0d8e, 0x7a01, "PRISM25 IEEE 802.11 Mini USB Adapter")},
|
||||
{PRISM_USB_DEVICE(0x045e, 0x006e, "Microsoft MN510 Wireless USB Adapter")},
|
||||
{PRISM_USB_DEVICE
|
||||
(0x1668, 0x0408, "Actiontec Prism2.5 11Mbps WLAN USB Adapter")},
|
||||
{PRISM_USB_DEVICE
|
||||
(0x1668, 0x0421, "Actiontec Prism2.5 11Mbps WLAN USB Adapter")},
|
||||
{PRISM_USB_DEVICE
|
||||
(0x1915, 0x2236, "Linksys WUSB11v3.0 11Mbps WLAN USB Adapter")},
|
||||
{PRISM_USB_DEVICE
|
||||
(0x066b, 0x2212, "Linksys WUSB11v2.5 11Mbps WLAN USB Adapter")},
|
||||
{PRISM_USB_DEVICE
|
||||
(0x066b, 0x2213, "Linksys WUSB12v1.1 11Mbps WLAN USB Adapter")},
|
||||
{PRISM_USB_DEVICE
|
||||
(0x067c, 0x1022, "Siemens SpeedStream 1022 11Mbps WLAN USB Adapter")},
|
||||
{PRISM_USB_DEVICE
|
||||
(0x049f, 0x0033,
|
||||
"Compaq/Intel W100 PRO/Wireless 11Mbps multiport WLAN Adapter")},
|
||||
{PRISM_USB_DEVICE
|
||||
(0x0411, 0x0016, "Melco WLI-USB-S11 11Mbps WLAN Adapter")},
|
||||
{PRISM_USB_DEVICE
|
||||
(0x08de, 0x7a01, "PRISM25 IEEE 802.11 Mini USB Adapter")},
|
||||
{PRISM_USB_DEVICE
|
||||
(0x8086, 0x1111, "Intel PRO/Wireless 2011B LAN USB Adapter")},
|
||||
{PRISM_USB_DEVICE
|
||||
(0x0d8e, 0x7a01, "PRISM25 IEEE 802.11 Mini USB Adapter")},
|
||||
{PRISM_USB_DEVICE
|
||||
(0x045e, 0x006e, "Microsoft MN510 Wireless USB Adapter")},
|
||||
{PRISM_USB_DEVICE(0x0967, 0x0204, "Acer Warplink USB Adapter")},
|
||||
{PRISM_USB_DEVICE(0x0cde, 0x0002, "Z-Com 725/726 Prism2.5 USB/USB Integrated")},
|
||||
{PRISM_USB_DEVICE(0x0cde, 0x0005, "Z-Com Xl735 Wireless 802.11b USB Adapter")},
|
||||
{PRISM_USB_DEVICE(0x413c, 0x8100, "Dell TrueMobile 1180 Wireless USB Adapter")},
|
||||
{PRISM_USB_DEVICE(0x0b3b, 0x1601, "ALLNET 0193 11Mbps WLAN USB Adapter")},
|
||||
{PRISM_USB_DEVICE(0x0b3b, 0x1602, "ZyXEL ZyAIR B200 Wireless USB Adapter")},
|
||||
{PRISM_USB_DEVICE(0x0baf, 0x00eb, "USRobotics USR1120 Wireless USB Adapter")},
|
||||
{PRISM_USB_DEVICE(0x0411, 0x0027, "Melco WLI-USB-KS11G 11Mbps WLAN Adapter")},
|
||||
{PRISM_USB_DEVICE(0x04f1, 0x3009, "JVC MP-XP7250 Builtin USB WLAN Adapter")},
|
||||
{PRISM_USB_DEVICE
|
||||
(0x0cde, 0x0002, "Z-Com 725/726 Prism2.5 USB/USB Integrated")},
|
||||
{PRISM_USB_DEVICE
|
||||
(0x0cde, 0x0005, "Z-Com Xl735 Wireless 802.11b USB Adapter")},
|
||||
{PRISM_USB_DEVICE
|
||||
(0x413c, 0x8100, "Dell TrueMobile 1180 Wireless USB Adapter")},
|
||||
{PRISM_USB_DEVICE
|
||||
(0x0b3b, 0x1601, "ALLNET 0193 11Mbps WLAN USB Adapter")},
|
||||
{PRISM_USB_DEVICE
|
||||
(0x0b3b, 0x1602, "ZyXEL ZyAIR B200 Wireless USB Adapter")},
|
||||
{PRISM_USB_DEVICE
|
||||
(0x0baf, 0x00eb, "USRobotics USR1120 Wireless USB Adapter")},
|
||||
{PRISM_USB_DEVICE
|
||||
(0x0411, 0x0027, "Melco WLI-USB-KS11G 11Mbps WLAN Adapter")},
|
||||
{PRISM_USB_DEVICE
|
||||
(0x04f1, 0x3009, "JVC MP-XP7250 Builtin USB WLAN Adapter")},
|
||||
{PRISM_USB_DEVICE(0x0846, 0x4110, "NetGear MA111")},
|
||||
{PRISM_USB_DEVICE(0x03f3, 0x0020, "Adaptec AWN-8020 USB WLAN Adapter")},
|
||||
// {PRISM_USB_DEVICE(0x0ace, 0x1201, "ZyDAS ZD1201 Wireless USB Adapter")},
|
||||
{PRISM_USB_DEVICE(0x03f3, 0x0020, "Adaptec AWN-8020 USB WLAN Adapter")},
|
||||
/* {PRISM_USB_DEVICE(0x0ace, 0x1201, "ZyDAS ZD1201 Wireless USB Adapter")}, */
|
||||
{PRISM_USB_DEVICE(0x2821, 0x3300, "ASUS-WL140 Wireless USB Adapter")},
|
||||
{PRISM_USB_DEVICE(0x2001, 0x3700, "DWL-122 Wireless USB Adapter")},
|
||||
{PRISM_USB_DEVICE(0x2001, 0x3702, "DWL-120 Rev F Wireless USB Adapter")},
|
||||
{PRISM_USB_DEVICE
|
||||
(0x2001, 0x3702, "DWL-120 Rev F Wireless USB Adapter")},
|
||||
{PRISM_USB_DEVICE(0x50c2, 0x4013, "Averatec USB WLAN Adapter")},
|
||||
{PRISM_USB_DEVICE(0x2c02, 0x14ea, "Planex GW-US11H WLAN USB Adapter")},
|
||||
{PRISM_USB_DEVICE(0x124a, 0x168b, "Airvast PRISM3 WLAN USB Adapter")},
|
||||
{PRISM_USB_DEVICE(0x083a, 0x3503, "T-Sinus 111 USB WLAN Adapter")},
|
||||
{PRISM_USB_DEVICE(0x2821, 0x3300, "Hawking HighDB USB Adapter")},
|
||||
{PRISM_USB_DEVICE(0x0411, 0x0044, "Melco WLI-USB-KB11 11Mbps WLAN Adapter")},
|
||||
{PRISM_USB_DEVICE
|
||||
(0x0411, 0x0044, "Melco WLI-USB-KB11 11Mbps WLAN Adapter")},
|
||||
{PRISM_USB_DEVICE(0x1668, 0x6106, "ROPEX FreeLan 802.11b USB Adapter")},
|
||||
{PRISM_USB_DEVICE(0x124a, 0x4017, "Pheenet WL-503IA 802.11b USB Adapter")},
|
||||
{PRISM_USB_DEVICE
|
||||
(0x124a, 0x4017, "Pheenet WL-503IA 802.11b USB Adapter")},
|
||||
{PRISM_USB_DEVICE(0x0bb2, 0x0302, "Ambit Microsystems Corp.")},
|
||||
{PRISM_USB_DEVICE(0x9016, 0x182d, "Sitecom WL-022 802.11b USB Adapter")},
|
||||
{PRISM_USB_DEVICE(0x0543, 0x0f01, "ViewSonic Airsync USB Adapter 11Mbps (Prism2.5)")},
|
||||
{PRISM_USB_DEVICE
|
||||
(0x9016, 0x182d, "Sitecom WL-022 802.11b USB Adapter")},
|
||||
{PRISM_USB_DEVICE
|
||||
(0x0543, 0x0f01, "ViewSonic Airsync USB Adapter 11Mbps (Prism2.5)")},
|
||||
{ /* terminator */ }
|
||||
};
|
||||
|
||||
|
|
@ -75,15 +101,14 @@ MODULE_DEVICE_TABLE(usb, usb_prism_tbl);
|
|||
* I'm not sure, assume it's interrupt.
|
||||
*
|
||||
----------------------------------------------------------------*/
|
||||
static int prism2sta_probe_usb(
|
||||
struct usb_interface *interface,
|
||||
const struct usb_device_id *id)
|
||||
static int prism2sta_probe_usb(struct usb_interface *interface,
|
||||
const struct usb_device_id *id)
|
||||
{
|
||||
struct usb_device *dev;
|
||||
|
||||
wlandevice_t *wlandev = NULL;
|
||||
hfa384x_t *hw = NULL;
|
||||
int result = 0;
|
||||
wlandevice_t *wlandev = NULL;
|
||||
hfa384x_t *hw = NULL;
|
||||
int result = 0;
|
||||
|
||||
dev = interface_to_usbdev(interface);
|
||||
|
||||
|
|
@ -94,7 +119,7 @@ static int prism2sta_probe_usb(
|
|||
}
|
||||
hw = wlandev->priv;
|
||||
|
||||
if ( wlan_setup(wlandev) != 0 ) {
|
||||
if (wlan_setup(wlandev) != 0) {
|
||||
printk(KERN_ERR "%s: wlan_setup() failed.\n", dev_info);
|
||||
result = -EIO;
|
||||
goto failed;
|
||||
|
|
@ -112,15 +137,14 @@ static int prism2sta_probe_usb(
|
|||
/* Do a chip-level reset on the MAC */
|
||||
if (prism2_doreset) {
|
||||
result = hfa384x_corereset(hw,
|
||||
prism2_reset_holdtime,
|
||||
prism2_reset_settletime, 0);
|
||||
prism2_reset_holdtime,
|
||||
prism2_reset_settletime, 0);
|
||||
if (result != 0) {
|
||||
unregister_wlandev(wlandev);
|
||||
hfa384x_destroy(hw);
|
||||
result = -EIO;
|
||||
printk(KERN_ERR
|
||||
"%s: hfa384x_corereset() failed.\n",
|
||||
dev_info);
|
||||
"%s: hfa384x_corereset() failed.\n", dev_info);
|
||||
goto failed;
|
||||
}
|
||||
}
|
||||
|
|
@ -129,28 +153,29 @@ static int prism2sta_probe_usb(
|
|||
|
||||
wlandev->msdstate = WLAN_MSD_HWPRESENT;
|
||||
|
||||
if ( register_wlandev(wlandev) != 0 ) {
|
||||
if (register_wlandev(wlandev) != 0) {
|
||||
printk(KERN_ERR "%s: register_wlandev() failed.\n", dev_info);
|
||||
result = -EIO;
|
||||
goto failed;
|
||||
}
|
||||
}
|
||||
|
||||
/* enable the card */
|
||||
prism2sta_ifstate(wlandev, P80211ENUM_ifstate_enable);
|
||||
|
||||
goto done;
|
||||
|
||||
failed:
|
||||
if (wlandev) kfree(wlandev);
|
||||
if (hw) kfree(hw);
|
||||
failed:
|
||||
if (wlandev)
|
||||
kfree(wlandev);
|
||||
if (hw)
|
||||
kfree(hw);
|
||||
wlandev = NULL;
|
||||
|
||||
done:
|
||||
done:
|
||||
usb_set_intfdata(interface, wlandev);
|
||||
return result;
|
||||
}
|
||||
|
||||
|
||||
/*----------------------------------------------------------------
|
||||
* prism2sta_disconnect_usb
|
||||
*
|
||||
|
|
@ -170,20 +195,19 @@ static int prism2sta_probe_usb(
|
|||
* Call context:
|
||||
* process
|
||||
----------------------------------------------------------------*/
|
||||
static void
|
||||
prism2sta_disconnect_usb(struct usb_interface *interface)
|
||||
static void prism2sta_disconnect_usb(struct usb_interface *interface)
|
||||
{
|
||||
wlandevice_t *wlandev;
|
||||
wlandevice_t *wlandev;
|
||||
|
||||
wlandev = (wlandevice_t *) usb_get_intfdata(interface);
|
||||
|
||||
if ( wlandev != NULL ) {
|
||||
if (wlandev != NULL) {
|
||||
LIST_HEAD(cleanlist);
|
||||
struct list_head *entry;
|
||||
struct list_head *temp;
|
||||
unsigned long flags;
|
||||
struct list_head *entry;
|
||||
struct list_head *temp;
|
||||
unsigned long flags;
|
||||
|
||||
hfa384x_t *hw = wlandev->priv;
|
||||
hfa384x_t *hw = wlandev->priv;
|
||||
|
||||
if (!hw)
|
||||
goto exit;
|
||||
|
|
@ -225,7 +249,7 @@ prism2sta_disconnect_usb(struct usb_interface *interface)
|
|||
* responses that we have shut down.
|
||||
*/
|
||||
list_for_each(entry, &cleanlist) {
|
||||
hfa384x_usbctlx_t *ctlx;
|
||||
hfa384x_usbctlx_t *ctlx;
|
||||
|
||||
ctlx = list_entry(entry, hfa384x_usbctlx_t, list);
|
||||
complete(&ctlx->done);
|
||||
|
|
@ -258,11 +282,10 @@ prism2sta_disconnect_usb(struct usb_interface *interface)
|
|||
kfree(wlandev);
|
||||
}
|
||||
|
||||
exit:
|
||||
exit:
|
||||
usb_set_intfdata(interface, NULL);
|
||||
}
|
||||
|
||||
|
||||
static struct usb_driver prism2_usb_driver = {
|
||||
.name = "prism2_usb",
|
||||
.probe = prism2sta_probe_usb,
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче