diff options
| author | Pekka Enberg <penberg@cs.helsinki.fi> | 2008-10-22 11:03:54 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-01-06 13:51:41 -0800 |
| commit | 581f67cf3c5a4fa533775dd6f50d70f819b48de0 (patch) | |
| tree | 93e61c8c16e1b7e90ec84598f373c3d4ec31a1d2 /drivers/staging/winbond/linux | |
| parent | 88ebc4b950e344a8024ab46cccfb506a81f70634 (diff) | |
Staging: w35und: merge wblinux struct to adapter
Zaps another compatability layer from the driver code.
Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi>
Acked-by: Pavel Machek <pavel@suse.cz>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/winbond/linux')
| -rw-r--r-- | drivers/staging/winbond/linux/sysdef.h | 1 | ||||
| -rw-r--r-- | drivers/staging/winbond/linux/wbusb.c | 5 |
2 files changed, 0 insertions, 6 deletions
diff --git a/drivers/staging/winbond/linux/sysdef.h b/drivers/staging/winbond/linux/sysdef.h index d46d63e5c67..4b35a972165 100644 --- a/drivers/staging/winbond/linux/sysdef.h +++ b/drivers/staging/winbond/linux/sysdef.h @@ -53,7 +53,6 @@ #include "../sme_api.h" #include "../gl_80211.h" #include "../mto.h" -#include "../wblinux_s.h" #include "../wbhal_s.h" diff --git a/drivers/staging/winbond/linux/wbusb.c b/drivers/staging/winbond/linux/wbusb.c index 1e43232d0fd..5f09fd49f52 100644 --- a/drivers/staging/winbond/linux/wbusb.c +++ b/drivers/staging/winbond/linux/wbusb.c @@ -188,7 +188,6 @@ struct wbsoft_priv { static int wb35_probe(struct usb_interface *intf, const struct usb_device_id *id_table) { struct wb35_adapter *adapter; - PWBLINUX pWbLinux; PWBUSB pWbUsb; struct usb_host_interface *interface; struct usb_endpoint_descriptor *endpoint; @@ -214,7 +213,6 @@ static int wb35_probe(struct usb_interface *intf, const struct usb_device_id *id adapter = kzalloc(sizeof(*adapter), GFP_KERNEL); my_adapter = adapter; - pWbLinux = &adapter->WbLinux; pWbUsb = &adapter->sHwData.WbUsb; pWbUsb->udev = udev; @@ -334,12 +332,9 @@ WbUsb_destroy(phw_data_t pHwData) static void wb35_disconnect(struct usb_interface *intf) { - PWBLINUX pWbLinux; struct wb35_adapter * adapter = usb_get_intfdata(intf); usb_set_intfdata(intf, NULL); - pWbLinux = &adapter->WbLinux; - // Card remove WbWlanHalt(adapter); |