1 files changed, 15 insertions, 6 deletions

diff --git a/drivers/usb/chipidea/ci13xxx_msm.c b/drivers/usb/chipidea/ci13xxx_msm.c
index 8d438b82e868..11a7befdc4ef 100644
--- a/drivers/usb/chipidea/ci13xxx_msm.c
+++ b/drivers/usb/chipidea/ci13xxx_msm.c
@@ -84,6 +84,8 @@ static int __devinit ci13xxx_msm_probe(struct platform_device *pdev)
         if (ret)
                 goto put_platform;
 
+        platform_set_drvdata(pdev, plat_ci);
+
         pm_runtime_no_callbacks(&pdev->dev);
         pm_runtime_enable(&pdev->dev);
 
@@ -95,16 +97,23 @@ put_platform:
         return ret;
 }
 
+static int __devexit ci13xxx_msm_remove(struct platform_device *pdev)
+{
+        struct platform_device *plat_ci = platform_get_drvdata(pdev);
+
+        pm_runtime_disable(&pdev->dev);
+        platform_device_unregister(plat_ci);
+
+        return 0;
+}
+
 static struct platform_driver ci13xxx_msm_driver = {
         .probe = ci13xxx_msm_probe,
+        .remove = __devexit_p(ci13xxx_msm_remove),
         .driver = { .name = "msm_hsusb", },
 };
-MODULE_ALIAS("platform:msm_hsusb");
 
-static int __init ci13xxx_msm_init(void)
-{
-        return platform_driver_register(&ci13xxx_msm_driver);
-}
-module_init(ci13xxx_msm_init);
+module_platform_driver(ci13xxx_msm_driver);
 
+MODULE_ALIAS("platform:msm_hsusb");
 MODULE_LICENSE("GPL v2");