usb: musb: core: use ->resume instead ->resume_noirq

[karo-tx-linux.git] / drivers / usb / musb / musb_core.c

diff --git a/drivers/usb/musb/musb_core.c b/drivers/usb/musb/musb_core.c
index 55ebd4b1daac9de11892e83430bfca614ee2419e..e46e295a383a3a4880ec9481de76df7e7e158a5e 100644 (file)
--- a/drivers/usb/musb/musb_core.c
+++ b/drivers/usb/musb/musb_core.c
@@ -2297,7 +2297,7 @@ static int musb_suspend(struct device *dev)
        return 0;
 }
 
-static int musb_resume_noirq(struct device *dev)
+static int musb_resume(struct device *dev)
 {
        struct musb     *musb = dev_to_musb(dev);
 
@@ -2348,7 +2348,7 @@ static int musb_runtime_resume(struct device *dev)
 
 static const struct dev_pm_ops musb_dev_pm_ops = {
        .suspend        = musb_suspend,
-       .resume_noirq   = musb_resume_noirq,
+       .resume         = musb_resume,
        .runtime_suspend = musb_runtime_suspend,
        .runtime_resume = musb_runtime_resume,
 };