Merge git://git.infradead.org/users/dhowells/workq-2.6

* git://git.infradead.org/users/dhowells/workq-2.6:
  Actually update the fixed up compile failures.
  WorkQueue: Fix up arch-specific work items where possible
  WorkStruct: make allyesconfig
  WorkStruct: Pass the work_struct pointer instead of context data
  WorkStruct: Merge the pending bit into the wq_data pointer
  WorkStruct: Typedef the work function prototype
  WorkStruct: Separate delayable and non-delayable events.

1 files changed, 3 insertions, 3 deletions

diff --git a/drivers/net/cassini.c b/drivers/net/cassini.c
index fd2cc13f7d97..c8126484c2be 100644
--- a/drivers/net/cassini.c
+++ b/drivers/net/cassini.c
@@ -4066,9 +4066,9 @@ static int cas_alloc_rxds(struct cas *cp)
         return 0;
 }
 
-static void cas_reset_task(void *data)
+static void cas_reset_task(struct work_struct *work)
 {
-        struct cas *cp = (struct cas *) data;
+        struct cas *cp = container_of(work, struct cas, reset_task);
 #if 0
         int pending = atomic_read(&cp->reset_task_pending);
 #else
@@ -5006,7 +5006,7 @@ static int __devinit cas_init_one(struct pci_dev *pdev,
         atomic_set(&cp->reset_task_pending_spare, 0);
         atomic_set(&cp->reset_task_pending_mtu, 0);
 #endif
-        INIT_WORK(&cp->reset_task, cas_reset_task, cp);
+        INIT_WORK(&cp->reset_task, cas_reset_task);
 
         /* Default link parameters */
         if (link_mode >= 0 && link_mode <= 6)