1 files changed, 24 insertions, 24 deletions

diff --git a/sound/drivers/opl3/opl3_seq.c b/sound/drivers/opl3/opl3_seq.c
index 136964b844de..1886b2958e77 100644
--- a/sound/drivers/opl3/opl3_seq.c
+++ b/sound/drivers/opl3/opl3_seq.c
@@ -35,7 +35,7 @@ int use_internal_drums = 0;
 module_param(use_internal_drums, bool, 0444);
 MODULE_PARM_DESC(use_internal_drums, "Enable internal OPL2/3 drums.");
 
-int snd_opl3_synth_use_inc(opl3_t * opl3)
+int snd_opl3_synth_use_inc(struct snd_opl3 * opl3)
 {
         if (!try_module_get(opl3->card->module))
                 return -EFAULT;
@@ -43,12 +43,12 @@ int snd_opl3_synth_use_inc(opl3_t * opl3)
 
 }
 
-void snd_opl3_synth_use_dec(opl3_t * opl3)
+void snd_opl3_synth_use_dec(struct snd_opl3 * opl3)
 {
         module_put(opl3->card->module);
 }
 
-int snd_opl3_synth_setup(opl3_t * opl3)
+int snd_opl3_synth_setup(struct snd_opl3 * opl3)
 {
         int idx;
 
@@ -78,7 +78,7 @@ int snd_opl3_synth_setup(opl3_t * opl3)
         return 0;
 }
 
-void snd_opl3_synth_cleanup(opl3_t * opl3)
+void snd_opl3_synth_cleanup(struct snd_opl3 * opl3)
 {
         unsigned long flags;
 
@@ -96,9 +96,9 @@ void snd_opl3_synth_cleanup(opl3_t * opl3)
         up(&opl3->access_mutex);
 }
 
-static int snd_opl3_synth_use(void *private_data, snd_seq_port_subscribe_t * info)
+static int snd_opl3_synth_use(void *private_data, struct snd_seq_port_subscribe * info)
 {
-        opl3_t *opl3 = private_data;
+        struct snd_opl3 *opl3 = private_data;
         int err;
 
         if ((err = snd_opl3_synth_setup(opl3)) < 0)
@@ -123,9 +123,9 @@ static int snd_opl3_synth_use(void *private_data, snd_seq_port_subscribe_t * inf
         return 0;
 }
 
-static int snd_opl3_synth_unuse(void *private_data, snd_seq_port_subscribe_t * info)
+static int snd_opl3_synth_unuse(void *private_data, struct snd_seq_port_subscribe * info)
 {
-        opl3_t *opl3 = private_data;
+        struct snd_opl3 *opl3 = private_data;
 
         snd_opl3_synth_cleanup(opl3);
 
@@ -137,7 +137,7 @@ static int snd_opl3_synth_unuse(void *private_data, snd_seq_port_subscribe_t * i
 /*
  * MIDI emulation operators
  */
-snd_midi_op_t opl3_ops = {
+struct snd_midi_op opl3_ops = {
         .note_on =              snd_opl3_note_on,
         .note_off =             snd_opl3_note_off,
         .key_press =            snd_opl3_key_press,
@@ -147,10 +147,10 @@ snd_midi_op_t opl3_ops = {
         .sysex =                snd_opl3_sysex,
 };
 
-static int snd_opl3_synth_event_input(snd_seq_event_t * ev, int direct,
+static int snd_opl3_synth_event_input(struct snd_seq_event * ev, int direct,
                                       void *private_data, int atomic, int hop)
 {
-        opl3_t *opl3 = private_data;
+        struct snd_opl3 *opl3 = private_data;
 
         if (ev->type >= SNDRV_SEQ_EVENT_INSTR_BEGIN &&
             ev->type <= SNDRV_SEQ_EVENT_INSTR_CHANGE) {
@@ -168,14 +168,14 @@ static int snd_opl3_synth_event_input(snd_seq_event_t * ev, int direct,
 
 static void snd_opl3_synth_free_port(void *private_data)
 {
-        opl3_t *opl3 = private_data;
+        struct snd_opl3 *opl3 = private_data;
 
         snd_midi_channel_free_set(opl3->chset);
 }
 
-static int snd_opl3_synth_create_port(opl3_t * opl3)
+static int snd_opl3_synth_create_port(struct snd_opl3 * opl3)
 {
-        snd_seq_port_callback_t callbacks;
+        struct snd_seq_port_callback callbacks;
         char name[32];
         int voices, opl_ver;
 
@@ -215,15 +215,15 @@ static int snd_opl3_synth_create_port(opl3_t * opl3)
 
 /* ------------------------------ */
 
-static int snd_opl3_seq_new_device(snd_seq_device_t *dev)
+static int snd_opl3_seq_new_device(struct snd_seq_device *dev)
 {
-        opl3_t *opl3;
+        struct snd_opl3 *opl3;
         int client;
-        snd_seq_client_callback_t callbacks;
-        snd_seq_client_info_t cinfo;
+        struct snd_seq_client_callback callbacks;
+        struct snd_seq_client_info cinfo;
         int opl_ver;
 
-        opl3 = *(opl3_t **)SNDRV_SEQ_DEVICE_ARGPTR(dev);
+        opl3 = *(struct snd_opl3 **)SNDRV_SEQ_DEVICE_ARGPTR(dev);
         if (opl3 == NULL)
                 return -EINVAL;
 
@@ -273,11 +273,11 @@ static int snd_opl3_seq_new_device(snd_seq_device_t *dev)
         return 0;
 }
 
-static int snd_opl3_seq_delete_device(snd_seq_device_t *dev)
+static int snd_opl3_seq_delete_device(struct snd_seq_device *dev)
 {
-        opl3_t *opl3;
+        struct snd_opl3 *opl3;
 
-        opl3 = *(opl3_t **)SNDRV_SEQ_DEVICE_ARGPTR(dev);
+        opl3 = *(struct snd_opl3 **)SNDRV_SEQ_DEVICE_ARGPTR(dev);
         if (opl3 == NULL)
                 return -EINVAL;
 
@@ -295,14 +295,14 @@ static int snd_opl3_seq_delete_device(snd_seq_device_t *dev)
 
 static int __init alsa_opl3_seq_init(void)
 {
-        static snd_seq_dev_ops_t ops =
+        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(opl3_t*));
+                                              sizeof(struct snd_opl3 *));
 }
 
 static void __exit alsa_opl3_seq_exit(void)