diff options
Diffstat (limited to 'sound/soc/fsl/mpc5200_psc_ac97.c')
-rw-r--r-- | sound/soc/fsl/mpc5200_psc_ac97.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/sound/soc/fsl/mpc5200_psc_ac97.c b/sound/soc/fsl/mpc5200_psc_ac97.c index 40acc8e2b1ca..ad36b095bb79 100644 --- a/sound/soc/fsl/mpc5200_psc_ac97.c +++ b/sound/soc/fsl/mpc5200_psc_ac97.c | |||
@@ -272,8 +272,7 @@ static struct snd_soc_dai_driver psc_ac97_dai[] = { | |||
272 | * - Probe/remove operations | 272 | * - Probe/remove operations |
273 | * - OF device match table | 273 | * - OF device match table |
274 | */ | 274 | */ |
275 | static int __devinit psc_ac97_of_probe(struct platform_device *op, | 275 | static int __devinit psc_ac97_of_probe(struct platform_device *op) |
276 | const struct of_device_id *match) | ||
277 | { | 276 | { |
278 | int rc; | 277 | int rc; |
279 | struct snd_ac97 ac97; | 278 | struct snd_ac97 ac97; |
@@ -316,7 +315,7 @@ static struct of_device_id psc_ac97_match[] __devinitdata = { | |||
316 | }; | 315 | }; |
317 | MODULE_DEVICE_TABLE(of, psc_ac97_match); | 316 | MODULE_DEVICE_TABLE(of, psc_ac97_match); |
318 | 317 | ||
319 | static struct of_platform_driver psc_ac97_driver = { | 318 | static struct platform_driver psc_ac97_driver = { |
320 | .probe = psc_ac97_of_probe, | 319 | .probe = psc_ac97_of_probe, |
321 | .remove = __devexit_p(psc_ac97_of_remove), | 320 | .remove = __devexit_p(psc_ac97_of_remove), |
322 | .driver = { | 321 | .driver = { |
@@ -332,13 +331,13 @@ static struct of_platform_driver psc_ac97_driver = { | |||
332 | */ | 331 | */ |
333 | static int __init psc_ac97_init(void) | 332 | static int __init psc_ac97_init(void) |
334 | { | 333 | { |
335 | return of_register_platform_driver(&psc_ac97_driver); | 334 | return platform_driver_register(&psc_ac97_driver); |
336 | } | 335 | } |
337 | module_init(psc_ac97_init); | 336 | module_init(psc_ac97_init); |
338 | 337 | ||
339 | static void __exit psc_ac97_exit(void) | 338 | static void __exit psc_ac97_exit(void) |
340 | { | 339 | { |
341 | of_unregister_platform_driver(&psc_ac97_driver); | 340 | platform_driver_unregister(&psc_ac97_driver); |
342 | } | 341 | } |
343 | module_exit(psc_ac97_exit); | 342 | module_exit(psc_ac97_exit); |
344 | 343 | ||