]> git.proxmox.com Git - mirror_ubuntu-jammy-kernel.git/commitdiff
usb: chipidea: msm: add remove method
authorFelipe Balbi <balbi@ti.com>
Fri, 29 Jun 2012 09:48:52 +0000 (17:48 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 6 Jul 2012 17:58:39 +0000 (10:58 -0700)
allow this driver to be removed too.

Signed-off-by: Felipe Balbi <balbi@ti.com>
Signed-off-by: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Signed-off-by: Richard Zhao <richard.zhao@freescale.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/usb/chipidea/ci13xxx_msm.c

index 8d438b82e8686b5934a3d6150ec2d859d5616a8b..11a7befdc4ef8e31a8e9ec678e3e814605a0b09b 100644 (file)
@@ -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");