WorkStruct: make allyesconfig

Fix up for make allyesconfig.

Signed-Off-By: David Howells <dhowells@redhat.com>

19 files changed, 78 insertions, 50 deletions

diff --git a/drivers/isdn/act2000/capi.c b/drivers/isdn/act2000/capi.c
index 6ae6eb322111..946c38cf6f8a 100644
--- a/drivers/isdn/act2000/capi.c
+++ b/drivers/isdn/act2000/capi.c
@@ -627,8 +627,10 @@ handle_ack(act2000_card *card, act2000_chan *chan, __u8 blocknr) {
 }
 
 void
-actcapi_dispatch(act2000_card *card)
+actcapi_dispatch(struct work_struct *work)
 {
+        struct act2000_card *card =
+                container_of(work, struct act2000_card, rcv_tq);
         struct sk_buff *skb;
         actcapi_msg *msg;
         __u16 ccmd;
diff --git a/drivers/isdn/act2000/capi.h b/drivers/isdn/act2000/capi.h
index 49f453c53c64..e55f6a931f66 100644
--- a/drivers/isdn/act2000/capi.h
+++ b/drivers/isdn/act2000/capi.h
@@ -356,7 +356,7 @@ extern int actcapi_connect_req(act2000_card *, act2000_chan *, char *, char, int
 extern void actcapi_select_b2_protocol_req(act2000_card *, act2000_chan *);
 extern void actcapi_disconnect_b3_req(act2000_card *, act2000_chan *);
 extern void actcapi_connect_resp(act2000_card *, act2000_chan *, __u8);
-extern void actcapi_dispatch(act2000_card *);
+extern void actcapi_dispatch(struct work_struct *);
 #ifdef DEBUG_MSG
 extern void actcapi_debug_msg(struct sk_buff *skb, int);
 #else
diff --git a/drivers/isdn/act2000/module.c b/drivers/isdn/act2000/module.c
index d89dcde4eade..90593e2ef872 100644
--- a/drivers/isdn/act2000/module.c
+++ b/drivers/isdn/act2000/module.c
@@ -192,8 +192,11 @@ act2000_set_msn(act2000_card *card, char *eazmsn)
 }
 
 static void
-act2000_transmit(struct act2000_card *card)
+act2000_transmit(struct work_struct *work)
 {
+        struct act2000_card *card =
+                container_of(work, struct act2000_card, snd_tq);
+
         switch (card->bus) {
                 case ACT2000_BUS_ISA:
                         act2000_isa_send(card);
@@ -207,8 +210,11 @@ act2000_transmit(struct act2000_card *card)
 }
 
 static void
-act2000_receive(struct act2000_card *card)
+act2000_receive(struct work_struct *work)
 {
+        struct act2000_card *card =
+                container_of(work, struct act2000_card, poll_tq);
+
         switch (card->bus) {
                 case ACT2000_BUS_ISA:
                         act2000_isa_receive(card);
@@ -227,7 +233,7 @@ act2000_poll(unsigned long data)
         act2000_card * card = (act2000_card *)data;
         unsigned long flags;
 
-        act2000_receive(card);
+        act2000_receive(&card->poll_tq);
         spin_lock_irqsave(&card->lock, flags);
         mod_timer(&card->ptimer, jiffies+3);
         spin_unlock_irqrestore(&card->lock, flags);
@@ -578,9 +584,9 @@ act2000_alloccard(int bus, int port, int irq, char *id)
         skb_queue_head_init(&card->sndq);
         skb_queue_head_init(&card->rcvq);
         skb_queue_head_init(&card->ackq);
-        INIT_WORK(&card->snd_tq, (void *) (void *) act2000_transmit, card);
-        INIT_WORK(&card->rcv_tq, (void *) (void *) actcapi_dispatch, card);
-        INIT_WORK(&card->poll_tq, (void *) (void *) act2000_receive, card);
+        INIT_WORK(&card->snd_tq, act2000_transmit);
+        INIT_WORK(&card->rcv_tq, actcapi_dispatch);
+        INIT_WORK(&card->poll_tq, act2000_receive);
         init_timer(&card->ptimer);
         card->interface.owner = THIS_MODULE;
         card->interface.channels = ACT2000_BCH;
diff --git a/drivers/isdn/capi/kcapi.c b/drivers/isdn/capi/kcapi.c
index 8c4fcb9027b3..783a25526315 100644
--- a/drivers/isdn/capi/kcapi.c
+++ b/drivers/isdn/capi/kcapi.c
@@ -208,9 +208,10 @@ static void notify_down(u32 contr)
         }
 }
 
-static void notify_handler(void *data)
+static void notify_handler(struct work_struct *work)
 {
-        struct capi_notifier *np = data;
+        struct capi_notifier *np =
+                container_of(work, struct capi_notifier, work);
 
         switch (np->cmd) {
         case KCI_CONTRUP:
@@ -235,7 +236,7 @@ static int notify_push(unsigned int cmd, u32 controller, u16 applid, u32 ncci)
         if (!np)
                 return -ENOMEM;
 
-        INIT_WORK(&np->work, notify_handler, np);
+        INIT_WORK(&np->work, notify_handler);
         np->cmd = cmd;
         np->controller = controller;
         np->applid = applid;
@@ -248,10 +249,11 @@ static int notify_push(unsigned int cmd, u32 controller, u16 applid, u32 ncci)
         
 /* -------- Receiver ------------------------------------------ */
 
-static void recv_handler(void *_ap)
+static void recv_handler(struct work_struct *work)
 {
         struct sk_buff *skb;
-        struct capi20_appl *ap = (struct capi20_appl *) _ap;
+        struct capi20_appl *ap =
+                container_of(work, struct capi20_appl, recv_work);
 
         if ((!ap) || (ap->release_in_progress))
                 return;
@@ -527,7 +529,7 @@ u16 capi20_register(struct capi20_appl *ap)
         ap->callback = NULL;
         init_MUTEX(&ap->recv_sem);
         skb_queue_head_init(&ap->recv_queue);
-        INIT_WORK(&ap->recv_work, recv_handler, (void *)ap);
+        INIT_WORK(&ap->recv_work, recv_handler);
         ap->release_in_progress = 0;
 
         write_unlock_irqrestore(&application_lock, flags);
diff --git a/drivers/isdn/hisax/amd7930_fn.c b/drivers/isdn/hisax/amd7930_fn.c
index bec59010bc66..3b19caeba258 100644
--- a/drivers/isdn/hisax/amd7930_fn.c
+++ b/drivers/isdn/hisax/amd7930_fn.c
@@ -232,9 +232,10 @@ Amd7930_new_ph(struct IsdnCardState *cs)
 
 
 static void
-Amd7930_bh(struct IsdnCardState *cs)
+Amd7930_bh(struct work_struct *work)
 {
-
+        struct IsdnCardState *cs =
+                container_of(work, struct IsdnCardState, tqueue);
         struct PStack *stptr;
 
         if (!cs)
@@ -789,7 +790,7 @@ Amd7930_init(struct IsdnCardState *cs)
 void __devinit
 setup_Amd7930(struct IsdnCardState *cs)
 {
-        INIT_WORK(&cs->tqueue, (void *)(void *) Amd7930_bh, cs);
+        INIT_WORK(&cs->tqueue, Amd7930_bh);
         cs->dbusytimer.function = (void *) dbusy_timer_handler;
         cs->dbusytimer.data = (long) cs;
         init_timer(&cs->dbusytimer);
diff --git a/drivers/isdn/hisax/config.c b/drivers/isdn/hisax/config.c
index 785b08554fca..cede72cdbb31 100644
--- a/drivers/isdn/hisax/config.c
+++ b/drivers/isdn/hisax/config.c
@@ -1137,7 +1137,6 @@ static int checkcard(int cardnr, char *id, int *busy_flag, struct module *lockow
         cs->tx_skb = NULL;
         cs->tx_cnt = 0;
         cs->event = 0;
-        cs->tqueue.data = cs;
 
         skb_queue_head_init(&cs->rq);
         skb_queue_head_init(&cs->sq);
@@ -1554,7 +1553,7 @@ static void hisax_b_l2l1(struct PStack *st, int pr, void *arg);
 static int hisax_cardmsg(struct IsdnCardState *cs, int mt, void *arg);
 static int hisax_bc_setstack(struct PStack *st, struct BCState *bcs);
 static void hisax_bc_close(struct BCState *bcs);
-static void hisax_bh(struct IsdnCardState *cs);
+static void hisax_bh(struct work_struct *work);
 static void EChannel_proc_rcv(struct hisax_d_if *d_if);
 
 int hisax_register(struct hisax_d_if *hisax_d_if, struct hisax_b_if *b_if[],
@@ -1586,7 +1585,7 @@ int hisax_register(struct hisax_d_if *hisax_d_if, struct hisax_b_if *b_if[],
         hisax_d_if->cs = cs;
         cs->hw.hisax_d_if = hisax_d_if;
         cs->cardmsg = hisax_cardmsg;
-        INIT_WORK(&cs->tqueue, (void *)(void *)hisax_bh, cs);
+        INIT_WORK(&cs->tqueue, hisax_bh);
         cs->channel[0].d_st->l2.l2l1 = hisax_d_l2l1;
         for (i = 0; i < 2; i++) {
                 cs->bcs[i].BC_SetStack = hisax_bc_setstack;
@@ -1618,8 +1617,10 @@ static void hisax_sched_event(struct IsdnCardState *cs, int event)
         schedule_work(&cs->tqueue);
 }
 
-static void hisax_bh(struct IsdnCardState *cs)
+static void hisax_bh(struct work_struct *work)
 {
+        struct IsdnCardState *cs =
+                container_of(work, struct IsdnCardState, tqueue);
         struct PStack *st;
         int pr;
 
diff --git a/drivers/isdn/hisax/hfc4s8s_l1.c b/drivers/isdn/hisax/hfc4s8s_l1.c
index d852c9d998b2..de9b1a4d6bac 100644
--- a/drivers/isdn/hisax/hfc4s8s_l1.c
+++ b/drivers/isdn/hisax/hfc4s8s_l1.c
@@ -1083,8 +1083,9 @@ tx_b_frame(struct hfc4s8s_btype *bch)
 /* bottom half handler for interrupt */
 /*************************************/
 static void
-hfc4s8s_bh(hfc4s8s_hw * hw)
+hfc4s8s_bh(struct work_struct *work)
 {
+        hfc4s8s_hw *hw = container_of(work, hfc4s8s_hw, tqueue);
         u_char b;
         struct hfc4s8s_l1 *l1p;
         volatile u_char *fifo_stat;
@@ -1550,7 +1551,7 @@ setup_instance(hfc4s8s_hw * hw)
                 goto out;
         }
 
-        INIT_WORK(&hw->tqueue, (void *) (void *) hfc4s8s_bh, hw);
+        INIT_WORK(&hw->tqueue, hfc4s8s_bh);
 
         if (request_irq
             (hw->irq, hfc4s8s_interrupt, IRQF_SHARED, hw->card_name, hw)) {
diff --git a/drivers/isdn/hisax/hfc_2bds0.c b/drivers/isdn/hisax/hfc_2bds0.c
index 6360e8214720..8d9864453a23 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);
 }
diff --git a/drivers/isdn/hisax/hfc_pci.c b/drivers/isdn/hisax/hfc_pci.c
index 93f60b563515..5db0a85b827f 100644
--- a/drivers/isdn/hisax/hfc_pci.c
+++ b/drivers/isdn/hisax/hfc_pci.c
@@ -1506,8 +1506,10 @@ setstack_2b(struct PStack *st, struct BCState *bcs)
 /* handle L1 state changes */
 /***************************/
 static void
-hfcpci_bh(struct IsdnCardState *cs)
+hfcpci_bh(struct work_struct *work)
 {
+        struct IsdnCardState *cs =
+                container_of(work, struct IsdnCardState, tqueue);
         u_long  flags;
 //      struct PStack *stptr;
 
@@ -1722,7 +1724,7 @@ setup_hfcpci(struct IsdnCard *card)
                 Write_hfc(cs, HFCPCI_INT_M2, cs->hw.hfcpci.int_m2);
                 /* At this point the needed PCI config is done */
                 /* fifos are still not enabled */
-                INIT_WORK(&cs->tqueue, (void *)(void *) hfcpci_bh, cs);
+                INIT_WORK(&cs->tqueue,  hfcpci_bh);
                 cs->setstack_d = setstack_hfcpci;
                 cs->BC_Send_Data = &hfcpci_send_data;
                 cs->readisac = NULL;
diff --git a/drivers/isdn/hisax/hfc_sx.c b/drivers/isdn/hisax/hfc_sx.c
index 954d1536db1f..4fd09d21a27f 100644
--- a/drivers/isdn/hisax/hfc_sx.c
+++ b/drivers/isdn/hisax/hfc_sx.c
@@ -1251,8 +1251,10 @@ setstack_2b(struct PStack *st, struct BCState *bcs)
 /* handle L1 state changes */
 /***************************/
 static void
-hfcsx_bh(struct IsdnCardState *cs)
+hfcsx_bh(struct work_struct *work)
 {
+        struct IsdnCardState *cs =
+                container_of(work, struct IsdnCardState, tqueue);
         u_long flags;
 
         if (!cs)
@@ -1499,7 +1501,7 @@ setup_hfcsx(struct IsdnCard *card)
         cs->dbusytimer.function = (void *) hfcsx_dbusy_timer;
         cs->dbusytimer.data = (long) cs;
         init_timer(&cs->dbusytimer);
-        INIT_WORK(&cs->tqueue, (void *)(void *) hfcsx_bh, cs);
+        INIT_WORK(&cs->tqueue, hfcsx_bh);
         cs->readisac = NULL;
         cs->writeisac = NULL;
         cs->readisacfifo = NULL;
diff --git a/drivers/isdn/hisax/icc.c b/drivers/isdn/hisax/icc.c
index da706925d54d..682cac32f259 100644
--- a/drivers/isdn/hisax/icc.c
+++ b/drivers/isdn/hisax/icc.c
@@ -77,8 +77,10 @@ icc_new_ph(struct IsdnCardState *cs)
 }
 
 static void
-icc_bh(struct IsdnCardState *cs)
+icc_bh(struct work_struct *work)
 {
+        struct IsdnCardState *cs =
+                container_of(work, struct IsdnCardState, tqueue);
         struct PStack *stptr;
         
         if (!cs)
@@ -674,7 +676,7 @@ clear_pending_icc_ints(struct IsdnCardState *cs)
 void __devinit
 setup_icc(struct IsdnCardState *cs)
 {
-        INIT_WORK(&cs->tqueue, (void *)(void *) icc_bh, cs);
+        INIT_WORK(&cs->tqueue, icc_bh);
         cs->dbusytimer.function = (void *) dbusy_timer_handler;
         cs->dbusytimer.data = (long) cs;
         init_timer(&cs->dbusytimer);
diff --git a/drivers/isdn/hisax/isac.c b/drivers/isdn/hisax/isac.c
index 282f349408bc..4e9f23803dae 100644
--- a/drivers/isdn/hisax/isac.c
+++ b/drivers/isdn/hisax/isac.c
@@ -81,8 +81,10 @@ isac_new_ph(struct IsdnCardState *cs)
 }
 
 static void
-isac_bh(struct IsdnCardState *cs)
+isac_bh(struct work_struct *work)
 {
+        struct IsdnCardState *cs =
+                container_of(work, struct IsdnCardState, tqueue);
         struct PStack *stptr;
         
         if (!cs)
@@ -674,7 +676,7 @@ clear_pending_isac_ints(struct IsdnCardState *cs)
 void __devinit
 setup_isac(struct IsdnCardState *cs)
 {
-        INIT_WORK(&cs->tqueue, (void *)(void *) isac_bh, cs);
+        INIT_WORK(&cs->tqueue, isac_bh);
         cs->dbusytimer.function = (void *) dbusy_timer_handler;
         cs->dbusytimer.data = (long) cs;
         init_timer(&cs->dbusytimer);
diff --git a/drivers/isdn/hisax/isar.c b/drivers/isdn/hisax/isar.c
index 674af673ff96..6f1a6583b17d 100644
--- a/drivers/isdn/hisax/isar.c
+++ b/drivers/isdn/hisax/isar.c
@@ -437,8 +437,10 @@ extern void BChannel_bh(struct BCState *);
 #define B_LL_OK         10
 
 static void
-isar_bh(struct BCState *bcs)
+isar_bh(struct work_struct *work)
 {
+        struct BCState *bcs = container_of(work, struct BCState, tqueue);
+
         BChannel_bh(bcs);
         if (test_and_clear_bit(B_LL_NOCARRIER, &bcs->event))
                 ll_deliver_faxstat(bcs, ISDN_FAX_CLASS1_NOCARR);
@@ -1580,7 +1582,7 @@ isar_setup(struct IsdnCardState *cs)
                 cs->bcs[i].mode = 0;
                 cs->bcs[i].hw.isar.dpath = i + 1;
                 modeisar(&cs->bcs[i], 0, 0);
-                INIT_WORK(&cs->bcs[i].tqueue, (void *)(void *) isar_bh, &cs->bcs[i]);
+                INIT_WORK(&cs->bcs[i].tqueue, isar_bh);
         }
 }
 
diff --git a/drivers/isdn/hisax/isdnl1.c b/drivers/isdn/hisax/isdnl1.c
index bab356886483..a14204ec88ee 100644
--- a/drivers/isdn/hisax/isdnl1.c
+++ b/drivers/isdn/hisax/isdnl1.c
@@ -315,8 +315,10 @@ BChannel_proc_ack(struct BCState *bcs)
 }
 
 void
-BChannel_bh(struct BCState *bcs)
+BChannel_bh(struct work_struct *work)
 {
+        struct BCState *bcs = container_of(work, struct BCState, tqueue);
+
         if (!bcs)
                 return;
         if (test_and_clear_bit(B_RCVBUFREADY, &bcs->event))
@@ -362,7 +364,7 @@ init_bcstate(struct IsdnCardState *cs, int bc)
 
         bcs->cs = cs;
         bcs->channel = bc;
-        INIT_WORK(&bcs->tqueue, (void *)(void *) BChannel_bh, bcs);
+        INIT_WORK(&bcs->tqueue, BChannel_bh);
         spin_lock_init(&bcs->aclock);
         bcs->BC_SetStack = NULL;
         bcs->BC_Close = NULL;
diff --git a/drivers/isdn/hisax/w6692.c b/drivers/isdn/hisax/w6692.c
index 1655341797a9..3aeceaf9769e 100644
--- a/drivers/isdn/hisax/w6692.c
+++ b/drivers/isdn/hisax/w6692.c
@@ -101,8 +101,10 @@ W6692_new_ph(struct IsdnCardState *cs)
 }
 
 static void
-W6692_bh(struct IsdnCardState *cs)
+W6692_bh(struct work_struct *work)
 {
+        struct IsdnCardState *cs =
+                container_of(work, struct IsdnCardState, tqueue);
         struct PStack *stptr;
 
         if (!cs)
@@ -1070,7 +1072,7 @@ setup_w6692(struct IsdnCard *card)
                id_list[cs->subtyp].card_name, cs->irq,
                cs->hw.w6692.iobase);
 
-        INIT_WORK(&cs->tqueue, (void *)(void *) W6692_bh, cs);
+        INIT_WORK(&cs->tqueue, W6692_bh);
         cs->readW6692 = &ReadW6692;
         cs->writeW6692 = &WriteW6692;
         cs->readisacfifo = &ReadISACfifo;
diff --git a/drivers/isdn/i4l/isdn_net.c b/drivers/isdn/i4l/isdn_net.c
index 1f8d6ae66b41..2e4daebfb7e0 100644
--- a/drivers/isdn/i4l/isdn_net.c
+++ b/drivers/isdn/i4l/isdn_net.c
@@ -984,9 +984,9 @@ void isdn_net_write_super(isdn_net_local *lp, struct sk_buff *skb)
 /*
  * called from tq_immediate
  */
-static void isdn_net_softint(void *private)
+static void isdn_net_softint(struct work_struct *work)
 {
-        isdn_net_local *lp = private;
+        isdn_net_local *lp = container_of(work, isdn_net_local, tqueue);
         struct sk_buff *skb;
 
         spin_lock_bh(&lp->xmit_lock);
@@ -2596,7 +2596,7 @@ isdn_net_new(char *name, struct net_device *master)
         netdev->local->netdev = netdev;
         netdev->local->next = netdev->local;
 
-        INIT_WORK(&netdev->local->tqueue, (void *)(void *) isdn_net_softint, netdev->local);
+        INIT_WORK(&netdev->local->tqueue, isdn_net_softint);
         spin_lock_init(&netdev->local->xmit_lock);
 
         netdev->local->isdn_device = -1;
diff --git a/drivers/isdn/pcbit/drv.c b/drivers/isdn/pcbit/drv.c
index 6ead5e1508b7..1966f3410a13 100644
--- a/drivers/isdn/pcbit/drv.c
+++ b/drivers/isdn/pcbit/drv.c
@@ -68,8 +68,6 @@ static void pcbit_set_msn(struct pcbit_dev *dev, char *list);
 static int pcbit_check_msn(struct pcbit_dev *dev, char *msn);
 
 
-extern void pcbit_deliver(void * data);
-
 int pcbit_init_dev(int board, int mem_base, int irq)
 {
         struct pcbit_dev *dev;
@@ -129,7 +127,7 @@ int pcbit_init_dev(int board, int mem_base, int irq)
         memset(dev->b2, 0, sizeof(struct pcbit_chan));
         dev->b2->id = 1;
 
-        INIT_WORK(&dev->qdelivery, pcbit_deliver, dev);
+        INIT_WORK(&dev->qdelivery, pcbit_deliver);
 
         /*
          *  interrupts
diff --git a/drivers/isdn/pcbit/layer2.c b/drivers/isdn/pcbit/layer2.c
index 937fd2120381..0c9f6df873fc 100644
--- a/drivers/isdn/pcbit/layer2.c
+++ b/drivers/isdn/pcbit/layer2.c
@@ -67,7 +67,6 @@ extern void pcbit_l3_receive(struct pcbit_dev *dev, ulong msg,
  *  Prototypes
  */
 
-void pcbit_deliver(void *data);
 static void pcbit_transmit(struct pcbit_dev *dev);
 
 static void pcbit_recv_ack(struct pcbit_dev *dev, unsigned char ack);
@@ -299,11 +298,12 @@ pcbit_transmit(struct pcbit_dev *dev)
  */
 
 void
-pcbit_deliver(void *data)
+pcbit_deliver(struct work_struct *work)
 {
         struct frame_buf *frame;
         unsigned long flags, msg;
-        struct pcbit_dev *dev = (struct pcbit_dev *) data;
+        struct pcbit_dev *dev =
+                container_of(work, struct pcbit_dev, qdelivery);
 
         spin_lock_irqsave(&dev->lock, flags);
 
diff --git a/drivers/isdn/pcbit/pcbit.h b/drivers/isdn/pcbit/pcbit.h
index 388bacefd23a..19c18e88ff16 100644
--- a/drivers/isdn/pcbit/pcbit.h
+++ b/drivers/isdn/pcbit/pcbit.h
@@ -166,4 +166,6 @@ struct pcbit_ioctl {
 #define L2_RUNNING  5
 #define L2_ERROR    6
 
+extern void pcbit_deliver(struct work_struct *work);
+
 #endif