2 files changed, 9 insertions, 7 deletions

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/spi/spi_bitbang.c b/drivers/spi/spi_bitbang.c
index a23862ef72b2..08c1c57c6128 100644
--- a/drivers/spi/spi_bitbang.c
+++ b/drivers/spi/spi_bitbang.c
@@ -265,9 +265,10 @@ static int spi_bitbang_bufs(struct spi_device *spi, struct spi_transfer *t)
  * Drivers can provide word-at-a-time i/o primitives, or provide
  * transfer-at-a-time ones to leverage dma or fifo hardware.
  */
-static void bitbang_work(void *_bitbang)
+static void bitbang_work(struct work_struct *work)
 {
-        struct spi_bitbang      *bitbang = _bitbang;
+        struct spi_bitbang      *bitbang =
+                container_of(work, struct spi_bitbang, work);
         unsigned long           flags;
 
         spin_lock_irqsave(&bitbang->lock, flags);
@@ -456,7 +457,7 @@ int spi_bitbang_start(struct spi_bitbang *bitbang)
         if (!bitbang->master || !bitbang->chipselect)
                 return -EINVAL;
 
-        INIT_WORK(&bitbang->work, bitbang_work, bitbang);
+        INIT_WORK(&bitbang->work, bitbang_work);
         spin_lock_init(&bitbang->lock);
         INIT_LIST_HEAD(&bitbang->queue);