13 files changed, 71 insertions, 53 deletions

diff --git a/drivers/macintosh/rack-meter.c b/drivers/macintosh/rack-meter.c
index f1b6f563673a..5ed41fe84e57 100644
--- a/drivers/macintosh/rack-meter.c
+++ b/drivers/macintosh/rack-meter.c
@@ -48,7 +48,8 @@ struct rackmeter_dma {
 } ____cacheline_aligned;
 
 struct rackmeter_cpu {
-        struct work_struct      sniffer;
+        struct delayed_work     sniffer;
+        struct rackmeter        *rm;
         cputime64_t             prev_wall;
         cputime64_t             prev_idle;
         int                     zero;
@@ -208,11 +209,12 @@ static void rackmeter_setup_dbdma(struct rackmeter *rm)
         rackmeter_do_pause(rm, 0);
 }
 
-static void rackmeter_do_timer(void *data)
+static void rackmeter_do_timer(struct work_struct *work)
 {
-        struct rackmeter *rm = data;
+        struct rackmeter_cpu *rcpu =
+                container_of(work, struct rackmeter_cpu, sniffer.work);
+        struct rackmeter *rm = rcpu->rm;
         unsigned int cpu = smp_processor_id();
-        struct rackmeter_cpu *rcpu = &rm->cpu[cpu];
         cputime64_t cur_jiffies, total_idle_ticks;
         unsigned int total_ticks, idle_ticks;
         int i, offset, load, cumm, pause;
@@ -263,8 +265,10 @@ static void __devinit rackmeter_init_cpu_sniffer(struct rackmeter *rm)
          * on those machines yet
          */
 
-        INIT_WORK(&rm->cpu[0].sniffer, rackmeter_do_timer, rm);
-        INIT_WORK(&rm->cpu[1].sniffer, rackmeter_do_timer, rm);
+        rm->cpu[0].rm = rm;
+        INIT_DELAYED_WORK(&rm->cpu[0].sniffer, rackmeter_do_timer);
+        rm->cpu[1].rm = rm;
+        INIT_DELAYED_WORK(&rm->cpu[1].sniffer, rackmeter_do_timer);
 
         for_each_online_cpu(cpu) {
                 struct rackmeter_cpu *rcpu;
diff --git a/drivers/net/chelsio/cphy.h b/drivers/net/chelsio/cphy.h
index 60901f25014e..cf9143499882 100644
--- a/drivers/net/chelsio/cphy.h
+++ b/drivers/net/chelsio/cphy.h
@@ -91,7 +91,7 @@ struct cphy {
         int state;      /* Link status state machine */
         adapter_t *adapter;                  /* associated adapter */
 
-        struct work_struct phy_update;
+        struct delayed_work phy_update;
 
         u16 bmsr;
         int count;
diff --git a/drivers/net/chelsio/my3126.c b/drivers/net/chelsio/my3126.c
index 0b90014d5b3e..c7731b6f9de3 100644
--- a/drivers/net/chelsio/my3126.c
+++ b/drivers/net/chelsio/my3126.c
@@ -93,9 +93,11 @@ static int my3126_interrupt_handler(struct cphy *cphy)
         return cphy_cause_link_change;
 }
 
-static void my3216_poll(void *arg)
+static void my3216_poll(struct work_struct *work)
 {
-        my3126_interrupt_handler(arg);
+        struct cphy *cphy = container_of(work, struct cphy, phy_update.work);
+
+        my3126_interrupt_handler(cphy);
 }
 
 static int my3126_set_loopback(struct cphy *cphy, int on)
@@ -171,7 +173,7 @@ static struct cphy *my3126_phy_create(adapter_t *adapter,
         if (cphy)
                 cphy_init(cphy, adapter, phy_addr, &my3126_ops, mdio_ops);
 
-        INIT_WORK(&cphy->phy_update, my3216_poll, cphy);
+        INIT_DELAYED_WORK(&cphy->phy_update, my3216_poll);
         cphy->bmsr = 0;
 
         return (cphy);
diff --git a/drivers/net/netxen/netxen_nic.h b/drivers/net/netxen/netxen_nic.h
index d925053fe597..9c588af8ab74 100644
--- a/drivers/net/netxen/netxen_nic.h
+++ b/drivers/net/netxen/netxen_nic.h
@@ -714,6 +714,7 @@ struct netxen_adapter {
         spinlock_t lock;
         struct work_struct watchdog_task;
         struct work_struct tx_timeout_task;
+        struct net_device *netdev;
         struct timer_list watchdog_timer;
 
         u32 curr_window;
@@ -921,7 +922,7 @@ netxen_nic_do_ioctl(struct netxen_adapter *adapter, void *u_data,
                     struct netxen_port *port);
 int netxen_nic_rx_has_work(struct netxen_adapter *adapter);
 int netxen_nic_tx_has_work(struct netxen_adapter *adapter);
-void netxen_watchdog_task(unsigned long v);
+void netxen_watchdog_task(struct work_struct *work);
 void netxen_post_rx_buffers(struct netxen_adapter *adapter, u32 ctx,
                             u32 ringid);
 void netxen_process_cmd_ring(unsigned long data);
diff --git a/drivers/net/netxen/netxen_nic_init.c b/drivers/net/netxen/netxen_nic_init.c
index 0dca029bc3e5..eae18236aefa 100644
--- a/drivers/net/netxen/netxen_nic_init.c
+++ b/drivers/net/netxen/netxen_nic_init.c
@@ -710,12 +710,13 @@ static inline int netxen_nic_check_temp(struct netxen_adapter *adapter)
         return rv;
 }
 
-void netxen_watchdog_task(unsigned long v)
+void netxen_watchdog_task(struct work_struct *work)
 {
         int port_num;
         struct netxen_port *port;
         struct net_device *netdev;
-        struct netxen_adapter *adapter = (struct netxen_adapter *)v;
+        struct netxen_adapter *adapter =
+                container_of(work, struct netxen_adapter, watchdog_task);
 
         if (netxen_nic_check_temp(adapter))
                 return;
diff --git a/drivers/net/netxen/netxen_nic_main.c b/drivers/net/netxen/netxen_nic_main.c
index 1cb662d5bd76..df0bb36a1cfb 100644
--- a/drivers/net/netxen/netxen_nic_main.c
+++ b/drivers/net/netxen/netxen_nic_main.c
@@ -64,7 +64,7 @@ static int netxen_nic_open(struct net_device *netdev);
 static int netxen_nic_close(struct net_device *netdev);
 static int netxen_nic_xmit_frame(struct sk_buff *, struct net_device *);
 static void netxen_tx_timeout(struct net_device *netdev);
-static void netxen_tx_timeout_task(struct net_device *netdev);
+static void netxen_tx_timeout_task(struct work_struct *work);
 static void netxen_watchdog(unsigned long);
 static int netxen_handle_int(struct netxen_adapter *, struct net_device *);
 static int netxen_nic_ioctl(struct net_device *netdev,
@@ -274,8 +274,7 @@ netxen_nic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
         adapter->ahw.xg_linkup = 0;
         adapter->watchdog_timer.function = &netxen_watchdog;
         adapter->watchdog_timer.data = (unsigned long)adapter;
-        INIT_WORK(&adapter->watchdog_task,
-                  (void (*)(void *))netxen_watchdog_task, adapter);
+        INIT_WORK(&adapter->watchdog_task, netxen_watchdog_task);
         adapter->ahw.pdev = pdev;
         adapter->proc_cmd_buf_counter = 0;
         pci_read_config_byte(pdev, PCI_REVISION_ID, &adapter->ahw.revision_id);
@@ -379,8 +378,8 @@ netxen_nic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
                                                                   dev_addr);
                         }
                 }
-                INIT_WORK(&adapter->tx_timeout_task,
-                          (void (*)(void *))netxen_tx_timeout_task, netdev);
+                adapter->netdev = netdev;
+                INIT_WORK(&adapter->tx_timeout_task, netxen_tx_timeout_task);
                 netif_carrier_off(netdev);
                 netif_stop_queue(netdev);
 
@@ -938,18 +937,20 @@ static void netxen_tx_timeout(struct net_device *netdev)
         schedule_work(&adapter->tx_timeout_task);
 }
 
-static void netxen_tx_timeout_task(struct net_device *netdev)
+static void netxen_tx_timeout_task(struct work_struct *work)
 {
-        struct netxen_port *port = (struct netxen_port *)netdev_priv(netdev);
+        struct netxen_adapter *adapter =
+                container_of(work, struct netxen_adapter, tx_timeout_task);
+        struct net_device *netdev = adapter->netdev;
         unsigned long flags;
 
         printk(KERN_ERR "%s %s: transmit timeout, resetting.\n",
                netxen_nic_driver_name, netdev->name);
 
-        spin_lock_irqsave(&port->adapter->lock, flags);
+        spin_lock_irqsave(&adapter->lock, flags);
         netxen_nic_close(netdev);
         netxen_nic_open(netdev);
-        spin_unlock_irqrestore(&port->adapter->lock, flags);
+        spin_unlock_irqrestore(&adapter->lock, flags);
         netdev->trans_start = jiffies;
         netif_wake_queue(netdev);
 }
diff --git a/drivers/net/smc91x.c b/drivers/net/smc91x.c
index 95b6478f55c6..e62a9586fb95 100644
--- a/drivers/net/smc91x.c
+++ b/drivers/net/smc91x.c
@@ -210,6 +210,7 @@ struct smc_local {
 
         /* work queue */
         struct work_struct phy_configure;
+        struct net_device *dev;
         int     work_pending;
 
         spinlock_t lock;
@@ -1114,10 +1115,11 @@ static void smc_phy_check_media(struct net_device *dev, int init)
  * of autonegotiation.)  If the RPC ANEG bit is cleared, the selection
  * is controlled by the RPC SPEED and RPC DPLX bits.
  */
-static void smc_phy_configure(void *data)
+static void smc_phy_configure(struct work_struct *work)
 {
-        struct net_device *dev = data;
-        struct smc_local *lp = netdev_priv(dev);
+        struct smc_local *lp =
+                container_of(work, struct smc_local, phy_configure);
+        struct net_device *dev = lp->dev;
         void __iomem *ioaddr = lp->base;
         int phyaddr = lp->mii.phy_id;
         int my_phy_caps; /* My PHY capabilities */
@@ -1592,7 +1594,7 @@ smc_open(struct net_device *dev)
 
         /* Configure the PHY, initialize the link state */
         if (lp->phy_type != 0)
-                smc_phy_configure(dev);
+                smc_phy_configure(&lp->phy_configure);
         else {
                 spin_lock_irq(&lp->lock);
                 smc_10bt_check_media(dev, 1);
@@ -1972,7 +1974,8 @@ static int __init smc_probe(struct net_device *dev, void __iomem *ioaddr)
 #endif
 
         tasklet_init(&lp->tx_task, smc_hardware_send_pkt, (unsigned long)dev);
-        INIT_WORK(&lp->phy_configure, smc_phy_configure, dev);
+        INIT_WORK(&lp->phy_configure, smc_phy_configure);
+        lp->dev = dev;
         lp->mii.phy_id_mask = 0x1f;
         lp->mii.reg_num_mask = 0x1f;
         lp->mii.force_media = 0;
@@ -2322,7 +2325,7 @@ static int smc_drv_resume(struct platform_device *dev)
                         smc_reset(ndev);
                         smc_enable(ndev);
                         if (lp->phy_type != 0)
-                                smc_phy_configure(ndev);
+                                smc_phy_configure(&lp->phy_configure);
                         netif_device_attach(ndev);
                 }
         }
diff --git a/drivers/net/wireless/zd1211rw/zd_mac.c b/drivers/net/wireless/zd1211rw/zd_mac.c
index 44f3cfd4cc1d..f1573a9c2336 100644
--- a/drivers/net/wireless/zd1211rw/zd_mac.c
+++ b/drivers/net/wireless/zd1211rw/zd_mac.c
@@ -32,8 +32,8 @@
 
 static void ieee_init(struct ieee80211_device *ieee);
 static void softmac_init(struct ieee80211softmac_device *sm);
-static void set_rts_cts_work(void *d);
-static void set_basic_rates_work(void *d);
+static void set_rts_cts_work(struct work_struct *work);
+static void set_basic_rates_work(struct work_struct *work);
 
 static void housekeeping_init(struct zd_mac *mac);
 static void housekeeping_enable(struct zd_mac *mac);
@@ -48,8 +48,8 @@ int zd_mac_init(struct zd_mac *mac,
         memset(mac, 0, sizeof(*mac));
         spin_lock_init(&mac->lock);
         mac->netdev = netdev;
-        INIT_WORK(&mac->set_rts_cts_work, set_rts_cts_work, mac);
-        INIT_WORK(&mac->set_basic_rates_work, set_basic_rates_work, mac);
+        INIT_DELAYED_WORK(&mac->set_rts_cts_work, set_rts_cts_work);
+        INIT_DELAYED_WORK(&mac->set_basic_rates_work, set_basic_rates_work);
 
         ieee_init(ieee);
         softmac_init(ieee80211_priv(netdev));
@@ -366,9 +366,10 @@ static void try_enable_tx(struct zd_mac *mac)
         spin_unlock_irqrestore(&mac->lock, flags);
 }
 
-static void set_rts_cts_work(void *d)
+static void set_rts_cts_work(struct work_struct *work)
 {
-        struct zd_mac *mac = d;
+        struct zd_mac *mac =
+                container_of(work, struct zd_mac, set_rts_cts_work.work);
         unsigned long flags;
         u8 rts_rate;
         unsigned int short_preamble;
@@ -387,9 +388,10 @@ static void set_rts_cts_work(void *d)
         try_enable_tx(mac);
 }
 
-static void set_basic_rates_work(void *d)
+static void set_basic_rates_work(struct work_struct *work)
 {
-        struct zd_mac *mac = d;
+        struct zd_mac *mac =
+                container_of(work, struct zd_mac, set_basic_rates_work.work);
         unsigned long flags;
         u16 basic_rates;
 
@@ -467,12 +469,13 @@ static void bssinfo_change(struct net_device *netdev, u32 changes)
         if (need_set_rts_cts && !mac->updating_rts_rate) {
                 mac->updating_rts_rate = 1;
                 netif_stop_queue(mac->netdev);
-                queue_work(zd_workqueue, &mac->set_rts_cts_work);
+                queue_delayed_work(zd_workqueue, &mac->set_rts_cts_work, 0);
         }
         if (need_set_rates && !mac->updating_basic_rates) {
                 mac->updating_basic_rates = 1;
                 netif_stop_queue(mac->netdev);
-                queue_work(zd_workqueue, &mac->set_basic_rates_work);
+                queue_delayed_work(zd_workqueue, &mac->set_basic_rates_work,
+                                   0);
         }
         spin_unlock_irqrestore(&mac->lock, flags);
 }
diff --git a/drivers/net/wireless/zd1211rw/zd_mac.h b/drivers/net/wireless/zd1211rw/zd_mac.h
index 08d6b8c08e75..d4e8b870409d 100644
--- a/drivers/net/wireless/zd1211rw/zd_mac.h
+++ b/drivers/net/wireless/zd1211rw/zd_mac.h
@@ -133,8 +133,8 @@ struct zd_mac {
         struct iw_statistics iw_stats;
 
         struct housekeeping housekeeping;
-        struct work_struct set_rts_cts_work;
-        struct work_struct set_basic_rates_work;
+        struct delayed_work set_rts_cts_work;
+        struct delayed_work set_basic_rates_work;
 
         unsigned int stats_count;
         u8 qual_buffer[ZD_MAC_STATS_BUFFER_SIZE];
diff --git a/drivers/spi/pxa2xx_spi.c b/drivers/spi/pxa2xx_spi.c
index 72025df5561d..494d9b856488 100644
--- a/drivers/spi/pxa2xx_spi.c
+++ b/drivers/spi/pxa2xx_spi.c
@@ -148,7 +148,7 @@ struct chip_data {
         void (*cs_control)(u32 command);
 };
 
-static void pump_messages(void *data);
+static void pump_messages(struct work_struct *work);
 
 static int flush(struct driver_data *drv_data)
 {
@@ -884,9 +884,10 @@ static void pump_transfers(unsigned long data)
         }
 }
 
-static void pump_messages(void *data)
+static void pump_messages(struct work_struct *work)
 {
-        struct driver_data *drv_data = data;
+        struct driver_data *drv_data =
+                container_of(work, struct driver_data, pump_messages);
         unsigned long flags;
 
         /* Lock queue and check for queue work */
@@ -1098,7 +1099,7 @@ static int init_queue(struct driver_data *drv_data)
         tasklet_init(&drv_data->pump_transfers,
                         pump_transfers, (unsigned long)drv_data);
 
-        INIT_WORK(&drv_data->pump_messages, pump_messages, drv_data);
+        INIT_WORK(&drv_data->pump_messages, pump_messages);
         drv_data->workqueue = create_singlethread_workqueue(
                                         drv_data->master->cdev.dev->bus_id);
         if (drv_data->workqueue == NULL)
diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
index 39186db1015f..9be41ed1f9a6 100644
--- a/drivers/usb/core/hub.c
+++ b/drivers/usb/core/hub.c
@@ -68,7 +68,7 @@ struct usb_hub {
 
         unsigned                has_indicators:1;
         u8                      indicator[USB_MAXCHILDREN];
-        struct work_struct      leds;
+        struct delayed_work     leds;
 };
 
 
diff --git a/drivers/usb/misc/appledisplay.c b/drivers/usb/misc/appledisplay.c
index ba30ca6a14aa..02cbb7fff24f 100644
--- a/drivers/usb/misc/appledisplay.c
+++ b/drivers/usb/misc/appledisplay.c
@@ -76,7 +76,7 @@ struct appledisplay {
         char *urbdata;                  /* interrupt URB data buffer */
         char *msgdata;                  /* control message data buffer */
 
-        struct work_struct work;
+        struct delayed_work work;
         int button_pressed;
         spinlock_t lock;
 };
@@ -117,7 +117,7 @@ static void appledisplay_complete(struct urb *urb)
         case ACD_BTN_BRIGHT_UP:
         case ACD_BTN_BRIGHT_DOWN:
                 pdata->button_pressed = 1;
-                queue_work(wq, &pdata->work);
+                queue_delayed_work(wq, &pdata->work, 0);
                 break;
         case ACD_BTN_NONE:
         default:
@@ -184,9 +184,10 @@ static struct backlight_properties appledisplay_bl_data = {
         .max_brightness = 0xFF
 };
 
-static void appledisplay_work(void *private)
+static void appledisplay_work(struct work_struct *work)
 {
-        struct appledisplay *pdata = private;
+        struct appledisplay *pdata =
+                container_of(work, struct appledisplay, work.work);
         int retval;
 
         up(&pdata->bd->sem);
@@ -238,7 +239,7 @@ static int appledisplay_probe(struct usb_interface *iface,
         pdata->udev = udev;
 
         spin_lock_init(&pdata->lock);
-        INIT_WORK(&pdata->work, appledisplay_work, pdata);
+        INIT_DELAYED_WORK(&pdata->work, appledisplay_work);
 
         /* Allocate buffer for control messages */
         pdata->msgdata = kmalloc(ACD_MSG_BUFFER_LEN, GFP_KERNEL);
diff --git a/drivers/video/pxafb.c b/drivers/video/pxafb.c
index 8a8ae55a7403..38eb0b69c2d7 100644
--- a/drivers/video/pxafb.c
+++ b/drivers/video/pxafb.c
@@ -964,9 +964,10 @@ static void set_ctrlr_state(struct pxafb_info *fbi, u_int state)
  * Our LCD controller task (which is called when we blank or unblank)
  * via keventd.
  */
-static void pxafb_task(void *dummy)
+static void pxafb_task(struct work_struct *work)
 {
-        struct pxafb_info *fbi = dummy;
+        struct pxafb_info *fbi =
+                container_of(work, struct pxafb_info, task);
         u_int state = xchg(&fbi->task_state, -1);
 
         set_ctrlr_state(fbi, state);
@@ -1159,7 +1160,7 @@ static struct pxafb_info * __init pxafb_init_fbinfo(struct device *dev)
         }
 
         init_waitqueue_head(&fbi->ctrlr_wait);
-        INIT_WORK(&fbi->task, pxafb_task, fbi);
+        INIT_WORK(&fbi->task, pxafb_task);
         init_MUTEX(&fbi->ctrlr_sem);
 
         return fbi;