[ALSA] Remove xxx_t typedefs: OPL3

Modules: OPL3,Raw OPL FM

Remove xxx_t typedefs from the OPL3 driver

Signed-off-by: Takashi Iwai <tiwai@suse.de>

1 files changed, 40 insertions, 40 deletions

diff --git a/sound/drivers/opl3/opl3_lib.c b/sound/drivers/opl3/opl3_lib.c
index 06246503083c..cbd37e919601 100644
--- a/sound/drivers/opl3/opl3_lib.c
+++ b/sound/drivers/opl3/opl3_lib.c
@@ -37,7 +37,7 @@ MODULE_LICENSE("GPL");
 
 extern char snd_opl3_regmap[MAX_OPL2_VOICES][4];
 
-static void snd_opl2_command(opl3_t * opl3, unsigned short cmd, unsigned char val)
+static void snd_opl2_command(struct snd_opl3 * opl3, unsigned short cmd, unsigned char val)
 {
         unsigned long flags;
         unsigned long port;
@@ -60,7 +60,7 @@ static void snd_opl2_command(opl3_t * opl3, unsigned short cmd, unsigned char va
         spin_unlock_irqrestore(&opl3->reg_lock, flags);
 }
 
-static void snd_opl3_command(opl3_t * opl3, unsigned short cmd, unsigned char val)
+static void snd_opl3_command(struct snd_opl3 * opl3, unsigned short cmd, unsigned char val)
 {
         unsigned long flags;
         unsigned long port;
@@ -85,7 +85,7 @@ static void snd_opl3_command(opl3_t * opl3, unsigned short cmd, unsigned char va
         spin_unlock_irqrestore(&opl3->reg_lock, flags);
 }
 
-static int snd_opl3_detect(opl3_t * opl3)
+static int snd_opl3_detect(struct snd_opl3 * opl3)
 {
         /*
          * This function returns 1 if the FM chip is present at the given I/O port
@@ -153,12 +153,12 @@ static int snd_opl3_detect(opl3_t * opl3)
  *  Timer 1 - 80us
  */
 
-static int snd_opl3_timer1_start(snd_timer_t * timer)
+static int snd_opl3_timer1_start(struct snd_timer * timer)
 {
         unsigned long flags;
         unsigned char tmp;
         unsigned int ticks;
-        opl3_t *opl3;
+        struct snd_opl3 *opl3;
 
         opl3 = snd_timer_chip(timer);
         spin_lock_irqsave(&opl3->timer_lock, flags);
@@ -171,11 +171,11 @@ static int snd_opl3_timer1_start(snd_timer_t * timer)
         return 0;
 }
 
-static int snd_opl3_timer1_stop(snd_timer_t * timer)
+static int snd_opl3_timer1_stop(struct snd_timer * timer)
 {
         unsigned long flags;
         unsigned char tmp;
-        opl3_t *opl3;
+        struct snd_opl3 *opl3;
 
         opl3 = snd_timer_chip(timer);
         spin_lock_irqsave(&opl3->timer_lock, flags);
@@ -190,12 +190,12 @@ static int snd_opl3_timer1_stop(snd_timer_t * timer)
  *  Timer 2 - 320us
  */
 
-static int snd_opl3_timer2_start(snd_timer_t * timer)
+static int snd_opl3_timer2_start(struct snd_timer * timer)
 {
         unsigned long flags;
         unsigned char tmp;
         unsigned int ticks;
-        opl3_t *opl3;
+        struct snd_opl3 *opl3;
 
         opl3 = snd_timer_chip(timer);
         spin_lock_irqsave(&opl3->timer_lock, flags);
@@ -208,11 +208,11 @@ static int snd_opl3_timer2_start(snd_timer_t * timer)
         return 0;
 }
 
-static int snd_opl3_timer2_stop(snd_timer_t * timer)
+static int snd_opl3_timer2_stop(struct snd_timer * timer)
 {
         unsigned long flags;
         unsigned char tmp;
-        opl3_t *opl3;
+        struct snd_opl3 *opl3;
 
         opl3 = snd_timer_chip(timer);
         spin_lock_irqsave(&opl3->timer_lock, flags);
@@ -227,7 +227,7 @@ static int snd_opl3_timer2_stop(snd_timer_t * timer)
 
  */
 
-static struct _snd_timer_hardware snd_opl3_timer1 =
+static struct snd_timer_hardware snd_opl3_timer1 =
 {
         .flags =        SNDRV_TIMER_HW_STOP,
         .resolution =   80000,
@@ -236,7 +236,7 @@ static struct _snd_timer_hardware snd_opl3_timer1 =
         .stop =         snd_opl3_timer1_stop,
 };
 
-static struct _snd_timer_hardware snd_opl3_timer2 =
+static struct snd_timer_hardware snd_opl3_timer2 =
 {
         .flags =        SNDRV_TIMER_HW_STOP,
         .resolution =   320000,
@@ -245,10 +245,10 @@ static struct _snd_timer_hardware snd_opl3_timer2 =
         .stop =         snd_opl3_timer2_stop,
 };
 
-static int snd_opl3_timer1_init(opl3_t * opl3, int timer_no)
+static int snd_opl3_timer1_init(struct snd_opl3 * opl3, int timer_no)
 {
-        snd_timer_t *timer = NULL;
-        snd_timer_id_t tid;
+        struct snd_timer *timer = NULL;
+        struct snd_timer_id tid;
         int err;
 
         tid.dev_class = SNDRV_TIMER_CLASS_CARD;
@@ -265,10 +265,10 @@ static int snd_opl3_timer1_init(opl3_t * opl3, int timer_no)
         return err;
 }
 
-static int snd_opl3_timer2_init(opl3_t * opl3, int timer_no)
+static int snd_opl3_timer2_init(struct snd_opl3 * opl3, int timer_no)
 {
-        snd_timer_t *timer = NULL;
-        snd_timer_id_t tid;
+        struct snd_timer *timer = NULL;
+        struct snd_timer_id tid;
         int err;
 
         tid.dev_class = SNDRV_TIMER_CLASS_CARD;
@@ -289,11 +289,11 @@ static int snd_opl3_timer2_init(opl3_t * opl3, int timer_no)
 
  */
 
-void snd_opl3_interrupt(snd_hwdep_t * hw)
+void snd_opl3_interrupt(struct snd_hwdep * hw)
 {
         unsigned char status;
-        opl3_t *opl3;
-        snd_timer_t *timer;
+        struct snd_opl3 *opl3;
+        struct snd_timer *timer;
 
         if (hw == NULL)
                 return;
@@ -320,7 +320,7 @@ void snd_opl3_interrupt(snd_hwdep_t * hw)
 
  */
 
-static int snd_opl3_free(opl3_t *opl3)
+static int snd_opl3_free(struct snd_opl3 *opl3)
 {
         snd_assert(opl3 != NULL, return -ENXIO);
         if (opl3->private_free)
@@ -331,20 +331,20 @@ static int snd_opl3_free(opl3_t *opl3)
         return 0;
 }
 
-static int snd_opl3_dev_free(snd_device_t *device)
+static int snd_opl3_dev_free(struct snd_device *device)
 {
-        opl3_t *opl3 = device->device_data;
+        struct snd_opl3 *opl3 = device->device_data;
         return snd_opl3_free(opl3);
 }
 
-int snd_opl3_new(snd_card_t *card,
+int snd_opl3_new(struct snd_card *card,
                  unsigned short hardware,
-                 opl3_t **ropl3)
+                 struct snd_opl3 **ropl3)
 {
-        static snd_device_ops_t ops = {
+        static struct snd_device_ops ops = {
                 .dev_free = snd_opl3_dev_free,
         };
-        opl3_t *opl3;
+        struct snd_opl3 *opl3;
         int err;
 
         *ropl3 = NULL;
@@ -367,7 +367,7 @@ int snd_opl3_new(snd_card_t *card,
         return 0;
 }
 
-int snd_opl3_init(opl3_t *opl3)
+int snd_opl3_init(struct snd_opl3 *opl3)
 {
         if (! opl3->command) {
                 printk(KERN_ERR "snd_opl3_init: command not defined!\n");
@@ -391,14 +391,14 @@ int snd_opl3_init(opl3_t *opl3)
         return 0;
 }
 
-int snd_opl3_create(snd_card_t * card,
+int snd_opl3_create(struct snd_card *card,
                     unsigned long l_port,
                     unsigned long r_port,
                     unsigned short hardware,
                     int integrated,
-                    opl3_t ** ropl3)
+                    struct snd_opl3 ** ropl3)
 {
-        opl3_t *opl3;
+        struct snd_opl3 *opl3;
         int err;
 
         *ropl3 = NULL;
@@ -449,7 +449,7 @@ int snd_opl3_create(snd_card_t * card,
         return 0;
 }
 
-int snd_opl3_timer_new(opl3_t * opl3, int timer1_dev, int timer2_dev)
+int snd_opl3_timer_new(struct snd_opl3 * opl3, int timer1_dev, int timer2_dev)
 {
         int err;
 
@@ -466,12 +466,12 @@ int snd_opl3_timer_new(opl3_t * opl3, int timer1_dev, int timer2_dev)
         return 0;
 }
 
-int snd_opl3_hwdep_new(opl3_t * opl3,
+int snd_opl3_hwdep_new(struct snd_opl3 * opl3,
                        int device, int seq_device,
-                       snd_hwdep_t ** rhwdep)
+                       struct snd_hwdep ** rhwdep)
 {
-        snd_hwdep_t *hw;
-        snd_card_t *card = opl3->card;
+        struct snd_hwdep *hw;
+        struct snd_card *card = opl3->card;
         int err;
 
         if (rhwdep)
@@ -514,9 +514,9 @@ int snd_opl3_hwdep_new(opl3_t * opl3,
         opl3->seq_dev_num = seq_device;
 #if defined(CONFIG_SND_SEQUENCER) || (defined(MODULE) && defined(CONFIG_SND_SEQUENCER_MODULE))
         if (snd_seq_device_new(card, seq_device, SNDRV_SEQ_DEV_ID_OPL3,
-                               sizeof(opl3_t*), &opl3->seq_dev) >= 0) {
+                               sizeof(struct snd_opl3 *), &opl3->seq_dev) >= 0) {
                 strcpy(opl3->seq_dev->name, hw->name);
-                *(opl3_t**)SNDRV_SEQ_DEVICE_ARGPTR(opl3->seq_dev) = opl3;
+                *(struct snd_opl3 **)SNDRV_SEQ_DEVICE_ARGPTR(opl3->seq_dev) = opl3;
         }
 #endif
         if (rhwdep)