6 files changed, 69 insertions, 55 deletions

diff --git a/drivers/net/wireless/b43/b43.h b/drivers/net/wireless/b43/b43.h
index 32a24f5c4fa6..08a011f0834a 100644
--- a/drivers/net/wireless/b43/b43.h
+++ b/drivers/net/wireless/b43/b43.h
@@ -724,6 +724,7 @@ struct b43_wldev {
         bool short_preamble;    /* TRUE, if short preamble is enabled. */
         bool short_slot;        /* TRUE, if short slot timing is enabled. */
         bool radio_hw_enable;   /* saved state of radio hardware enabled state */
+        bool suspend_in_progress;       /* TRUE, if we are in a suspend/resume cycle */
 
         /* PHY/Radio device. */
         struct b43_phy phy;
diff --git a/drivers/net/wireless/b43/leds.c b/drivers/net/wireless/b43/leds.c
index 4b590d8c65ff..0908335892db 100644
--- a/drivers/net/wireless/b43/leds.c
+++ b/drivers/net/wireless/b43/leds.c
@@ -116,7 +116,10 @@ static void b43_unregister_led(struct b43_led *led)
 {
         if (!led->dev)
                 return;
-        led_classdev_unregister(&led->led_dev);
+        if (led->dev->suspend_in_progress)
+                led_classdev_unregister_suspended(&led->led_dev);
+        else
+                led_classdev_unregister(&led->led_dev);
         b43_led_turn_off(led->dev, led->index, led->activelow);
         led->dev = NULL;
 }
diff --git a/drivers/net/wireless/b43/main.c b/drivers/net/wireless/b43/main.c
index 64c154d080d8..ef65c41af00f 100644
--- a/drivers/net/wireless/b43/main.c
+++ b/drivers/net/wireless/b43/main.c
@@ -38,6 +38,7 @@
 #include <linux/wireless.h>
 #include <linux/workqueue.h>
 #include <linux/skbuff.h>
+#include <linux/io.h>
 #include <linux/dma-mapping.h>
 #include <asm/unaligned.h>
 
@@ -2554,10 +2555,10 @@ static int b43_rng_read(struct hwrng *rng, u32 * data)
         return (sizeof(u16));
 }
 
-static void b43_rng_exit(struct b43_wl *wl)
+static void b43_rng_exit(struct b43_wl *wl, bool suspended)
 {
         if (wl->rng_initialized)
-                hwrng_unregister(&wl->rng);
+                __hwrng_unregister(&wl->rng, suspended);
 }
 
 static int b43_rng_init(struct b43_wl *wl)
@@ -3417,8 +3418,10 @@ static void b43_wireless_core_exit(struct b43_wldev *dev)
         macctl |= B43_MACCTL_PSM_JMP0;
         b43_write32(dev, B43_MMIO_MACCTL, macctl);
 
-        b43_leds_exit(dev);
-        b43_rng_exit(dev->wl);
+        if (!dev->suspend_in_progress) {
+                b43_leds_exit(dev);
+                b43_rng_exit(dev->wl, false);
+        }
         b43_dma_free(dev);
         b43_chip_exit(dev);
         b43_radio_turn_off(dev, 1);
@@ -3534,11 +3537,13 @@ static int b43_wireless_core_init(struct b43_wldev *dev)
         ssb_bus_powerup(bus, 1);        /* Enable dynamic PCTL */
         b43_upload_card_macaddress(dev);
         b43_security_init(dev);
-        b43_rng_init(wl);
+        if (!dev->suspend_in_progress)
+                b43_rng_init(wl);
 
         b43_set_status(dev, B43_STAT_INITIALIZED);
 
-        b43_leds_init(dev);
+        if (!dev->suspend_in_progress)
+                b43_leds_init(dev);
 out:
         return err;
 
@@ -4135,6 +4140,7 @@ static int b43_suspend(struct ssb_device *dev, pm_message_t state)
         b43dbg(wl, "Suspending...\n");
 
         mutex_lock(&wl->mutex);
+        wldev->suspend_in_progress = true;
         wldev->suspend_init_status = b43_status(wldev);
         if (wldev->suspend_init_status >= B43_STAT_STARTED)
                 b43_wireless_core_stop(wldev);
@@ -4166,15 +4172,17 @@ static int b43_resume(struct ssb_device *dev)
         if (wldev->suspend_init_status >= B43_STAT_STARTED) {
                 err = b43_wireless_core_start(wldev);
                 if (err) {
+                        b43_leds_exit(wldev);
+                        b43_rng_exit(wldev->wl, true);
                         b43_wireless_core_exit(wldev);
                         b43err(wl, "Resume failed at core start\n");
                         goto out;
                 }
         }
-        mutex_unlock(&wl->mutex);
-
         b43dbg(wl, "Device resumed.\n");
-      out:
+ out:
+        wldev->suspend_in_progress = false;
+        mutex_unlock(&wl->mutex);
         return err;
 }
 
diff --git a/drivers/net/wireless/ipw2100.c b/drivers/net/wireless/ipw2100.c
index 2ab107f45793..5bf9e00b070c 100644
--- a/drivers/net/wireless/ipw2100.c
+++ b/drivers/net/wireless/ipw2100.c
@@ -162,7 +162,7 @@ that only one external action is invoked at a time.
 #include <linux/firmware.h>
 #include <linux/acpi.h>
 #include <linux/ctype.h>
-#include <linux/latency.h>
+#include <linux/pm_qos_params.h>
 
 #include "ipw2100.h"
 
@@ -1701,7 +1701,7 @@ static int ipw2100_up(struct ipw2100_priv *priv, int deferred)
         /* the ipw2100 hardware really doesn't want power management delays
          * longer than 175usec
          */
-        modify_acceptable_latency("ipw2100", 175);
+        pm_qos_update_requirement(PM_QOS_CPU_DMA_LATENCY, "ipw2100", 175);
 
         /* If the interrupt is enabled, turn it off... */
         spin_lock_irqsave(&priv->low_lock, flags);
@@ -1856,7 +1856,8 @@ static void ipw2100_down(struct ipw2100_priv *priv)
         ipw2100_disable_interrupts(priv);
         spin_unlock_irqrestore(&priv->low_lock, flags);
 
-        modify_acceptable_latency("ipw2100", INFINITE_LATENCY);
+        pm_qos_update_requirement(PM_QOS_CPU_DMA_LATENCY, "ipw2100",
+                        PM_QOS_DEFAULT_VALUE);
 
         /* We have to signal any supplicant if we are disassociating */
         if (associated)
@@ -6554,7 +6555,8 @@ static int __init ipw2100_init(void)
         if (ret)
                 goto out;
 
-        set_acceptable_latency("ipw2100", INFINITE_LATENCY);
+        pm_qos_add_requirement(PM_QOS_CPU_DMA_LATENCY, "ipw2100",
+                        PM_QOS_DEFAULT_VALUE);
 #ifdef CONFIG_IPW2100_DEBUG
         ipw2100_debug_level = debug;
         ret = driver_create_file(&ipw2100_pci_driver.driver,
@@ -6576,7 +6578,7 @@ static void __exit ipw2100_exit(void)
                            &driver_attr_debug_level);
 #endif
         pci_unregister_driver(&ipw2100_pci_driver);
-        remove_acceptable_latency("ipw2100");
+        pm_qos_remove_requirement(PM_QOS_CPU_DMA_LATENCY, "ipw2100");
 }
 
 module_init(ipw2100_init);
diff --git a/drivers/net/wireless/netwave_cs.c b/drivers/net/wireless/netwave_cs.c
index d2fa079fbc4c..f479c1af6782 100644
--- a/drivers/net/wireless/netwave_cs.c
+++ b/drivers/net/wireless/netwave_cs.c
@@ -195,7 +195,7 @@ static int netwave_pcmcia_config(struct pcmcia_device *arg); /* Runs after card
 static void netwave_detach(struct pcmcia_device *p_dev);    /* Destroy instance */
 
 /* Hardware configuration */
-static void netwave_doreset(kio_addr_t iobase, u_char __iomem *ramBase);
+static void netwave_doreset(unsigned int iobase, u_char __iomem *ramBase);
 static void netwave_reset(struct net_device *dev);
 
 /* Misc device stuff */
@@ -309,7 +309,7 @@ static inline void wait_WOC(unsigned int iobase)
 }
 
 static void netwave_snapshot(netwave_private *priv, u_char __iomem *ramBase, 
-                             kio_addr_t iobase) {
+                             unsigned int iobase) {
     u_short resultBuffer;
 
     /* if time since last snapshot is > 1 sec. (100 jiffies?)  then take 
@@ -340,7 +340,7 @@ static void netwave_snapshot(netwave_private *priv, u_char __iomem *ramBase,
 static struct iw_statistics *netwave_get_wireless_stats(struct net_device *dev)
 {       
     unsigned long flags;
-    kio_addr_t iobase = dev->base_addr;
+    unsigned int iobase = dev->base_addr;
     netwave_private *priv = netdev_priv(dev);
     u_char __iomem *ramBase = priv->ramBase;
     struct iw_statistics* wstats;
@@ -471,7 +471,7 @@ static int netwave_set_nwid(struct net_device *dev,
                             char *extra)
 {
         unsigned long flags;
-        kio_addr_t iobase = dev->base_addr;
+        unsigned int iobase = dev->base_addr;
         netwave_private *priv = netdev_priv(dev);
         u_char __iomem *ramBase = priv->ramBase;
 
@@ -518,7 +518,7 @@ static int netwave_set_scramble(struct net_device *dev,
                                 char *key)
 {
         unsigned long flags;
-        kio_addr_t iobase = dev->base_addr;
+        unsigned int iobase = dev->base_addr;
         netwave_private *priv = netdev_priv(dev);
         u_char __iomem *ramBase = priv->ramBase;
 
@@ -621,7 +621,7 @@ static int netwave_get_snap(struct net_device *dev,
                             char *extra)
 {
         unsigned long flags;
-        kio_addr_t iobase = dev->base_addr;
+        unsigned int iobase = dev->base_addr;
         netwave_private *priv = netdev_priv(dev);
         u_char __iomem *ramBase = priv->ramBase;
 
@@ -874,7 +874,7 @@ static int netwave_resume(struct pcmcia_device *link)
  *
  *    Proper hardware reset of the card.
  */
-static void netwave_doreset(kio_addr_t ioBase, u_char __iomem *ramBase)
+static void netwave_doreset(unsigned int ioBase, u_char __iomem *ramBase)
 {
     /* Reset card */
     wait_WOC(ioBase);
@@ -892,7 +892,7 @@ static void netwave_reset(struct net_device *dev) {
     /* u_char state; */
     netwave_private *priv = netdev_priv(dev);
     u_char __iomem *ramBase = priv->ramBase;
-    kio_addr_t iobase = dev->base_addr;
+    unsigned int iobase = dev->base_addr;
 
     DEBUG(0, "netwave_reset: Done with hardware reset\n");
 
@@ -973,7 +973,7 @@ static int netwave_hw_xmit(unsigned char* data, int len,
         
     netwave_private *priv = netdev_priv(dev);
     u_char __iomem * ramBase = priv->ramBase;
-    kio_addr_t iobase = dev->base_addr;
+    unsigned int iobase = dev->base_addr;
 
     /* Disable interrupts & save flags */
     spin_lock_irqsave(&priv->spinlock, flags);
@@ -1065,7 +1065,7 @@ static int netwave_start_xmit(struct sk_buff *skb, struct net_device *dev) {
  */
 static irqreturn_t netwave_interrupt(int irq, void* dev_id)
 {
-    kio_addr_t iobase;
+    unsigned int iobase;
     u_char __iomem *ramBase;
     struct net_device *dev = (struct net_device *)dev_id;
     struct netwave_private *priv = netdev_priv(dev);
@@ -1235,7 +1235,7 @@ static int netwave_rx(struct net_device *dev)
 {
     netwave_private *priv = netdev_priv(dev);
     u_char __iomem *ramBase = priv->ramBase;
-    kio_addr_t iobase = dev->base_addr;
+    unsigned int iobase = dev->base_addr;
     u_char rxStatus;
     struct sk_buff *skb = NULL;
     unsigned int curBuffer,
@@ -1388,7 +1388,7 @@ module_exit(exit_netwave_cs);
  */
 static void set_multicast_list(struct net_device *dev)
 {
-    kio_addr_t iobase = dev->base_addr;
+    unsigned int iobase = dev->base_addr;
     netwave_private *priv = netdev_priv(dev);
     u_char __iomem * ramBase = priv->ramBase;
     u_char  rcvMode = 0;
diff --git a/drivers/net/wireless/wavelan_cs.c b/drivers/net/wireless/wavelan_cs.c
index c2037b2a05bf..06eea6ab7bf0 100644
--- a/drivers/net/wireless/wavelan_cs.c
+++ b/drivers/net/wireless/wavelan_cs.c
@@ -149,7 +149,7 @@ psa_write(struct net_device *	dev,
   net_local *lp = netdev_priv(dev);
   u_char __iomem *ptr = lp->mem + PSA_ADDR + (o << 1);
   int           count = 0;
-  kio_addr_t    base = dev->base_addr;
+  unsigned int  base = dev->base_addr;
   /* As there seem to have no flag PSA_BUSY as in the ISA model, we are
    * oblige to verify this address to know when the PSA is ready... */
   volatile u_char __iomem *verify = lp->mem + PSA_ADDR +
@@ -708,7 +708,7 @@ static void wl_update_history(wavepoint_history *wavepoint, unsigned char sigqua
 /* Perform a handover to a new WavePoint */
 static void wv_roam_handover(wavepoint_history *wavepoint, net_local *lp)
 {
-  kio_addr_t            base = lp->dev->base_addr;
+  unsigned int          base = lp->dev->base_addr;
   mm_t                  m;
   unsigned long         flags;
 
@@ -821,7 +821,7 @@ wv_82593_cmd(struct net_device *	dev,
              int        cmd,
              int        result)
 {
-  kio_addr_t    base = dev->base_addr;
+  unsigned int  base = dev->base_addr;
   int           status;
   int           wait_completed;
   long          spin;
@@ -945,7 +945,7 @@ read_ringbuf(struct net_device *	dev,
              char *     buf,
              int        len)
 {
-  kio_addr_t    base = dev->base_addr;
+  unsigned int  base = dev->base_addr;
   int           ring_ptr = addr;
   int           chunk_len;
   char *        buf_ptr = buf;
@@ -1096,7 +1096,7 @@ wv_psa_show(psa_t *	p)
 static void
 wv_mmc_show(struct net_device * dev)
 {
-  kio_addr_t    base = dev->base_addr;
+  unsigned int  base = dev->base_addr;
   net_local *   lp = netdev_priv(dev);
   mmr_t         m;
 
@@ -1275,7 +1275,7 @@ wv_packet_info(u_char *		p,		/* Packet to dump */
 static inline void
 wv_init_info(struct net_device *        dev)
 {
-  kio_addr_t    base = dev->base_addr;
+  unsigned int  base = dev->base_addr;
   psa_t         psa;
   DECLARE_MAC_BUF(mac);
 
@@ -1294,7 +1294,7 @@ wv_init_info(struct net_device *	dev)
 
 #ifdef DEBUG_BASIC_SHOW
   /* Now, let's go for the basic stuff */
-  printk(KERN_NOTICE "%s: WaveLAN: port %#lx, irq %d, "
+  printk(KERN_NOTICE "%s: WaveLAN: port %#x, irq %d, "
          "hw_addr %s",
          dev->name, base, dev->irq,
          print_mac(mac, dev->dev_addr));
@@ -1828,7 +1828,7 @@ static int wavelan_set_nwid(struct net_device *dev,
                             union iwreq_data *wrqu,
                             char *extra)
 {
-        kio_addr_t base = dev->base_addr;
+        unsigned int base = dev->base_addr;
         net_local *lp = netdev_priv(dev);
         psa_t psa;
         mm_t m;
@@ -1918,7 +1918,7 @@ static int wavelan_set_freq(struct net_device *dev,
                             union iwreq_data *wrqu,
                             char *extra)
 {
-        kio_addr_t base = dev->base_addr;
+        unsigned int base = dev->base_addr;
         net_local *lp = netdev_priv(dev);
         unsigned long flags;
         int ret;
@@ -1948,7 +1948,7 @@ static int wavelan_get_freq(struct net_device *dev,
                             union iwreq_data *wrqu,
                             char *extra)
 {
-        kio_addr_t base = dev->base_addr;
+        unsigned int base = dev->base_addr;
         net_local *lp = netdev_priv(dev);
         psa_t psa;
         unsigned long flags;
@@ -1994,7 +1994,7 @@ static int wavelan_set_sens(struct net_device *dev,
                             union iwreq_data *wrqu,
                             char *extra)
 {
-        kio_addr_t base = dev->base_addr;
+        unsigned int base = dev->base_addr;
         net_local *lp = netdev_priv(dev);
         psa_t psa;
         unsigned long flags;
@@ -2060,7 +2060,7 @@ static int wavelan_set_encode(struct net_device *dev,
                               union iwreq_data *wrqu,
                               char *extra)
 {
-        kio_addr_t base = dev->base_addr;
+        unsigned int base = dev->base_addr;
         net_local *lp = netdev_priv(dev);
         unsigned long flags;
         psa_t psa;
@@ -2130,7 +2130,7 @@ static int wavelan_get_encode(struct net_device *dev,
                               union iwreq_data *wrqu,
                               char *extra)
 {
-        kio_addr_t base = dev->base_addr;
+        unsigned int base = dev->base_addr;
         net_local *lp = netdev_priv(dev);
         psa_t psa;
         unsigned long flags;
@@ -2349,7 +2349,7 @@ static int wavelan_get_range(struct net_device *dev,
                              union iwreq_data *wrqu,
                              char *extra)
 {
-        kio_addr_t base = dev->base_addr;
+        unsigned int base = dev->base_addr;
         net_local *lp = netdev_priv(dev);
         struct iw_range *range = (struct iw_range *) extra;
         unsigned long flags;
@@ -2425,7 +2425,7 @@ static int wavelan_set_qthr(struct net_device *dev,
                             union iwreq_data *wrqu,
                             char *extra)
 {
-        kio_addr_t base = dev->base_addr;
+        unsigned int base = dev->base_addr;
         net_local *lp = netdev_priv(dev);
         psa_t psa;
         unsigned long flags;
@@ -2701,7 +2701,7 @@ static const struct iw_handler_def	wavelan_handler_def =
 static iw_stats *
 wavelan_get_wireless_stats(struct net_device *  dev)
 {
-  kio_addr_t            base = dev->base_addr;
+  unsigned int          base = dev->base_addr;
   net_local *           lp = netdev_priv(dev);
   mmr_t                 m;
   iw_stats *            wstats;
@@ -2764,7 +2764,7 @@ wv_start_of_frame(struct net_device *	dev,
                   int           rfp,    /* end of frame */
                   int           wrap)   /* start of buffer */
 {
-  kio_addr_t    base = dev->base_addr;
+  unsigned int  base = dev->base_addr;
   int           rp;
   int           len;
 
@@ -2925,7 +2925,7 @@ wv_packet_read(struct net_device *		dev,
 static inline void
 wv_packet_rcv(struct net_device *       dev)
 {
-  kio_addr_t    base = dev->base_addr;
+  unsigned int  base = dev->base_addr;
   net_local *   lp = netdev_priv(dev);
   int           newrfp;
   int           rp;
@@ -3062,7 +3062,7 @@ wv_packet_write(struct net_device *	dev,
                 short           length)
 {
   net_local *           lp = netdev_priv(dev);
-  kio_addr_t            base = dev->base_addr;
+  unsigned int          base = dev->base_addr;
   unsigned long         flags;
   int                   clen = length;
   register u_short      xmtdata_base = TX_BASE;
@@ -3183,7 +3183,7 @@ wavelan_packet_xmit(struct sk_buff *	skb,
 static inline int
 wv_mmc_init(struct net_device * dev)
 {
-  kio_addr_t    base = dev->base_addr;
+  unsigned int  base = dev->base_addr;
   psa_t         psa;
   mmw_t         m;
   int           configured;
@@ -3377,7 +3377,7 @@ wv_mmc_init(struct net_device *	dev)
 static int
 wv_ru_stop(struct net_device *  dev)
 {
-  kio_addr_t    base = dev->base_addr;
+  unsigned int  base = dev->base_addr;
   net_local *   lp = netdev_priv(dev);
   unsigned long flags;
   int           status;
@@ -3440,7 +3440,7 @@ wv_ru_stop(struct net_device *	dev)
 static int
 wv_ru_start(struct net_device * dev)
 {
-  kio_addr_t    base = dev->base_addr;
+  unsigned int  base = dev->base_addr;
   net_local *   lp = netdev_priv(dev);
   unsigned long flags;
 
@@ -3528,7 +3528,7 @@ wv_ru_start(struct net_device *	dev)
 static int
 wv_82593_config(struct net_device *     dev)
 {
-  kio_addr_t                    base = dev->base_addr;
+  unsigned int                  base = dev->base_addr;
   net_local *                   lp = netdev_priv(dev);
   struct i82593_conf_block      cfblk;
   int                           ret = TRUE;
@@ -3765,7 +3765,7 @@ static int
 wv_hw_config(struct net_device *        dev)
 {
   net_local *           lp = netdev_priv(dev);
-  kio_addr_t            base = dev->base_addr;
+  unsigned int          base = dev->base_addr;
   unsigned long         flags;
   int                   ret = FALSE;
 
@@ -4047,7 +4047,7 @@ wavelan_interrupt(int		irq,
 {
   struct net_device *   dev = dev_id;
   net_local *   lp;
-  kio_addr_t    base;
+  unsigned int  base;
   int           status0;
   u_int         tx_status;
 
@@ -4306,7 +4306,7 @@ static void
 wavelan_watchdog(struct net_device *    dev)
 {
   net_local *           lp = netdev_priv(dev);
-  kio_addr_t            base = dev->base_addr;
+  unsigned int          base = dev->base_addr;
   unsigned long         flags;
   int                   aborted = FALSE;
 
@@ -4382,7 +4382,7 @@ wavelan_open(struct net_device *	dev)
 {
   net_local *   lp = netdev_priv(dev);
   struct pcmcia_device *        link = lp->link;
-  kio_addr_t    base = dev->base_addr;
+  unsigned int  base = dev->base_addr;
 
 #ifdef DEBUG_CALLBACK_TRACE
   printk(KERN_DEBUG "%s: ->wavelan_open(dev=0x%x)\n", dev->name,
@@ -4436,7 +4436,7 @@ static int
 wavelan_close(struct net_device *       dev)
 {
   struct pcmcia_device *        link = ((net_local *)netdev_priv(dev))->link;
-  kio_addr_t    base = dev->base_addr;
+  unsigned int  base = dev->base_addr;
 
 #ifdef DEBUG_CALLBACK_TRACE
   printk(KERN_DEBUG "%s: ->wavelan_close(dev=0x%x)\n", dev->name,