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, 5 insertions, 4 deletions

diff --git a/drivers/isdn/hisax/hfc_2bds0.c b/drivers/isdn/hisax/hfc_2bds0.c
index 6360e821472..8d9864453a2 100644
--- a/drivers/isdn/hisax/hfc_2bds0.c
+++ b/drivers/isdn/hisax/hfc_2bds0.c
@@ -549,10 +549,11 @@ setstack_2b(struct PStack *st, struct BCState *bcs)
 }
 
 static void
-hfcd_bh(struct IsdnCardState *cs)
+hfcd_bh(struct work_struct *work)
 {
-        if (!cs)
-                return;
+        struct IsdnCardState *cs =
+                container_of(work, struct IsdnCardState, tqueue);
+
         if (test_and_clear_bit(D_L1STATECHANGE, &cs->event)) {
                 switch (cs->dc.hfcd.ph_state) {
                         case (0):
@@ -1072,5 +1073,5 @@ set_cs_func(struct IsdnCardState *cs)
         cs->dbusytimer.function = (void *) hfc_dbusy_timer;
         cs->dbusytimer.data = (long) cs;
         init_timer(&cs->dbusytimer);
-        INIT_WORK(&cs->tqueue, (void *)(void *) hfcd_bh, cs);
+        INIT_WORK(&cs->tqueue, hfcd_bh);
 }