usb: musb: Convert timers to use timer_setup()

In preparation for unconditionally passing the struct timer_list pointer to
all timer callbacks, switch to using the new timer_setup() and from_timer()
to pass the timer pointer explicitly.

Instead of a per-device static timer variable, a spare timer "dev_timer"
is added to the musb structure for devices to use for their per-device
timer.

Cc: linux-usb@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Acked-by: Bin Liu <b-liu@ti.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/usb/musb/am35x.c b/drivers/usb/musb/am35x.c
index 02fbb4fe3745def55925437bfa37872afa58dba7..2cf990e85bb229f74ca82e58ba1f3ab675719a3d 100644 (file)
--- a/drivers/usb/musb/am35x.c
+++ b/drivers/usb/musb/am35x.c
@@ -133,11 +133,9 @@ static void am35x_musb_set_vbus(struct musb *musb, int is_on)
 
 #define        POLL_SECONDS    2
 
-static struct timer_list otg_workaround;
-
-static void otg_timer(unsigned long _musb)
+static void otg_timer(struct timer_list *t)
 {
-       struct musb             *musb = (void *)_musb;
+       struct musb             *musb = from_timer(musb, t, dev_timer);
        void __iomem            *mregs = musb->mregs;
        u8                      devctl;
        unsigned long           flags;
@@ -173,7 +171,7 @@ static void otg_timer(unsigned long _musb)
        case OTG_STATE_B_IDLE:
                devctl = musb_readb(mregs, MUSB_DEVCTL);
                if (devctl & MUSB_DEVCTL_BDEVICE)
-                       mod_timer(&otg_workaround, jiffies + POLL_SECONDS * HZ);
+                       mod_timer(&musb->dev_timer, jiffies + POLL_SECONDS * HZ);
                else
                        musb->xceiv->otg->state = OTG_STATE_A_IDLE;
                break;
@@ -195,12 +193,12 @@ static void am35x_musb_try_idle(struct musb *musb, unsigned long timeout)
                                musb->xceiv->otg->state == OTG_STATE_A_WAIT_BCON)) {
                dev_dbg(musb->controller, "%s active, deleting timer\n",
                        usb_otg_state_string(musb->xceiv->otg->state));
-               del_timer(&otg_workaround);
+               del_timer(&musb->dev_timer);
                last_timer = jiffies;
                return;
        }
 
-       if (time_after(last_timer, timeout) && timer_pending(&otg_workaround)) {
+       if (time_after(last_timer, timeout) && timer_pending(&musb->dev_timer)) {
                dev_dbg(musb->controller, "Longer idle timer already pending, ignoring...\n");
                return;
        }
@@ -209,7 +207,7 @@ static void am35x_musb_try_idle(struct musb *musb, unsigned long timeout)
        dev_dbg(musb->controller, "%s inactive, starting idle timer for %u ms\n",
                usb_otg_state_string(musb->xceiv->otg->state),
                jiffies_to_msecs(timeout - jiffies));
-       mod_timer(&otg_workaround, timeout);
+       mod_timer(&musb->dev_timer, timeout);
 }
 
 static irqreturn_t am35x_musb_interrupt(int irq, void *hci)
@@ -278,14 +276,14 @@ static irqreturn_t am35x_musb_interrupt(int irq, void *hci)
                         */
                        musb->int_usb &= ~MUSB_INTR_VBUSERROR;
                        musb->xceiv->otg->state = OTG_STATE_A_WAIT_VFALL;
-                       mod_timer(&otg_workaround, jiffies + POLL_SECONDS * HZ);
+                       mod_timer(&musb->dev_timer, jiffies + POLL_SECONDS * HZ);
                        WARNING("VBUS error workaround (delay coming)\n");
                } else if (drvvbus) {
                        MUSB_HST_MODE(musb);
                        otg->default_a = 1;
                        musb->xceiv->otg->state = OTG_STATE_A_WAIT_VRISE;
                        portstate(musb->port1_status |= USB_PORT_STAT_POWER);
-                       del_timer(&otg_workaround);
+                       del_timer(&musb->dev_timer);
                } else {
                        musb->is_active = 0;
                        MUSB_DEV_MODE(musb);
@@ -324,7 +322,7 @@ eoi:
 
        /* Poll for ID change */
        if (musb->xceiv->otg->state == OTG_STATE_B_IDLE)
-               mod_timer(&otg_workaround, jiffies + POLL_SECONDS * HZ);
+               mod_timer(&musb->dev_timer, jiffies + POLL_SECONDS * HZ);
 
        spin_unlock_irqrestore(&musb->lock, flags);
 
@@ -365,7 +363,7 @@ static int am35x_musb_init(struct musb *musb)
        if (IS_ERR_OR_NULL(musb->xceiv))
                return -EPROBE_DEFER;
 
-       setup_timer(&otg_workaround, otg_timer, (unsigned long) musb);
+       timer_setup(&musb->dev_timer, otg_timer, 0);
 
        /* Reset the musb */
        if (data->reset)
@@ -395,7 +393,7 @@ static int am35x_musb_exit(struct musb *musb)
        struct musb_hdrc_platform_data *plat = dev_get_platdata(dev);
        struct omap_musb_board_data *data = plat->board_data;
 
-       del_timer_sync(&otg_workaround);
+       del_timer_sync(&musb->dev_timer);
 
        /* Shutdown the on-chip PHY and its PLL. */
        if (data->set_phy_power)

diff --git a/drivers/usb/musb/blackfin.c b/drivers/usb/musb/blackfin.c
index 4418574a36a1d8c08f4f001778f4f0e4262b7cb7..7c580df75dc1046d078042a35d56225dc95fff4d 100644 (file)
--- a/drivers/usb/musb/blackfin.c
+++ b/drivers/usb/musb/blackfin.c
@@ -223,7 +223,7 @@ static irqreturn_t blackfin_interrupt(int irq, void *__hci)
        if ((musb->xceiv->otg->state == OTG_STATE_B_IDLE
                || musb->xceiv->otg->state == OTG_STATE_A_WAIT_BCON) ||
                (musb->int_usb & MUSB_INTR_DISCONNECT && is_host_active(musb))) {
-               mod_timer(&musb_conn_timer, jiffies + TIMER_DELAY);
+               mod_timer(&musb->dev_timer, jiffies + TIMER_DELAY);
                musb->a_wait_bcon = TIMER_DELAY;
        }
 
@@ -232,9 +232,9 @@ static irqreturn_t blackfin_interrupt(int irq, void *__hci)
        return retval;
 }
 
-static void musb_conn_timer_handler(unsigned long _musb)
+static void musb_conn_timer_handler(struct timer_list *t)
 {
-       struct musb *musb = (void *)_musb;
+       struct musb *musb = from_timer(musb, t, dev_timer);
        unsigned long flags;
        u16 val;
        static u8 toggle;
@@ -266,7 +266,7 @@ static void musb_conn_timer_handler(unsigned long _musb)
                        musb_writeb(musb->mregs, MUSB_INTRUSB, val);
                        musb->xceiv->otg->state = OTG_STATE_B_IDLE;
                }
-               mod_timer(&musb_conn_timer, jiffies + TIMER_DELAY);
+               mod_timer(&musb->dev_timer, jiffies + TIMER_DELAY);
                break;
        case OTG_STATE_B_IDLE:
                /*
@@ -310,7 +310,7 @@ static void musb_conn_timer_handler(unsigned long _musb)
                         * shortening it, if accelerating A-plug detection
                         * is needed in OTG mode.
                         */
-                       mod_timer(&musb_conn_timer, jiffies + TIMER_DELAY / 4);
+                       mod_timer(&musb->dev_timer, jiffies + TIMER_DELAY / 4);
                }
                break;
        default:
@@ -445,8 +445,7 @@ static int bfin_musb_init(struct musb *musb)
 
        bfin_musb_reg_init(musb);
 
-       setup_timer(&musb_conn_timer, musb_conn_timer_handler,
-                       (unsigned long) musb);
+       timer_setup(&musb->dev_timer, musb_conn_timer_handler, 0);
 
        musb->xceiv->set_power = bfin_musb_set_power;
 

diff --git a/drivers/usb/musb/blackfin.h b/drivers/usb/musb/blackfin.h
index c84dae546dc60f0e4a5f775698406f73600c60c3..231f2d23b8a1104ed55102738e339ef841af7a30 100644 (file)
--- a/drivers/usb/musb/blackfin.h
+++ b/drivers/usb/musb/blackfin.h
@@ -82,6 +82,4 @@ static void dump_fifo_data(u8 *buf, u16 len)
 /* Almost 1 second */
 #define TIMER_DELAY    (1 * HZ)
 
-static struct timer_list musb_conn_timer;
-
 #endif /* __MUSB_BLACKFIN_H__ */

diff --git a/drivers/usb/musb/da8xx.c b/drivers/usb/musb/da8xx.c
index 2ec2039eee8662141634be8da27de51c4a1e703c..1ed5b0e0c2caf0440f6d52c762ecdd3173ba962f 100644 (file)
--- a/drivers/usb/musb/da8xx.c
+++ b/drivers/usb/musb/da8xx.c
@@ -135,11 +135,9 @@ static void da8xx_musb_set_vbus(struct musb *musb, int is_on)
 
 #define        POLL_SECONDS    2
 
-static struct timer_list otg_workaround;
-
-static void otg_timer(unsigned long _musb)
+static void otg_timer(struct timer_list *t)
 {
-       struct musb             *musb = (void *)_musb;
+       struct musb             *musb = from_timer(musb, t, dev_timer);
        void __iomem            *mregs = musb->mregs;
        u8                      devctl;
        unsigned long           flags;
@@ -175,7 +173,7 @@ static void otg_timer(unsigned long _musb)
                 * VBUSERR got reported during enumeration" cases.
                 */
                if (devctl & MUSB_DEVCTL_VBUS) {
-                       mod_timer(&otg_workaround, jiffies + POLL_SECONDS * HZ);
+                       mod_timer(&musb->dev_timer, jiffies + POLL_SECONDS * HZ);
                        break;
                }
                musb->xceiv->otg->state = OTG_STATE_A_WAIT_VRISE;
@@ -198,7 +196,7 @@ static void otg_timer(unsigned long _musb)
                musb_writeb(mregs, MUSB_DEVCTL, devctl | MUSB_DEVCTL_SESSION);
                devctl = musb_readb(mregs, MUSB_DEVCTL);
                if (devctl & MUSB_DEVCTL_BDEVICE)
-                       mod_timer(&otg_workaround, jiffies + POLL_SECONDS * HZ);
+                       mod_timer(&musb->dev_timer, jiffies + POLL_SECONDS * HZ);
                else
                        musb->xceiv->otg->state = OTG_STATE_A_IDLE;
                break;
@@ -220,12 +218,12 @@ static void da8xx_musb_try_idle(struct musb *musb, unsigned long timeout)
                                musb->xceiv->otg->state == OTG_STATE_A_WAIT_BCON)) {
                dev_dbg(musb->controller, "%s active, deleting timer\n",
                        usb_otg_state_string(musb->xceiv->otg->state));
-               del_timer(&otg_workaround);
+               del_timer(&musb->dev_timer);
                last_timer = jiffies;
                return;
        }
 
-       if (time_after(last_timer, timeout) && timer_pending(&otg_workaround)) {
+       if (time_after(last_timer, timeout) && timer_pending(&musb->dev_timer)) {
                dev_dbg(musb->controller, "Longer idle timer already pending, ignoring...\n");
                return;
        }
@@ -234,7 +232,7 @@ static void da8xx_musb_try_idle(struct musb *musb, unsigned long timeout)
        dev_dbg(musb->controller, "%s inactive, starting idle timer for %u ms\n",
                usb_otg_state_string(musb->xceiv->otg->state),
                jiffies_to_msecs(timeout - jiffies));
-       mod_timer(&otg_workaround, timeout);
+       mod_timer(&musb->dev_timer, timeout);
 }
 
 static irqreturn_t da8xx_musb_interrupt(int irq, void *hci)
@@ -294,14 +292,14 @@ static irqreturn_t da8xx_musb_interrupt(int irq, void *hci)
                         */
                        musb->int_usb &= ~MUSB_INTR_VBUSERROR;
                        musb->xceiv->otg->state = OTG_STATE_A_WAIT_VFALL;
-                       mod_timer(&otg_workaround, jiffies + POLL_SECONDS * HZ);
+                       mod_timer(&musb->dev_timer, jiffies + POLL_SECONDS * HZ);
                        WARNING("VBUS error workaround (delay coming)\n");
                } else if (drvvbus) {
                        MUSB_HST_MODE(musb);
                        otg->default_a = 1;
                        musb->xceiv->otg->state = OTG_STATE_A_WAIT_VRISE;
                        portstate(musb->port1_status |= USB_PORT_STAT_POWER);
-                       del_timer(&otg_workaround);
+                       del_timer(&musb->dev_timer);
                } else {
                        musb->is_active = 0;
                        MUSB_DEV_MODE(musb);
@@ -328,7 +326,7 @@ static irqreturn_t da8xx_musb_interrupt(int irq, void *hci)
 
        /* Poll for ID change */
        if (musb->xceiv->otg->state == OTG_STATE_B_IDLE)
-               mod_timer(&otg_workaround, jiffies + POLL_SECONDS * HZ);
+               mod_timer(&musb->dev_timer, jiffies + POLL_SECONDS * HZ);
 
        spin_unlock_irqrestore(&musb->lock, flags);
 
@@ -390,7 +388,7 @@ static int da8xx_musb_init(struct musb *musb)
                goto fail;
        }
 
-       setup_timer(&otg_workaround, otg_timer, (unsigned long)musb);
+       timer_setup(&musb->dev_timer, otg_timer, 0);
 
        /* Reset the controller */
        musb_writel(reg_base, DA8XX_USB_CTRL_REG, DA8XX_SOFT_RESET_MASK);
@@ -428,7 +426,7 @@ static int da8xx_musb_exit(struct musb *musb)
 {
        struct da8xx_glue *glue = dev_get_drvdata(musb->controller->parent);
 
-       del_timer_sync(&otg_workaround);
+       del_timer_sync(&musb->dev_timer);
 
        phy_power_off(glue->phy);
        phy_exit(glue->phy);

diff --git a/drivers/usb/musb/davinci.c b/drivers/usb/musb/davinci.c
index 52b491d3d5d835ed88006b92f521f5377ecacd44..3a7048e84e1c18fef4b42614bb70978d6a3059ff 100644 (file)
--- a/drivers/usb/musb/davinci.c
+++ b/drivers/usb/musb/davinci.c
@@ -199,11 +199,9 @@ static void davinci_musb_set_vbus(struct musb *musb, int is_on)
 
 #define        POLL_SECONDS    2
 
-static struct timer_list otg_workaround;
-
-static void otg_timer(unsigned long _musb)
+static void otg_timer(struct timer_list *t)
 {
-       struct musb             *musb = (void *)_musb;
+       struct musb             *musb = from_timer(musb, t, dev_timer);
        void __iomem            *mregs = musb->mregs;
        u8                      devctl;
        unsigned long           flags;
@@ -224,7 +222,7 @@ static void otg_timer(unsigned long _musb)
                 * VBUSERR got reported during enumeration" cases.
                 */
                if (devctl & MUSB_DEVCTL_VBUS) {
-                       mod_timer(&otg_workaround, jiffies + POLL_SECONDS * HZ);
+                       mod_timer(&musb->dev_timer, jiffies + POLL_SECONDS * HZ);
                        break;
                }
                musb->xceiv->otg->state = OTG_STATE_A_WAIT_VRISE;
@@ -248,7 +246,7 @@ static void otg_timer(unsigned long _musb)
                                devctl | MUSB_DEVCTL_SESSION);
                devctl = musb_readb(mregs, MUSB_DEVCTL);
                if (devctl & MUSB_DEVCTL_BDEVICE)
-                       mod_timer(&otg_workaround, jiffies + POLL_SECONDS * HZ);
+                       mod_timer(&musb->dev_timer, jiffies + POLL_SECONDS * HZ);
                else
                        musb->xceiv->otg->state = OTG_STATE_A_IDLE;
                break;
@@ -325,14 +323,14 @@ static irqreturn_t davinci_musb_interrupt(int irq, void *__hci)
                         */
                        musb->int_usb &= ~MUSB_INTR_VBUSERROR;
                        musb->xceiv->otg->state = OTG_STATE_A_WAIT_VFALL;
-                       mod_timer(&otg_workaround, jiffies + POLL_SECONDS * HZ);
+                       mod_timer(&musb->dev_timer, jiffies + POLL_SECONDS * HZ);
                        WARNING("VBUS error workaround (delay coming)\n");
                } else if (drvvbus) {
                        MUSB_HST_MODE(musb);
                        otg->default_a = 1;
                        musb->xceiv->otg->state = OTG_STATE_A_WAIT_VRISE;
                        portstate(musb->port1_status |= USB_PORT_STAT_POWER);
-                       del_timer(&otg_workaround);
+                       del_timer(&musb->dev_timer);
                } else {
                        musb->is_active = 0;
                        MUSB_DEV_MODE(musb);
@@ -361,7 +359,7 @@ static irqreturn_t davinci_musb_interrupt(int irq, void *__hci)
 
        /* poll for ID change */
        if (musb->xceiv->otg->state == OTG_STATE_B_IDLE)
-               mod_timer(&otg_workaround, jiffies + POLL_SECONDS * HZ);
+               mod_timer(&musb->dev_timer, jiffies + POLL_SECONDS * HZ);
 
        spin_unlock_irqrestore(&musb->lock, flags);
 
@@ -393,7 +391,7 @@ static int davinci_musb_init(struct musb *musb)
        if (revision == 0)
                goto fail;
 
-       setup_timer(&otg_workaround, otg_timer, (unsigned long) musb);
+       timer_setup(&musb->dev_timer, otg_timer, 0);
 
        davinci_musb_source_power(musb, 0, 1);
 
@@ -443,7 +441,7 @@ unregister:
 
 static int davinci_musb_exit(struct musb *musb)
 {
-       del_timer_sync(&otg_workaround);
+       del_timer_sync(&musb->dev_timer);
 
        /* force VBUS off */
        if (cpu_is_davinci_dm355()) {

diff --git a/drivers/usb/musb/musb_core.c b/drivers/usb/musb/musb_core.c
index 889ca9b164c4d7d3ceb1cd5a0efee76a5d89627d..82a5089caa34c82effa7df52434fb88fc309430b 100644 (file)
--- a/drivers/usb/musb/musb_core.c
+++ b/drivers/usb/musb/musb_core.c
@@ -485,9 +485,9 @@ void musb_load_testpacket(struct musb *musb)
 /*
  * Handles OTG hnp timeouts, such as b_ase0_brst
  */
-static void musb_otg_timer_func(unsigned long data)
+static void musb_otg_timer_func(struct timer_list *t)
 {
-       struct musb     *musb = (struct musb *)data;
+       struct musb     *musb = from_timer(musb, t, otg_timer);
        unsigned long   flags;
 
        spin_lock_irqsave(&musb->lock, flags);
@@ -2331,7 +2331,7 @@ musb_init_controller(struct device *dev, int nIrq, void __iomem *ctrl)
        if (status < 0)
                goto fail3;
 
-       setup_timer(&musb->otg_timer, musb_otg_timer_func, (unsigned long) musb);
+       timer_setup(&musb->otg_timer, musb_otg_timer_func, 0);
 
        /* attach to the IRQ */
        if (request_irq(nIrq, musb->isr, IRQF_SHARED, dev_name(dev), musb)) {

diff --git a/drivers/usb/musb/musb_core.h b/drivers/usb/musb/musb_core.h
index 20f4614178d98c3155f4a508fb12f594f2cd4b5d..e8573975743d537e9b1c1c2fbf6c21c5206bb1c0 100644 (file)
--- a/drivers/usb/musb/musb_core.h
+++ b/drivers/usb/musb/musb_core.h
@@ -345,6 +345,7 @@ struct musb {
        struct list_head        pending_list;   /* pending work list */
 
        struct timer_list       otg_timer;
+       struct timer_list       dev_timer;
        struct notifier_block   nb;
 
        struct dma_controller   *dma_controller;

diff --git a/drivers/usb/musb/musb_dsps.c b/drivers/usb/musb/musb_dsps.c
index f6b526606ad1092494f3d8eaac6946bd77069ad2..e3d0e626a5d66d86491f9b6f3405493b8a43402e 100644 (file)
--- a/drivers/usb/musb/musb_dsps.c
+++ b/drivers/usb/musb/musb_dsps.c
@@ -282,9 +282,10 @@ static int dsps_check_status(struct musb *musb, void *unused)
        return 0;
 }
 
-static void otg_timer(unsigned long _musb)
+static void otg_timer(struct timer_list *t)
 {
-       struct musb *musb = (void *)_musb;
+       struct dsps_glue *glue = from_timer(glue, t, timer);
+       struct musb *musb = platform_get_drvdata(glue->musb);
        struct device *dev = musb->controller;
        unsigned long flags;
        int err;
@@ -480,7 +481,7 @@ static int dsps_musb_init(struct musb *musb)
                }
        }
 
-       setup_timer(&glue->timer, otg_timer, (unsigned long) musb);
+       timer_setup(&glue->timer, otg_timer, 0);
 
        /* Reset the musb */
        musb_writel(reg_base, wrp->control, (1 << wrp->reset));

diff --git a/drivers/usb/musb/tusb6010.c b/drivers/usb/musb/tusb6010.c
index 4eb640c54f2c1b0552ceaf8ab5e060d89f3bed7d..f8fce7df654f535cc326929280293037b7df4ac9 100644 (file)
--- a/drivers/usb/musb/tusb6010.c
+++ b/drivers/usb/musb/tusb6010.c
@@ -452,11 +452,9 @@ static int tusb_musb_vbus_status(struct musb *musb)
        return ret;
 }
 
-static struct timer_list musb_idle_timer;
-
-static void musb_do_idle(unsigned long _musb)
+static void musb_do_idle(struct timer_list *t)
 {
-       struct musb     *musb = (void *)_musb;
+       struct musb     *musb = from_timer(musb, t, dev_timer);
        unsigned long   flags;
 
        spin_lock_irqsave(&musb->lock, flags);
@@ -523,13 +521,13 @@ static void tusb_musb_try_idle(struct musb *musb, unsigned long timeout)
                        && (musb->xceiv->otg->state == OTG_STATE_A_WAIT_BCON))) {
                dev_dbg(musb->controller, "%s active, deleting timer\n",
                        usb_otg_state_string(musb->xceiv->otg->state));
-               del_timer(&musb_idle_timer);
+               del_timer(&musb->dev_timer);
                last_timer = jiffies;
                return;
        }
 
        if (time_after(last_timer, timeout)) {
-               if (!timer_pending(&musb_idle_timer))
+               if (!timer_pending(&musb->dev_timer))
                        last_timer = timeout;
                else {
                        dev_dbg(musb->controller, "Longer idle timer already pending, ignoring\n");
@@ -541,7 +539,7 @@ static void tusb_musb_try_idle(struct musb *musb, unsigned long timeout)
        dev_dbg(musb->controller, "%s inactive, for idle timer for %lu ms\n",
                usb_otg_state_string(musb->xceiv->otg->state),
                (unsigned long)jiffies_to_msecs(timeout - jiffies));
-       mod_timer(&musb_idle_timer, timeout);
+       mod_timer(&musb->dev_timer, timeout);
 }
 
 /* ticks of 60 MHz clock */
@@ -873,7 +871,7 @@ static irqreturn_t tusb_musb_interrupt(int irq, void *__hci)
        }
 
        if (int_src & TUSB_INT_SRC_USB_IP_CONN)
-               del_timer(&musb_idle_timer);
+               del_timer(&musb->dev_timer);
 
        /* OTG state change reports (annoyingly) not issued by Mentor core */
        if (int_src & (TUSB_INT_SRC_VBUS_SENSE_CHNG
@@ -982,7 +980,7 @@ static void tusb_musb_disable(struct musb *musb)
        musb_writel(tbase, TUSB_DMA_INT_MASK, 0x7fffffff);
        musb_writel(tbase, TUSB_GPIO_INT_MASK, 0x1ff);
 
-       del_timer(&musb_idle_timer);
+       del_timer(&musb->dev_timer);
 
        if (is_dma_capable() && !dma_off) {
                printk(KERN_WARNING "%s %s: dma still active\n",
@@ -1142,7 +1140,7 @@ static int tusb_musb_init(struct musb *musb)
        musb->xceiv->set_power = tusb_draw_power;
        the_musb = musb;
 
-       setup_timer(&musb_idle_timer, musb_do_idle, (unsigned long) musb);
+       timer_setup(&musb->dev_timer, musb_do_idle, 0);
 
 done:
        if (ret < 0) {
@@ -1156,7 +1154,7 @@ done:
 
 static int tusb_musb_exit(struct musb *musb)
 {
-       del_timer_sync(&musb_idle_timer);
+       del_timer_sync(&musb->dev_timer);
        the_musb = NULL;
 
        if (musb->board_set_power)