3 files changed, 19 insertions, 14 deletions

diff --git a/drivers/usb/atm/cxacru.c b/drivers/usb/atm/cxacru.c
index e6565633ba0..3dfa3e40e14 100644
--- a/drivers/usb/atm/cxacru.c
+++ b/drivers/usb/atm/cxacru.c
@@ -158,7 +158,7 @@ struct cxacru_data {
         const struct cxacru_modem_type *modem_type;
 
         int line_status;
-        struct work_struct poll_work;
+        struct delayed_work poll_work;
 
         /* contol handles */
         struct mutex cm_serialize;
@@ -347,7 +347,7 @@ static int cxacru_card_status(struct cxacru_data *instance)
         return 0;
 }
 
-static void cxacru_poll_status(struct cxacru_data *instance);
+static void cxacru_poll_status(struct work_struct *work);
 
 static int cxacru_atm_start(struct usbatm_data *usbatm_instance,
                 struct atm_dev *atm_dev)
@@ -376,12 +376,14 @@ static int cxacru_atm_start(struct usbatm_data *usbatm_instance,
         }
 
         /* Start status polling */
-        cxacru_poll_status(instance);
+        cxacru_poll_status(&instance->poll_work.work);
         return 0;
 }
 
-static void cxacru_poll_status(struct cxacru_data *instance)
+static void cxacru_poll_status(struct work_struct *work)
 {
+        struct cxacru_data *instance =
+                container_of(work, struct cxacru_data, poll_work.work);
         u32 buf[CXINF_MAX] = {};
         struct usbatm_data *usbatm = instance->usbatm;
         struct atm_dev *atm_dev = usbatm->atm_dev;
@@ -720,7 +722,7 @@ static int cxacru_bind(struct usbatm_data *usbatm_instance,
 
         mutex_init(&instance->cm_serialize);
 
-        INIT_WORK(&instance->poll_work, (void *)cxacru_poll_status, instance);
+        INIT_DELAYED_WORK(&instance->poll_work, cxacru_poll_status);
 
         usbatm_instance->driver_data = instance;
 
diff --git a/drivers/usb/atm/speedtch.c b/drivers/usb/atm/speedtch.c
index c870c804470..7ed34bb1c50 100644
--- a/drivers/usb/atm/speedtch.c
+++ b/drivers/usb/atm/speedtch.c
@@ -142,7 +142,7 @@ struct speedtch_instance_data {
 
         struct speedtch_params params; /* set in probe, constant afterwards */
 
-        struct work_struct status_checker;
+        struct delayed_work status_checker;
 
         unsigned char last_status;
 
@@ -498,8 +498,11 @@ static int speedtch_start_synchro(struct speedtch_instance_data *instance)
         return ret;
 }
 
-static void speedtch_check_status(struct speedtch_instance_data *instance)
+static void speedtch_check_status(struct work_struct *work)
 {
+        struct speedtch_instance_data *instance =
+                container_of(work, struct speedtch_instance_data,
+                             status_checker.work);
         struct usbatm_data *usbatm = instance->usbatm;
         struct atm_dev *atm_dev = usbatm->atm_dev;
         unsigned char *buf = instance->scratch_buffer;
@@ -576,7 +579,7 @@ static void speedtch_status_poll(unsigned long data)
 {
         struct speedtch_instance_data *instance = (void *)data;
 
-        schedule_work(&instance->status_checker);
+        schedule_delayed_work(&instance->status_checker, 0);
 
         /* The following check is racy, but the race is harmless */
         if (instance->poll_delay < MAX_POLL_DELAY)
@@ -596,7 +599,7 @@ static void speedtch_resubmit_int(unsigned long data)
         if (int_urb) {
                 ret = usb_submit_urb(int_urb, GFP_ATOMIC);
                 if (!ret)
-                        schedule_work(&instance->status_checker);
+                        schedule_delayed_work(&instance->status_checker, 0);
                 else {
                         atm_dbg(instance->usbatm, "%s: usb_submit_urb failed with result %d\n", __func__, ret);
                         mod_timer(&instance->resubmit_timer, jiffies + msecs_to_jiffies(RESUBMIT_DELAY));
@@ -640,7 +643,7 @@ static void speedtch_handle_int(struct urb *int_urb)
 
         if ((int_urb = instance->int_urb)) {
                 ret = usb_submit_urb(int_urb, GFP_ATOMIC);
-                schedule_work(&instance->status_checker);
+                schedule_delayed_work(&instance->status_checker, 0);
                 if (ret < 0) {
                         atm_dbg(usbatm, "%s: usb_submit_urb failed with result %d\n", __func__, ret);
                         goto fail;
@@ -855,7 +858,7 @@ static int speedtch_bind(struct usbatm_data *usbatm,
 
         usbatm->flags |= (use_isoc ? UDSL_USE_ISOC : 0);
 
-        INIT_WORK(&instance->status_checker, (void *)speedtch_check_status, instance);
+        INIT_DELAYED_WORK(&instance->status_checker, speedtch_check_status);
 
         instance->status_checker.timer.function = speedtch_status_poll;
         instance->status_checker.timer.data = (unsigned long)instance;
diff --git a/drivers/usb/atm/ueagle-atm.c b/drivers/usb/atm/ueagle-atm.c
index f6b9f7e1f71..e39bb09f5af 100644
--- a/drivers/usb/atm/ueagle-atm.c
+++ b/drivers/usb/atm/ueagle-atm.c
@@ -658,9 +658,9 @@ static int request_dsp(struct uea_softc *sc)
 /*
  * The uea_load_page() function must be called within a process context
  */
-static void uea_load_page(void *xsc)
+static void uea_load_page(struct work_struct *work)
 {
-        struct uea_softc *sc = xsc;
+        struct uea_softc *sc = container_of(work, struct uea_softc, task);
         u16 pageno = sc->pageno;
         u16 ovl = sc->ovl;
         struct block_info bi;
@@ -1352,7 +1352,7 @@ static int uea_boot(struct uea_softc *sc)
 
         uea_enters(INS_TO_USBDEV(sc));
 
-        INIT_WORK(&sc->task, uea_load_page, sc);
+        INIT_WORK(&sc->task, uea_load_page);
         init_waitqueue_head(&sc->sync_q);
         init_waitqueue_head(&sc->cmv_ack_wait);