diff options
author | Felipe Balbi <balbi@ti.com> | 2012-06-29 05:48:52 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-07-06 13:58:39 -0400 |
commit | 6bf83594e3fa1b1147ed1baff356d4fd30846b84 (patch) | |
tree | 65f768dae47c4901fada26b286fb7863ff8fd5e5 /drivers/usb/chipidea | |
parent | 17d2fcc393bfe58cc1e2bc34603a48e447ff7afb (diff) |
usb: chipidea: msm: add remove method
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>
Diffstat (limited to 'drivers/usb/chipidea')
-rw-r--r-- | drivers/usb/chipidea/ci13xxx_msm.c | 21 |
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) | |||
84 | if (ret) | 84 | if (ret) |
85 | goto put_platform; | 85 | goto put_platform; |
86 | 86 | ||
87 | platform_set_drvdata(pdev, plat_ci); | ||
88 | |||
87 | pm_runtime_no_callbacks(&pdev->dev); | 89 | pm_runtime_no_callbacks(&pdev->dev); |
88 | pm_runtime_enable(&pdev->dev); | 90 | pm_runtime_enable(&pdev->dev); |
89 | 91 | ||
@@ -95,16 +97,23 @@ put_platform: | |||
95 | return ret; | 97 | return ret; |
96 | } | 98 | } |
97 | 99 | ||
100 | static int __devexit ci13xxx_msm_remove(struct platform_device *pdev) | ||
101 | { | ||
102 | struct platform_device *plat_ci = platform_get_drvdata(pdev); | ||
103 | |||
104 | pm_runtime_disable(&pdev->dev); | ||
105 | platform_device_unregister(plat_ci); | ||
106 | |||
107 | return 0; | ||
108 | } | ||
109 | |||
98 | static struct platform_driver ci13xxx_msm_driver = { | 110 | static struct platform_driver ci13xxx_msm_driver = { |
99 | .probe = ci13xxx_msm_probe, | 111 | .probe = ci13xxx_msm_probe, |
112 | .remove = __devexit_p(ci13xxx_msm_remove), | ||
100 | .driver = { .name = "msm_hsusb", }, | 113 | .driver = { .name = "msm_hsusb", }, |
101 | }; | 114 | }; |
102 | MODULE_ALIAS("platform:msm_hsusb"); | ||
103 | 115 | ||
104 | static int __init ci13xxx_msm_init(void) | 116 | module_platform_driver(ci13xxx_msm_driver); |
105 | { | ||
106 | return platform_driver_register(&ci13xxx_msm_driver); | ||
107 | } | ||
108 | module_init(ci13xxx_msm_init); | ||
109 | 117 | ||
118 | MODULE_ALIAS("platform:msm_hsusb"); | ||
110 | MODULE_LICENSE("GPL v2"); | 119 | MODULE_LICENSE("GPL v2"); |