Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6

[linux-2.6-omap-h63xx.git] / drivers / staging / winbond / linux / wbusb.c

diff --git a/drivers/staging/winbond/linux/wbusb.c b/drivers/staging/winbond/linux/wbusb.c
index e09b2720850b87fffd2c7dae4ad10e7c1a8793da..f4a7875f2389673d146c7d840be4383156eb6a9c 100644 (file)
--- a/drivers/staging/winbond/linux/wbusb.c
+++ b/drivers/staging/winbond/linux/wbusb.c
@@ -6,42 +6,29 @@
 #include "sysdef.h"
 #include <net/mac80211.h>
 
-
-MODULE_AUTHOR( DRIVER_AUTHOR );
-MODULE_DESCRIPTION( DRIVER_DESC );
+MODULE_AUTHOR(DRIVER_AUTHOR);
+MODULE_DESCRIPTION(DRIVER_DESC);
 MODULE_LICENSE("GPL");
 MODULE_VERSION("0.1");
 
-
-//============================================================
-// vendor ID and product ID can into here for others
-//============================================================
-static struct usb_device_id Id_Table[] =
-{
-  {USB_DEVICE( 0x0416, 0x0035 )},
-  {USB_DEVICE( 0x18E8, 0x6201 )},
-  {USB_DEVICE( 0x18E8, 0x6206 )},
-  {USB_DEVICE( 0x18E8, 0x6217 )},
-  {USB_DEVICE( 0x18E8, 0x6230 )},
-  {USB_DEVICE( 0x18E8, 0x6233 )},
-  {USB_DEVICE( 0x1131, 0x2035 )},
-  {  }
+static struct usb_device_id wb35_table[] __devinitdata = {
+       {USB_DEVICE(0x0416, 0x0035)},
+       {USB_DEVICE(0x18E8, 0x6201)},
+       {USB_DEVICE(0x18E8, 0x6206)},
+       {USB_DEVICE(0x18E8, 0x6217)},
+       {USB_DEVICE(0x18E8, 0x6230)},
+       {USB_DEVICE(0x18E8, 0x6233)},
+       {USB_DEVICE(0x1131, 0x2035)},
+       { 0, }
 };
 
-MODULE_DEVICE_TABLE(usb, Id_Table);
-
-static struct usb_driver wb35_driver = {
-       .name =         "w35und",
-       .probe =        wb35_probe,
-       .disconnect = wb35_disconnect,
-       .id_table = Id_Table,
-};
+MODULE_DEVICE_TABLE(usb, wb35_table);
 
-static const struct ieee80211_rate wbsoft_rates[] = {
+static struct ieee80211_rate wbsoft_rates[] = {
        { .bitrate = 10, .flags = IEEE80211_RATE_SHORT_PREAMBLE },
 };
 
-static const struct ieee80211_channel wbsoft_channels[] = {
+static struct ieee80211_channel wbsoft_channels[] = {
        { .center_freq = 2412},
 };
 
@@ -62,9 +49,22 @@ static void wbsoft_remove_interface(struct ieee80211_hw *dev,
        printk("wbsoft_remove interface called\n");
 }
 
-static int wbsoft_nop(void)
+static void wbsoft_stop(struct ieee80211_hw *hw)
 {
-       printk("wbsoft_nop called\n");
+       printk(KERN_INFO "%s called\n", __func__);
+}
+
+static int wbsoft_get_stats(struct ieee80211_hw *hw,
+                           struct ieee80211_low_level_stats *stats)
+{
+       printk(KERN_INFO "%s called\n", __func__);
+       return 0;
+}
+
+static int wbsoft_get_tx_stats(struct ieee80211_hw *hw,
+                              struct ieee80211_tx_queue_stats *stats)
+{
+       printk(KERN_INFO "%s called\n", __func__);
        return 0;
 }
 
@@ -105,8 +105,7 @@ static void wbsoft_configure_filter(struct ieee80211_hw *dev,
        *total_flags = new_flags;
 }
 
-static int wbsoft_tx(struct ieee80211_hw *dev, struct sk_buff *skb,
-                     struct ieee80211_tx_control *control)
+static int wbsoft_tx(struct ieee80211_hw *dev, struct sk_buff *skb)
 {
        char *buffer = kmalloc(skb->len, GFP_ATOMIC);
        printk("Sending frame %d bytes\n", skb->len);
@@ -171,14 +170,14 @@ static u64 wbsoft_get_tsf(struct ieee80211_hw *dev)
 static const struct ieee80211_ops wbsoft_ops = {
        .tx                     = wbsoft_tx,
        .start                  = wbsoft_start,         /* Start can be pretty much empty as we do WbWLanInitialize() during probe? */
-       .stop                   = wbsoft_nop,
+       .stop                   = wbsoft_stop,
        .add_interface          = wbsoft_add_interface,
        .remove_interface       = wbsoft_remove_interface,
        .config                 = wbsoft_config,
        .config_interface       = wbsoft_config_interface,
        .configure_filter       = wbsoft_configure_filter,
-       .get_stats              = wbsoft_nop,
-       .get_tx_stats           = wbsoft_nop,
+       .get_stats              = wbsoft_get_stats,
+       .get_tx_stats           = wbsoft_get_tx_stats,
        .get_tsf                = wbsoft_get_tsf,
 // conf_tx: hal_set_cwmin()/hal_set_cwmax;
 };
@@ -187,21 +186,6 @@ struct wbsoft_priv {
 };
 
 
-int __init wb35_init(void)
-{
-       printk("[w35und]driver init\n");
-       return usb_register(&wb35_driver);
-}
-
-void __exit wb35_exit(void)
-{
-       printk("[w35und]driver exit\n");
-       usb_deregister( &wb35_driver );
-}
-
-module_init(wb35_init);
-module_exit(wb35_exit);
-
 // Usb kernel subsystem will call this function when a new device is plugged into.
 int wb35_probe(struct usb_interface *intf, const struct usb_device_id *id_table)
 {
@@ -210,7 +194,7 @@ int wb35_probe(struct usb_interface *intf, const struct usb_device_id *id_table)
        PWBUSB          pWbUsb;
         struct usb_host_interface *interface;
        struct usb_endpoint_descriptor *endpoint;
-       int     i, ret = -1;
+       int     ret = -1;
        u32     ltmp;
        struct usb_device *udev = interface_to_usbdev(intf);
 
@@ -218,21 +202,6 @@ int wb35_probe(struct usb_interface *intf, const struct usb_device_id *id_table)
 
        printk("[w35und]wb35_probe ->\n");
 
-       for (i=0; i<(sizeof(Id_Table)/sizeof(struct usb_device_id)); i++ ) {
-               if ((udev->descriptor.idVendor == Id_Table[i].idVendor) &&
-                       (udev->descriptor.idProduct == Id_Table[i].idProduct)) {
-                       printk("[w35und]Found supported hardware\n");
-                       break;
-               }
-       }
-
-       if ((i == (sizeof(Id_Table)/sizeof(struct usb_device_id)))) {
-               #ifdef _PE_USB_INI_DUMP_
-               WBDEBUG(("[w35und] This is not the one we are interested about\n"));
-               #endif
-               return -ENODEV;
-       }
-
        // 20060630.2 Check the device if it already be opened
        ret = usb_control_msg(udev, usb_rcvctrlpipe( udev, 0 ),
                              0x01, USB_TYPE_VENDOR|USB_RECIP_DEVICE|USB_DIR_IN,
@@ -267,6 +236,7 @@ int wb35_probe(struct usb_interface *intf, const struct usb_device_id *id_table)
        {
                struct wbsoft_priv *priv;
                struct ieee80211_hw *dev;
+               static struct ieee80211_supported_band band;
                int res;
 
                dev = ieee80211_alloc_hw(sizeof(*priv), &wbsoft_ops);
@@ -295,8 +265,6 @@ int wb35_probe(struct usb_interface *intf, const struct usb_device_id *id_table)
 
                dev->queues = 1;
 
-               static struct ieee80211_supported_band band;
-
                band.channels = wbsoft_channels;
                band.n_channels = ARRAY_SIZE(wbsoft_channels);
                band.bitrates = wbsoft_rates;
@@ -398,4 +366,22 @@ void wb35_disconnect(struct usb_interface *intf)
 
 }
 
+static struct usb_driver wb35_driver = {
+       .name           = "w35und",
+       .id_table       = wb35_table,
+       .probe          = wb35_probe,
+       .disconnect     = wb35_disconnect,
+};
+
+static int __init wb35_init(void)
+{
+       return usb_register(&wb35_driver);
+}
 
+static void __exit wb35_exit(void)
+{
+       usb_deregister(&wb35_driver);
+}
+
+module_init(wb35_init);
+module_exit(wb35_exit);