aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2005-11-17 08:42:36 -0500
committerJaroslav Kysela <perex@suse.cz>2006-01-03 06:18:39 -0500
commit11ff5c62b1327cc7bdcfcf66b4b718495fea0043 (patch)
treea6ed8733002ac196993a091504d804dca48317a1
parentbe6245373f46eb21839ba1b54c83bc7cc8274208 (diff)
[ALSA] Remove xxx_t typedefs: ISA SB/AD-clone
Modules: ALS100 driver,AZT2320 driver,DT019x driver,Sound Galaxy driver Remove xxx_t typedefs from the ISA SB/AD-clone drivers (als100, azt2320, dt019x, sgalaxy). Signed-off-by: Takashi Iwai <tiwai@suse.de>
-rw-r--r--sound/isa/als100.c8
-rw-r--r--sound/isa/azt2320.c8
-rw-r--r--sound/isa/dt019x.c8
-rw-r--r--sound/isa/sgalaxy.c14
4 files changed, 19 insertions, 19 deletions
diff --git a/sound/isa/als100.c b/sound/isa/als100.c
index ac8f13664983..0d709bc50c16 100644
--- a/sound/isa/als100.c
+++ b/sound/isa/als100.c
@@ -203,10 +203,10 @@ static int __init snd_card_als100_probe(int dev,
203 const struct pnp_card_device_id *pid) 203 const struct pnp_card_device_id *pid)
204{ 204{
205 int error; 205 int error;
206 sb_t *chip; 206 struct snd_sb *chip;
207 snd_card_t *card; 207 struct snd_card *card;
208 struct snd_card_als100 *acard; 208 struct snd_card_als100 *acard;
209 opl3_t *opl3; 209 struct snd_opl3 *opl3;
210 210
211 if ((card = snd_card_new(index[dev], id[dev], THIS_MODULE, 211 if ((card = snd_card_new(index[dev], id[dev], THIS_MODULE,
212 sizeof(struct snd_card_als100))) == NULL) 212 sizeof(struct snd_card_als100))) == NULL)
@@ -299,7 +299,7 @@ static int __devinit snd_als100_pnp_detect(struct pnp_card_link *card,
299 299
300static void __devexit snd_als100_pnp_remove(struct pnp_card_link * pcard) 300static void __devexit snd_als100_pnp_remove(struct pnp_card_link * pcard)
301{ 301{
302 snd_card_t *card = (snd_card_t *) pnp_get_card_drvdata(pcard); 302 struct snd_card *card = (struct snd_card *) pnp_get_card_drvdata(pcard);
303 303
304 snd_card_disconnect(card); 304 snd_card_disconnect(card);
305 snd_card_free_in_thread(card); 305 snd_card_free_in_thread(card);
diff --git a/sound/isa/azt2320.c b/sound/isa/azt2320.c
index bb41c6ec2f43..db4e7334a67d 100644
--- a/sound/isa/azt2320.c
+++ b/sound/isa/azt2320.c
@@ -227,10 +227,10 @@ static int __devinit snd_card_azt2320_probe(int dev,
227 const struct pnp_card_device_id *pid) 227 const struct pnp_card_device_id *pid)
228{ 228{
229 int error; 229 int error;
230 snd_card_t *card; 230 struct snd_card *card;
231 struct snd_card_azt2320 *acard; 231 struct snd_card_azt2320 *acard;
232 cs4231_t *chip; 232 struct snd_cs4231 *chip;
233 opl3_t *opl3; 233 struct snd_opl3 *opl3;
234 234
235 if ((card = snd_card_new(index[dev], id[dev], THIS_MODULE, 235 if ((card = snd_card_new(index[dev], id[dev], THIS_MODULE,
236 sizeof(struct snd_card_azt2320))) == NULL) 236 sizeof(struct snd_card_azt2320))) == NULL)
@@ -329,7 +329,7 @@ static int __devinit snd_azt2320_pnp_detect(struct pnp_card_link *card,
329 329
330static void __devexit snd_azt2320_pnp_remove(struct pnp_card_link * pcard) 330static void __devexit snd_azt2320_pnp_remove(struct pnp_card_link * pcard)
331{ 331{
332 snd_card_t *card = (snd_card_t *) pnp_get_card_drvdata(pcard); 332 struct snd_card *card = (struct snd_card *) pnp_get_card_drvdata(pcard);
333 333
334 snd_card_disconnect(card); 334 snd_card_disconnect(card);
335 snd_card_free_in_thread(card); 335 snd_card_free_in_thread(card);
diff --git a/sound/isa/dt019x.c b/sound/isa/dt019x.c
index db7c3397b323..7559956157e9 100644
--- a/sound/isa/dt019x.c
+++ b/sound/isa/dt019x.c
@@ -188,10 +188,10 @@ static int __devinit snd_card_dt019x_pnp(int dev, struct snd_card_dt019x *acard,
188static int __devinit snd_card_dt019x_probe(int dev, struct pnp_card_link *pcard, const struct pnp_card_device_id *pid) 188static int __devinit snd_card_dt019x_probe(int dev, struct pnp_card_link *pcard, const struct pnp_card_device_id *pid)
189{ 189{
190 int error; 190 int error;
191 sb_t *chip; 191 struct snd_sb *chip;
192 snd_card_t *card; 192 struct snd_card *card;
193 struct snd_card_dt019x *acard; 193 struct snd_card_dt019x *acard;
194 opl3_t *opl3; 194 struct snd_opl3 *opl3;
195 195
196 if ((card = snd_card_new(index[dev], id[dev], THIS_MODULE, 196 if ((card = snd_card_new(index[dev], id[dev], THIS_MODULE,
197 sizeof(struct snd_card_dt019x))) == NULL) 197 sizeof(struct snd_card_dt019x))) == NULL)
@@ -290,7 +290,7 @@ static int __devinit snd_dt019x_pnp_probe(struct pnp_card_link *card,
290 290
291static void __devexit snd_dt019x_pnp_remove(struct pnp_card_link * pcard) 291static void __devexit snd_dt019x_pnp_remove(struct pnp_card_link * pcard)
292{ 292{
293 snd_card_t *card = (snd_card_t *) pnp_get_card_drvdata(pcard); 293 struct snd_card *card = (struct snd_card *) pnp_get_card_drvdata(pcard);
294 snd_card_disconnect(card); 294 snd_card_disconnect(card);
295 snd_card_free_in_thread(card); 295 snd_card_free_in_thread(card);
296} 296}
diff --git a/sound/isa/sgalaxy.c b/sound/isa/sgalaxy.c
index 52f2294da62b..c16b53ba7ea6 100644
--- a/sound/isa/sgalaxy.c
+++ b/sound/isa/sgalaxy.c
@@ -65,7 +65,7 @@ MODULE_PARM_DESC(dma1, "DMA1 # for Sound Galaxy driver.");
65#define SGALAXY_AUXC_LEFT 18 65#define SGALAXY_AUXC_LEFT 18
66#define SGALAXY_AUXC_RIGHT 19 66#define SGALAXY_AUXC_RIGHT 19
67 67
68static snd_card_t *snd_sgalaxy_cards[SNDRV_CARDS] = SNDRV_DEFAULT_PTR; 68static struct snd_card *snd_sgalaxy_cards[SNDRV_CARDS] = SNDRV_DEFAULT_PTR;
69 69
70#define PFX "sgalaxy: " 70#define PFX "sgalaxy: "
71 71
@@ -75,7 +75,7 @@ static snd_card_t *snd_sgalaxy_cards[SNDRV_CARDS] = SNDRV_DEFAULT_PTR;
75 75
76#define AD1848P1( port, x ) ( port + c_d_c_AD1848##x ) 76#define AD1848P1( port, x ) ( port + c_d_c_AD1848##x )
77 77
78/* from lowlevel/sb/sb.c - to avoid having to allocate a sb_t for the */ 78/* from lowlevel/sb/sb.c - to avoid having to allocate a struct snd_sb for the */
79/* short time we actually need it.. */ 79/* short time we actually need it.. */
80 80
81static int snd_sgalaxy_sbdsp_reset(unsigned long port) 81static int snd_sgalaxy_sbdsp_reset(unsigned long port)
@@ -180,10 +180,10 @@ AD1848_DOUBLE("Aux Playback Switch", 0, SGALAXY_AUXC_LEFT, SGALAXY_AUXC_RIGHT, 7
180AD1848_DOUBLE("Aux Playback Volume", 0, SGALAXY_AUXC_LEFT, SGALAXY_AUXC_RIGHT, 0, 0, 31, 0) 180AD1848_DOUBLE("Aux Playback Volume", 0, SGALAXY_AUXC_LEFT, SGALAXY_AUXC_RIGHT, 0, 0, 31, 0)
181}; 181};
182 182
183static int __init snd_sgalaxy_mixer(ad1848_t *chip) 183static int __init snd_sgalaxy_mixer(struct snd_ad1848 *chip)
184{ 184{
185 snd_card_t *card = chip->card; 185 struct snd_card *card = chip->card;
186 snd_ctl_elem_id_t id1, id2; 186 struct snd_ctl_elem_id id1, id2;
187 unsigned int idx; 187 unsigned int idx;
188 int err; 188 int err;
189 189
@@ -221,8 +221,8 @@ static int __init snd_sgalaxy_probe(int dev)
221 static int possible_irqs[] = {7, 9, 10, 11, -1}; 221 static int possible_irqs[] = {7, 9, 10, 11, -1};
222 static int possible_dmas[] = {1, 3, 0, -1}; 222 static int possible_dmas[] = {1, 3, 0, -1};
223 int err, xirq, xdma1; 223 int err, xirq, xdma1;
224 snd_card_t *card; 224 struct snd_card *card;
225 ad1848_t *chip; 225 struct snd_ad1848 *chip;
226 226
227 if (sbport[dev] == SNDRV_AUTO_PORT) { 227 if (sbport[dev] == SNDRV_AUTO_PORT) {
228 snd_printk(KERN_ERR PFX "specify SB port\n"); 228 snd_printk(KERN_ERR PFX "specify SB port\n");