dt/sound: Eliminate users of of_platform_{,un}register_driver

[uclinux-h8/linux.git] / sound / sparc / amd7930.c

diff --git a/sound/sparc/amd7930.c b/sound/sparc/amd7930.c
index f8bcfc3..ad7d4d7 100644 (file)
--- a/sound/sparc/amd7930.c
+++ b/sound/sparc/amd7930.c
@@ -1002,7 +1002,7 @@ static int __devinit snd_amd7930_create(struct snd_card *card,
        return 0;
 }
 
-static int __devinit amd7930_sbus_probe(struct platform_device *op, const struct of_device_id *match)
+static int __devinit amd7930_sbus_probe(struct platform_device *op)
 {
        struct resource *rp = &op->resource[0];
        static int dev_num;
@@ -1064,7 +1064,7 @@ static const struct of_device_id amd7930_match[] = {
        {},
 };
 
-static struct of_platform_driver amd7930_sbus_driver = {
+static struct platform_driver amd7930_sbus_driver = {
        .driver = {
                .name = "audio",
                .owner = THIS_MODULE,
@@ -1075,7 +1075,7 @@ static struct of_platform_driver amd7930_sbus_driver = {
 
 static int __init amd7930_init(void)
 {
-       return of_register_platform_driver(&amd7930_sbus_driver);
+       return platform_driver_register(&amd7930_sbus_driver);
 }
 
 static void __exit amd7930_exit(void)
@@ -1092,7 +1092,7 @@ static void __exit amd7930_exit(void)
 
        amd7930_list = NULL;
 
-       of_unregister_platform_driver(&amd7930_sbus_driver);
+       platform_driver_unregister(&amd7930_sbus_driver);
 }
 
 module_init(amd7930_init);