Staging: w35und: move supported band initialization out of wb35_probe()

[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 1e43232d0fd4aa02e640e4e9e813109e999454df..bd708a2d14848042ed31077c05d94eba22d75b57 100644 (file)
--- a/drivers/staging/winbond/linux/wbusb.c
+++ b/drivers/staging/winbond/linux/wbusb.c
@@ -32,6 +32,13 @@ static struct ieee80211_channel wbsoft_channels[] = {
        { .center_freq = 2412},
 };
 
+static struct ieee80211_supported_band wbsoft_band_2GHz = {
+       .channels       = wbsoft_channels,
+       .n_channels     = ARRAY_SIZE(wbsoft_channels),
+       .bitrates       = wbsoft_rates,
+       .n_bitrates     = ARRAY_SIZE(wbsoft_rates),
+};
+
 int wbsoft_enabled;
 struct ieee80211_hw *my_dev;
 struct wb35_adapter * my_adapter;
@@ -107,11 +114,8 @@ static void wbsoft_configure_filter(struct ieee80211_hw *dev,
 
 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);
-       memcpy(buffer, skb->data, skb->len);
-       if (1 == MLMESendFrame(my_adapter, buffer, skb->len, FRAME_TYPE_802_11_MANAGEMENT))
-               printk("frame sent ok (%d bytes)?\n", skb->len);
+       MLMESendFrame(my_adapter, skb->data, skb->len, FRAME_TYPE_802_11_MANAGEMENT);
+
        return NETDEV_TX_OK;
 }
 
@@ -188,33 +192,37 @@ 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;
-       int     ret = -1;
        u32     ltmp;
        struct usb_device *udev = interface_to_usbdev(intf);
+       struct wbsoft_priv *priv;
+       struct ieee80211_hw *dev;
+       int err;
 
        usb_get_dev(udev);
 
-       printk("[w35und]wb35_probe ->\n");
-
        // 20060630.2 Check the device if it already be opened
-       ret = usb_control_msg(udev, usb_rcvctrlpipe( udev, 0 ),
+       err = usb_control_msg(udev, usb_rcvctrlpipe( udev, 0 ),
                              0x01, USB_TYPE_VENDOR|USB_RECIP_DEVICE|USB_DIR_IN,
                              0x0, 0x400, &ltmp, 4, HZ*100 );
-       if (ret < 0)
+       if (err)
                goto error;
 
        ltmp = cpu_to_le32(ltmp);
-       if (ltmp)  // Is already initialized?
+       if (ltmp) {  // Is already initialized?
+               err = -EBUSY;
                goto error;
+       }
 
        adapter = kzalloc(sizeof(*adapter), GFP_KERNEL);
+       if (!adapter) {
+               err = -ENOMEM;
+               goto error;
+       }
 
        my_adapter = adapter;
-       pWbLinux = &adapter->WbLinux;
        pWbUsb = &adapter->sHwData.WbUsb;
        pWbUsb->udev = udev;
 
@@ -227,69 +235,47 @@ static int wb35_probe(struct usb_interface *intf, const struct usb_device_id *id
        }
 
        if (!WbWLanInitialize(adapter)) {
-               printk("[w35und]WbWLanInitialize fail\n");
-               goto error;
+               err = -EINVAL;
+               goto error_free_adapter;
        }
 
-       {
-               struct wbsoft_priv *priv;
-               struct ieee80211_hw *dev;
-               static struct ieee80211_supported_band band;
-               int res;
-
-               dev = ieee80211_alloc_hw(sizeof(*priv), &wbsoft_ops);
-
-               if (!dev) {
-                       printk("w35und: ieee80211 alloc failed\n" );
-                       BUG();
-               }
-
-               my_dev = dev;
-
-               SET_IEEE80211_DEV(dev, &udev->dev);
-               {
-                       phw_data_t pHwData = &adapter->sHwData;
-                       unsigned char           dev_addr[MAX_ADDR_LEN];
-                       hal_get_permanent_address(pHwData, dev_addr);
-                       SET_IEEE80211_PERM_ADDR(dev, dev_addr);
-               }
-
+       dev = ieee80211_alloc_hw(sizeof(*priv), &wbsoft_ops);
+       if (!dev)
+               goto error_free_adapter;
 
-               dev->extra_tx_headroom = 12;    /* FIXME */
-               dev->flags = 0;
+       my_dev = dev;
 
-               dev->channel_change_time = 1000;
-//             dev->max_rssi = 100;
-
-               dev->queues = 1;
+       SET_IEEE80211_DEV(dev, &udev->dev);
+       {
+               phw_data_t pHwData = &adapter->sHwData;
+               unsigned char dev_addr[MAX_ADDR_LEN];
+               hal_get_permanent_address(pHwData, dev_addr);
+               SET_IEEE80211_PERM_ADDR(dev, dev_addr);
+       }
 
-               band.channels = wbsoft_channels;
-               band.n_channels = ARRAY_SIZE(wbsoft_channels);
-               band.bitrates = wbsoft_rates;
-               band.n_bitrates = ARRAY_SIZE(wbsoft_rates);
+       dev->extra_tx_headroom = 12;    /* FIXME */
+       dev->flags = 0;
 
-               dev->wiphy->bands[IEEE80211_BAND_2GHZ] = &band;
-#if 0
-               wbsoft_modes[0].num_channels = 1;
-               wbsoft_modes[0].channels = wbsoft_channels;
-               wbsoft_modes[0].mode = MODE_IEEE80211B;
-               wbsoft_modes[0].num_rates = ARRAY_SIZE(wbsoft_rates);
-               wbsoft_modes[0].rates = wbsoft_rates;
+       dev->channel_change_time = 1000;
+       dev->queues = 1;
 
-               res = ieee80211_register_hwmode(dev, &wbsoft_modes[0]);
-               BUG_ON(res);
-#endif
+       dev->wiphy->bands[IEEE80211_BAND_2GHZ] = &wbsoft_band_2GHz;
 
-               res = ieee80211_register_hw(dev);
-               BUG_ON(res);
-       }
+       err = ieee80211_register_hw(dev);
+       if (err)
+               goto error_free_hw;
 
-       usb_set_intfdata( intf, adapter );
+       usb_set_intfdata(intf, adapter);
 
-       printk("[w35und] _probe OK\n");
        return 0;
+
+error_free_hw:
+       ieee80211_free_hw(dev);
+error_free_adapter:
+       kfree(adapter);
 error:
-       return -ENOMEM;
+       usb_put_dev(udev);
+       return err;
 }
 
 void packet_came(char *pRxBufferAddress, int PacketSize)
@@ -320,29 +306,14 @@ void packet_came(char *pRxBufferAddress, int PacketSize)
        ieee80211_rx_irqsafe(my_dev, skb, &rx_status);
 }
 
-unsigned char
-WbUsb_initial(phw_data_t pHwData)
-{
-       return 1;
-}
-
-
-void
-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;
+       struct wb35_adapter *adapter = usb_get_intfdata(intf);
 
-       // Card remove
        WbWlanHalt(adapter);
 
+       usb_set_intfdata(intf, NULL);
+       usb_put_dev(interface_to_usbdev(intf));
 }
 
 static struct usb_driver wb35_driver = {