> On Dec 15, 2016, at 3:05 PM, Liu [EP], Bin <b-liu@xxxxxx> wrote:
>
> musb_generic_disable() only has two lines of code. So remove it and let
> the callers directly call thoese two lines.
s/thoese/those/
>
> Signed-off-by: Bin Liu <b-liu@xxxxxx>
> ---
> drivers/usb/musb/musb_core.c | 26 ++++++++++----------------
> 1 file changed, 10 insertions(+), 16 deletions(-)
>
> diff --git a/drivers/usb/musb/musb_core.c b/drivers/usb/musb/musb_core.c
> index 73adbedd5ea1..523af36e4c84 100644
> --- a/drivers/usb/musb/musb_core.c
> +++ b/drivers/usb/musb/musb_core.c
> @@ -1040,16 +1040,6 @@ static void musb_enable_interrupts(struct musb *musb)
>
> }
>
> -static void musb_generic_disable(struct musb *musb)
> -{
> - void __iomem *mbase = musb->mregs;
> -
> - musb_disable_interrupts(musb);
> -
> - /* off */
> - musb_writeb(mbase, MUSB_DEVCTL, 0);
> -}
> -
> /*
> * Program the HDRC to start (enable interrupts, dma, etc.).
> */
> @@ -1106,8 +1096,8 @@ void musb_stop(struct musb *musb)
> {
> /* stop IRQs, timers, ... */
> musb_platform_disable(musb);
> - musb_generic_disable(musb);
> - musb_dbg(musb, "HDRC disabled");
> + musb_disable_interrupts(musb);
> + musb_writeb(musb->mregs, MUSB_DEVCTL, 0);
>
> /* FIXME
> * - mark host and/or peripheral drivers unusable/inactive
> @@ -2310,7 +2300,8 @@ static void musb_deassert_reset(struct work_struct *work)
>
> /* be sure interrupts are disabled before connecting ISR */
> musb_platform_disable(musb);
> - musb_generic_disable(musb);
> + musb_disable_interrupts(musb);
> + musb_writeb(musb->mregs, MUSB_DEVCTL, 0);
>
> /* Init IRQ workqueue before request_irq */
> INIT_DELAYED_WORK(&musb->irq_work, musb_irq_work);
> @@ -2485,11 +2476,13 @@ static int musb_remove(struct platform_device *pdev)
> pm_runtime_get_sync(musb->controller);
> musb_host_cleanup(musb);
> musb_gadget_cleanup(musb);
> +
> spin_lock_irqsave(&musb->lock, flags);
> musb_platform_disable(musb);
> - musb_generic_disable(musb);
> - spin_unlock_irqrestore(&musb->lock, flags);
> + musb_disable_interrupts(musb);
> musb_writeb(musb->mregs, MUSB_DEVCTL, 0);
> + spin_unlock_irqrestore(&musb->lock, flags);
> +
> pm_runtime_dont_use_autosuspend(musb->controller);
> pm_runtime_put_sync(musb->controller);
> pm_runtime_disable(musb->controller);
> @@ -2664,7 +2657,8 @@ static int musb_suspend(struct device *dev)
> unsigned long flags;
>
> musb_platform_disable(musb);
> - musb_generic_disable(musb);
> + musb_disable_interrupts(musb);
> + musb_writeb(musb->mregs, MUSB_DEVCTL, 0);
> WARN_ON(!list_empty(&musb->pending_list));
>
> spin_lock_irqsave(&musb->lock, flags);
> --
> 1.9.1
>
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
