Merge branch 'master' into upstream

Conflicts:

	drivers/net/netxen/netxen_nic.h
	drivers/net/netxen/netxen_nic_main.c

1 files changed, 15 insertions, 13 deletions

diff --git a/drivers/mmc/tifm_sd.c b/drivers/mmc/tifm_sd.c
index 0fdc55b08a6d..e846499a004c 100644
--- a/drivers/mmc/tifm_sd.c
+++ b/drivers/mmc/tifm_sd.c
@@ -99,7 +99,7 @@ struct tifm_sd {
 
         struct mmc_request    *req;
         struct work_struct    cmd_handler;
-        struct work_struct    abort_handler;
+        struct delayed_work   abort_handler;
         wait_queue_head_t     can_eject;
 
         size_t                written_blocks;
@@ -496,9 +496,9 @@ err_out:
         mmc_request_done(mmc, mrq);
 }
 
-static void tifm_sd_end_cmd(void *data)
+static void tifm_sd_end_cmd(struct work_struct *work)
 {
-        struct tifm_sd *host = data;
+        struct tifm_sd *host = container_of(work, struct tifm_sd, cmd_handler);
         struct tifm_dev *sock = host->dev;
         struct mmc_host *mmc = tifm_get_drvdata(sock);
         struct mmc_request *mrq;
@@ -608,9 +608,9 @@ err_out:
         mmc_request_done(mmc, mrq);
 }
 
-static void tifm_sd_end_cmd_nodma(void *data)
+static void tifm_sd_end_cmd_nodma(struct work_struct *work)
 {
-        struct tifm_sd *host = (struct tifm_sd*)data;
+        struct tifm_sd *host = container_of(work, struct tifm_sd, cmd_handler);
         struct tifm_dev *sock = host->dev;
         struct mmc_host *mmc = tifm_get_drvdata(sock);
         struct mmc_request *mrq;
@@ -661,11 +661,14 @@ static void tifm_sd_end_cmd_nodma(void *data)
         mmc_request_done(mmc, mrq);
 }
 
-static void tifm_sd_abort(void *data)
+static void tifm_sd_abort(struct work_struct *work)
 {
+        struct tifm_sd *host =
+                container_of(work, struct tifm_sd, abort_handler.work);
+
         printk(KERN_ERR DRIVER_NAME
                 ": card failed to respond for a long period of time");
-        tifm_eject(((struct tifm_sd*)data)->dev);
+        tifm_eject(host->dev);
 }
 
 static void tifm_sd_ios(struct mmc_host *mmc, struct mmc_ios *ios)
@@ -762,9 +765,9 @@ static struct mmc_host_ops tifm_sd_ops = {
         .get_ro  = tifm_sd_ro
 };
 
-static void tifm_sd_register_host(void *data)
+static void tifm_sd_register_host(struct work_struct *work)
 {
-        struct tifm_sd *host = (struct tifm_sd*)data;
+        struct tifm_sd *host = container_of(work, struct tifm_sd, cmd_handler);
         struct tifm_dev *sock = host->dev;
         struct mmc_host *mmc = tifm_get_drvdata(sock);
         unsigned long flags;
@@ -772,8 +775,7 @@ static void tifm_sd_register_host(void *data)
         spin_lock_irqsave(&sock->lock, flags);
         host->flags |= HOST_REG;
         PREPARE_WORK(&host->cmd_handler,
-                        no_dma ? tifm_sd_end_cmd_nodma : tifm_sd_end_cmd,
-                        data);
+                        no_dma ? tifm_sd_end_cmd_nodma : tifm_sd_end_cmd);
         spin_unlock_irqrestore(&sock->lock, flags);
         dev_dbg(&sock->dev, "adding host\n");
         mmc_add_host(mmc);
@@ -799,8 +801,8 @@ static int tifm_sd_probe(struct tifm_dev *sock)
         host->dev = sock;
         host->clk_div = 61;
         init_waitqueue_head(&host->can_eject);
-        INIT_WORK(&host->cmd_handler, tifm_sd_register_host, host);
-        INIT_WORK(&host->abort_handler, tifm_sd_abort, host);
+        INIT_WORK(&host->cmd_handler, tifm_sd_register_host);
+        INIT_DELAYED_WORK(&host->abort_handler, tifm_sd_abort);
 
         tifm_set_drvdata(sock, mmc);
         sock->signal_irq = tifm_sd_signal_irq;