aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/fsl/mpc5200_psc_i2s.c
diff options
context:
space:
mode:
authorGrant Likely <grant.likely@secretlab.ca>2011-02-22 23:05:04 -0500
committerGrant Likely <grant.likely@secretlab.ca>2011-02-28 15:22:44 -0500
commitf07eb223a081b278be02a58394cb5fd66f1a1bbd (patch)
tree164e8f1405a21bb5be9033d92fe20d0387b3a565 /sound/soc/fsl/mpc5200_psc_i2s.c
parent18d306d1375696b0e6b5b39e4744d7fa2ad5e170 (diff)
dt/sound: Eliminate users of of_platform_{,un}register_driver
Get rid of users of of_platform_driver in drivers/sound. The of_platform_{,un}register_driver functions are going away, so the users need to be converted to using the platform_bus_type directly. Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Diffstat (limited to 'sound/soc/fsl/mpc5200_psc_i2s.c')
-rw-r--r--sound/soc/fsl/mpc5200_psc_i2s.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/sound/soc/fsl/mpc5200_psc_i2s.c b/sound/soc/fsl/mpc5200_psc_i2s.c
index 9018fa5bf0db..87cf2a5c2b2c 100644
--- a/sound/soc/fsl/mpc5200_psc_i2s.c
+++ b/sound/soc/fsl/mpc5200_psc_i2s.c
@@ -150,8 +150,7 @@ static struct snd_soc_dai_driver psc_i2s_dai[] = {{
150 * - Probe/remove operations 150 * - Probe/remove operations
151 * - OF device match table 151 * - OF device match table
152 */ 152 */
153static int __devinit psc_i2s_of_probe(struct platform_device *op, 153static int __devinit psc_i2s_of_probe(struct platform_device *op)
154 const struct of_device_id *match)
155{ 154{
156 int rc; 155 int rc;
157 struct psc_dma *psc_dma; 156 struct psc_dma *psc_dma;
@@ -213,7 +212,7 @@ static struct of_device_id psc_i2s_match[] __devinitdata = {
213}; 212};
214MODULE_DEVICE_TABLE(of, psc_i2s_match); 213MODULE_DEVICE_TABLE(of, psc_i2s_match);
215 214
216static struct of_platform_driver psc_i2s_driver = { 215static struct platform_driver psc_i2s_driver = {
217 .probe = psc_i2s_of_probe, 216 .probe = psc_i2s_of_probe,
218 .remove = __devexit_p(psc_i2s_of_remove), 217 .remove = __devexit_p(psc_i2s_of_remove),
219 .driver = { 218 .driver = {
@@ -229,13 +228,13 @@ static struct of_platform_driver psc_i2s_driver = {
229 */ 228 */
230static int __init psc_i2s_init(void) 229static int __init psc_i2s_init(void)
231{ 230{
232 return of_register_platform_driver(&psc_i2s_driver); 231 return platform_driver_register(&psc_i2s_driver);
233} 232}
234module_init(psc_i2s_init); 233module_init(psc_i2s_init);
235 234
236static void __exit psc_i2s_exit(void) 235static void __exit psc_i2s_exit(void)
237{ 236{
238 of_unregister_platform_driver(&psc_i2s_driver); 237 platform_driver_unregister(&psc_i2s_driver);
239} 238}
240module_exit(psc_i2s_exit); 239module_exit(psc_i2s_exit);
241 240