[PATCH] libertas: reorganize and simplify init sequence

This patch moves all firmware load responsibility into the interface-specific
code and gets rid of the firmware pointer in the generic card structure.  It
also removes 3 fairly unecessary callbacks: hw_register_dev, hw_unregister_dev,
and hw_prog_firmware.  It also makes the init sequence from interface
probe functions more logical, as there are paired add/remove and start/stop
calls into generic libertas code.

Because the USB driver code uses the same TX URB callback for both firmware
upload (where the generic libertas structure isn't initialized yet) and for
normal operation (where it is), some bits of USB code have to deal with
'priv' being NULL.  All USB firmware upload bits have been changed to not
require 'priv' at all, but simply the USB card structure.

Signed-off-by: Dan Williams <dcbw@redhat.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

1 files changed, 0 insertions, 4 deletions

diff --git a/drivers/net/wireless/libertas/dev.h b/drivers/net/wireless/libertas/dev.h
index a3c94d7388ab..1fb807aa91b9 100644
--- a/drivers/net/wireless/libertas/dev.h
+++ b/drivers/net/wireless/libertas/dev.h
@@ -143,7 +143,6 @@ struct _wlan_private {
            all other bits reserved 0 */
         u8 dnld_sent;
 
-        const struct firmware *firmware;
         struct device *hotplug_device;
 
         /** thread to service interrupts */
@@ -156,9 +155,6 @@ struct _wlan_private {
         struct work_struct sync_channel;
 
         /** Hardware access */
-        int (*hw_register_dev) (wlan_private * priv);
-        int (*hw_unregister_dev) (wlan_private *);
-        int (*hw_prog_firmware) (wlan_private *);
         int (*hw_host_to_card) (wlan_private * priv, u8 type, u8 * payload, u16 nb);
         int (*hw_get_int_status) (wlan_private * priv, u8 *);
         int (*hw_read_event_cause) (wlan_private *);