1 files changed, 14 insertions, 20 deletions

diff --git a/sound/drivers/opl3/opl3_seq.c b/sound/drivers/opl3/opl3_seq.c
index a9f618e06a22..fdae5d7f421f 100644
--- a/sound/drivers/opl3/opl3_seq.c
+++ b/sound/drivers/opl3/opl3_seq.c
@@ -216,8 +216,9 @@ static int snd_opl3_synth_create_port(struct snd_opl3 * opl3)
 
 /* ------------------------------ */
 
-static int snd_opl3_seq_new_device(struct snd_seq_device *dev)
+static int snd_opl3_seq_probe(struct device *_dev)
 {
+        struct snd_seq_device *dev = to_seq_dev(_dev);
         struct snd_opl3 *opl3;
         int client, err;
         char name[32];
@@ -257,8 +258,9 @@ static int snd_opl3_seq_new_device(struct snd_seq_device *dev)
         return 0;
 }
 
-static int snd_opl3_seq_delete_device(struct snd_seq_device *dev)
+static int snd_opl3_seq_remove(struct device *_dev)
 {
+        struct snd_seq_device *dev = to_seq_dev(_dev);
         struct snd_opl3 *opl3;
 
         opl3 = *(struct snd_opl3 **)SNDRV_SEQ_DEVICE_ARGPTR(dev);
@@ -275,22 +277,14 @@ static int snd_opl3_seq_delete_device(struct snd_seq_device *dev)
         return 0;
 }
 
-static int __init alsa_opl3_seq_init(void)
-{
-        static struct snd_seq_dev_ops ops =
-        {
-                snd_opl3_seq_new_device,
-                snd_opl3_seq_delete_device
-        };
-
-        return snd_seq_device_register_driver(SNDRV_SEQ_DEV_ID_OPL3, &ops,
-                                              sizeof(struct snd_opl3 *));
-}
-
-static void __exit alsa_opl3_seq_exit(void)
-{
-        snd_seq_device_unregister_driver(SNDRV_SEQ_DEV_ID_OPL3);
-}
+static struct snd_seq_driver opl3_seq_driver = {
+        .driver = {
+                .name = KBUILD_MODNAME,
+                .probe = snd_opl3_seq_probe,
+                .remove = snd_opl3_seq_remove,
+        },
+        .id = SNDRV_SEQ_DEV_ID_OPL3,
+        .argsize = sizeof(struct snd_opl3 *),
+};
 
-module_init(alsa_opl3_seq_init)
-module_exit(alsa_opl3_seq_exit)
+module_snd_seq_driver(opl3_seq_driver);