Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 56135
b: refs/heads/master
c: 83c51c0
h: refs/heads/master
i:
  56133: bf2ee14
  56131: 17915c1
  56127: 0403f3f
v: v3
  • Loading branch information
Rene Herman authored and Jaroslav Kysela committed May 11, 2007
1 parent e567c20 commit 3251514
Show file tree
Hide file tree
Showing 13 changed files with 31 additions and 31 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: e4b6088c8cf16781f7f7b887811b164daf625968
refs/heads/master: 83c51c0ab08f55468d8f5444ff2f70a36841a21f
4 changes: 2 additions & 2 deletions trunk/sound/isa/cmi8330.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -601,7 +601,7 @@ static int snd_cmi8330_isa_resume(struct device *dev, unsigned int n)
}
#endif

#define CMI8330_DRIVER "snd_cmi8330"
#define DEV_NAME "cmi8330"

static struct isa_driver snd_cmi8330_driver = {
.match = snd_cmi8330_isa_match,
Expand All @@ -612,7 +612,7 @@ static struct isa_driver snd_cmi8330_driver = {
.resume = snd_cmi8330_isa_resume,
#endif
.driver = {
.name = CMI8330_DRIVER
.name = DEV_NAME
},
};

Expand Down
6 changes: 3 additions & 3 deletions trunk/sound/isa/cs423x/cs4236.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,10 +75,10 @@ MODULE_SUPPORTED_DEVICE("{{Crystal Semiconductors,CS4235},"

#ifdef CS4232
#define IDENT "CS4232"
#define CS423X_DRIVER "snd_cs4232"
#define DEV_NAME "cs4232"
#else
#define IDENT "CS4236+"
#define CS423X_DRIVER "snd_cs4236"
#define DEV_NAME "cs4236"
#endif

static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX; /* Index 0-MAX */
Expand Down Expand Up @@ -630,7 +630,7 @@ static struct isa_driver cs423x_isa_driver = {
.resume = snd_cs423x_isa_resume,
#endif
.driver = {
.name = CS423X_DRIVER
.name = DEV_NAME
},
};

Expand Down
4 changes: 2 additions & 2 deletions trunk/sound/isa/es18xx.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2318,7 +2318,7 @@ static int snd_es18xx_isa_resume(struct device *dev, unsigned int n)
}
#endif

#define ES18XX_DRIVER "snd_es18xx"
#define DEV_NAME "es18xx"

static struct isa_driver snd_es18xx_isa_driver = {
.match = snd_es18xx_isa_match,
Expand All @@ -2329,7 +2329,7 @@ static struct isa_driver snd_es18xx_isa_driver = {
.resume = snd_es18xx_isa_resume,
#endif
.driver = {
.name = ES18XX_DRIVER
.name = DEV_NAME
},
};

Expand Down
4 changes: 2 additions & 2 deletions trunk/sound/isa/gus/gusmax.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -358,15 +358,15 @@ static int __devexit snd_gusmax_remove(struct device *devptr, unsigned int dev)
return 0;
}

#define GUSMAX_DRIVER "snd_gusmax"
#define DEV_NAME "gusmax"

static struct isa_driver snd_gusmax_driver = {
.match = snd_gusmax_match,
.probe = snd_gusmax_probe,
.remove = __devexit_p(snd_gusmax_remove),
/* FIXME: suspend/resume */
.driver = {
.name = GUSMAX_DRIVER
.name = DEV_NAME
},
};

Expand Down
4 changes: 2 additions & 2 deletions trunk/sound/isa/opl3sa2.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -947,7 +947,7 @@ static int snd_opl3sa2_isa_resume(struct device *dev, unsigned int n)
}
#endif

#define OPL3SA2_DRIVER "snd_opl3sa2"
#define DEV_NAME "opl3sa2"

static struct isa_driver snd_opl3sa2_isa_driver = {
.match = snd_opl3sa2_isa_match,
Expand All @@ -958,7 +958,7 @@ static struct isa_driver snd_opl3sa2_isa_driver = {
.resume = snd_opl3sa2_isa_resume,
#endif
.driver = {
.name = OPL3SA2_DRIVER
.name = DEV_NAME
},
};

Expand Down
6 changes: 3 additions & 3 deletions trunk/sound/isa/opti9xx/miro.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -137,8 +137,6 @@ struct snd_miro {

static void snd_miro_proc_init(struct snd_miro * miro);

#define DRIVER_NAME "snd-miro"

static char * snd_opti9xx_names[] = {
"unkown",
"82C928", "82C929",
Expand Down Expand Up @@ -1423,13 +1421,15 @@ static int __devexit snd_miro_remove(struct device *devptr, unsigned int dev)
return 0;
}

#define DEV_NAME "miro"

static struct isa_driver snd_miro_driver = {
.match = snd_miro_match,
.probe = snd_miro_probe,
.remove = __devexit_p(snd_miro_remove),
/* FIXME: suspend/resume */
.driver = {
.name = DRIVER_NAME
.name = DEV_NAME
},
};

Expand Down
10 changes: 5 additions & 5 deletions trunk/sound/isa/opti9xx/opti92x-ad1848.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -280,10 +280,10 @@ MODULE_DEVICE_TABLE(pnp_card, snd_opti9xx_pnpids);
#endif /* CONFIG_PNP */

#ifdef OPTi93X
#define DRIVER_NAME "snd-card-opti93x"
#define DEV_NAME "opti93x"
#else
#define DRIVER_NAME "snd-card-opti92x"
#endif /* OPTi93X */
#define DEV_NAME "opti92x"
#endif

static char * snd_opti9xx_names[] = {
"unkown",
Expand Down Expand Up @@ -1289,7 +1289,7 @@ static int snd_opti93x_create(struct snd_card *card, struct snd_opti9xx *chip,
}
codec->dma2 = chip->dma2;

if (request_irq(chip->irq, snd_opti93x_interrupt, IRQF_DISABLED, DRIVER_NAME" - WSS", codec)) {
if (request_irq(chip->irq, snd_opti93x_interrupt, IRQF_DISABLED, DEV_NAME" - WSS", codec)) {
snd_printk(KERN_ERR "opti9xx: can't grab IRQ %d\n", chip->irq);
snd_opti93x_free(codec);
return -EBUSY;
Expand Down Expand Up @@ -2015,7 +2015,7 @@ static struct isa_driver snd_opti9xx_driver = {
.remove = __devexit_p(snd_opti9xx_isa_remove),
/* FIXME: suspend/resume */
.driver = {
.name = DRIVER_NAME
.name = DEV_NAME
},
};

Expand Down
6 changes: 3 additions & 3 deletions trunk/sound/isa/sb/sb16.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -615,9 +615,9 @@ static int snd_sb16_isa_resume(struct device *dev, unsigned int n)
#endif

#ifdef SNDRV_SBAWE
#define SND_SB16_DRIVER "snd_sbawe"
#define DEV_NAME "sbawe"
#else
#define SND_SB16_DRIVER "snd_sb16"
#define DEV_NAME "sb16"
#endif

static struct isa_driver snd_sb16_isa_driver = {
Expand All @@ -629,7 +629,7 @@ static struct isa_driver snd_sb16_isa_driver = {
.resume = snd_sb16_isa_resume,
#endif
.driver = {
.name = SND_SB16_DRIVER
.name = DEV_NAME
},
};

Expand Down
4 changes: 2 additions & 2 deletions trunk/sound/isa/sb/sb8.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@ static int snd_sb8_resume(struct device *dev, unsigned int n)
}
#endif

#define SND_SB8_DRIVER "snd_sb8"
#define DEV_NAME "sb8"

static struct isa_driver snd_sb8_driver = {
.match = snd_sb8_match,
Expand All @@ -250,7 +250,7 @@ static struct isa_driver snd_sb8_driver = {
.resume = snd_sb8_resume,
#endif
.driver = {
.name = SND_SB8_DRIVER
.name = DEV_NAME
},
};

Expand Down
4 changes: 2 additions & 2 deletions trunk/sound/isa/sgalaxy.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -334,7 +334,7 @@ static int snd_sgalaxy_resume(struct device *pdev, unsigned int n)
}
#endif

#define SND_SGALAXY_DRIVER "snd_sgalaxy"
#define DEV_NAME "sgalaxy"

static struct isa_driver snd_sgalaxy_driver = {
.match = snd_sgalaxy_match,
Expand All @@ -345,7 +345,7 @@ static struct isa_driver snd_sgalaxy_driver = {
.resume = snd_sgalaxy_resume,
#endif
.driver = {
.name = SND_SGALAXY_DRIVER
.name = DEV_NAME
},
};

Expand Down
4 changes: 2 additions & 2 deletions trunk/sound/isa/sscape.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1296,15 +1296,15 @@ static int __devexit snd_sscape_remove(struct device *devptr, unsigned int dev)
return 0;
}

#define SSCAPE_DRIVER "snd_sscape"
#define DEV_NAME "sscape"

static struct isa_driver snd_sscape_driver = {
.match = snd_sscape_match,
.probe = snd_sscape_probe,
.remove = __devexit_p(snd_sscape_remove),
/* FIXME: suspend/resume */
.driver = {
.name = SSCAPE_DRIVER
.name = DEV_NAME
},
};

Expand Down
4 changes: 2 additions & 2 deletions trunk/sound/isa/wavefront/wavefront.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -633,15 +633,15 @@ static int __devexit snd_wavefront_isa_remove(struct device *devptr,
return 0;
}

#define WAVEFRONT_DRIVER "snd_wavefront"
#define DEV_NAME "wavefront"

static struct isa_driver snd_wavefront_driver = {
.match = snd_wavefront_isa_match,
.probe = snd_wavefront_isa_probe,
.remove = __devexit_p(snd_wavefront_isa_remove),
/* FIXME: suspend, resume */
.driver = {
.name = WAVEFRONT_DRIVER
.name = DEV_NAME
},
};

Expand Down

0 comments on commit 3251514

Please sign in to comment.