mirror of https://gitee.com/openkylin/linux.git
[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>
This commit is contained in:
parent
be6245373f
commit
11ff5c62b1
|
@ -203,10 +203,10 @@ static int __init snd_card_als100_probe(int dev,
|
|||
const struct pnp_card_device_id *pid)
|
||||
{
|
||||
int error;
|
||||
sb_t *chip;
|
||||
snd_card_t *card;
|
||||
struct snd_sb *chip;
|
||||
struct snd_card *card;
|
||||
struct snd_card_als100 *acard;
|
||||
opl3_t *opl3;
|
||||
struct snd_opl3 *opl3;
|
||||
|
||||
if ((card = snd_card_new(index[dev], id[dev], THIS_MODULE,
|
||||
sizeof(struct snd_card_als100))) == NULL)
|
||||
|
@ -299,7 +299,7 @@ static int __devinit snd_als100_pnp_detect(struct pnp_card_link *card,
|
|||
|
||||
static void __devexit snd_als100_pnp_remove(struct pnp_card_link * pcard)
|
||||
{
|
||||
snd_card_t *card = (snd_card_t *) pnp_get_card_drvdata(pcard);
|
||||
struct snd_card *card = (struct snd_card *) pnp_get_card_drvdata(pcard);
|
||||
|
||||
snd_card_disconnect(card);
|
||||
snd_card_free_in_thread(card);
|
||||
|
|
|
@ -227,10 +227,10 @@ static int __devinit snd_card_azt2320_probe(int dev,
|
|||
const struct pnp_card_device_id *pid)
|
||||
{
|
||||
int error;
|
||||
snd_card_t *card;
|
||||
struct snd_card *card;
|
||||
struct snd_card_azt2320 *acard;
|
||||
cs4231_t *chip;
|
||||
opl3_t *opl3;
|
||||
struct snd_cs4231 *chip;
|
||||
struct snd_opl3 *opl3;
|
||||
|
||||
if ((card = snd_card_new(index[dev], id[dev], THIS_MODULE,
|
||||
sizeof(struct snd_card_azt2320))) == NULL)
|
||||
|
@ -329,7 +329,7 @@ static int __devinit snd_azt2320_pnp_detect(struct pnp_card_link *card,
|
|||
|
||||
static void __devexit snd_azt2320_pnp_remove(struct pnp_card_link * pcard)
|
||||
{
|
||||
snd_card_t *card = (snd_card_t *) pnp_get_card_drvdata(pcard);
|
||||
struct snd_card *card = (struct snd_card *) pnp_get_card_drvdata(pcard);
|
||||
|
||||
snd_card_disconnect(card);
|
||||
snd_card_free_in_thread(card);
|
||||
|
|
|
@ -188,10 +188,10 @@ static int __devinit snd_card_dt019x_pnp(int dev, struct snd_card_dt019x *acard,
|
|||
static int __devinit snd_card_dt019x_probe(int dev, struct pnp_card_link *pcard, const struct pnp_card_device_id *pid)
|
||||
{
|
||||
int error;
|
||||
sb_t *chip;
|
||||
snd_card_t *card;
|
||||
struct snd_sb *chip;
|
||||
struct snd_card *card;
|
||||
struct snd_card_dt019x *acard;
|
||||
opl3_t *opl3;
|
||||
struct snd_opl3 *opl3;
|
||||
|
||||
if ((card = snd_card_new(index[dev], id[dev], THIS_MODULE,
|
||||
sizeof(struct snd_card_dt019x))) == NULL)
|
||||
|
@ -290,7 +290,7 @@ static int __devinit snd_dt019x_pnp_probe(struct pnp_card_link *card,
|
|||
|
||||
static void __devexit snd_dt019x_pnp_remove(struct pnp_card_link * pcard)
|
||||
{
|
||||
snd_card_t *card = (snd_card_t *) pnp_get_card_drvdata(pcard);
|
||||
struct snd_card *card = (struct snd_card *) pnp_get_card_drvdata(pcard);
|
||||
snd_card_disconnect(card);
|
||||
snd_card_free_in_thread(card);
|
||||
}
|
||||
|
|
|
@ -65,7 +65,7 @@ MODULE_PARM_DESC(dma1, "DMA1 # for Sound Galaxy driver.");
|
|||
#define SGALAXY_AUXC_LEFT 18
|
||||
#define SGALAXY_AUXC_RIGHT 19
|
||||
|
||||
static snd_card_t *snd_sgalaxy_cards[SNDRV_CARDS] = SNDRV_DEFAULT_PTR;
|
||||
static struct snd_card *snd_sgalaxy_cards[SNDRV_CARDS] = SNDRV_DEFAULT_PTR;
|
||||
|
||||
#define PFX "sgalaxy: "
|
||||
|
||||
|
@ -75,7 +75,7 @@ static snd_card_t *snd_sgalaxy_cards[SNDRV_CARDS] = SNDRV_DEFAULT_PTR;
|
|||
|
||||
#define AD1848P1( port, x ) ( port + c_d_c_AD1848##x )
|
||||
|
||||
/* from lowlevel/sb/sb.c - to avoid having to allocate a sb_t for the */
|
||||
/* from lowlevel/sb/sb.c - to avoid having to allocate a struct snd_sb for the */
|
||||
/* short time we actually need it.. */
|
||||
|
||||
static 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
|
|||
AD1848_DOUBLE("Aux Playback Volume", 0, SGALAXY_AUXC_LEFT, SGALAXY_AUXC_RIGHT, 0, 0, 31, 0)
|
||||
};
|
||||
|
||||
static int __init snd_sgalaxy_mixer(ad1848_t *chip)
|
||||
static int __init snd_sgalaxy_mixer(struct snd_ad1848 *chip)
|
||||
{
|
||||
snd_card_t *card = chip->card;
|
||||
snd_ctl_elem_id_t id1, id2;
|
||||
struct snd_card *card = chip->card;
|
||||
struct snd_ctl_elem_id id1, id2;
|
||||
unsigned int idx;
|
||||
int err;
|
||||
|
||||
|
@ -221,8 +221,8 @@ static int __init snd_sgalaxy_probe(int dev)
|
|||
static int possible_irqs[] = {7, 9, 10, 11, -1};
|
||||
static int possible_dmas[] = {1, 3, 0, -1};
|
||||
int err, xirq, xdma1;
|
||||
snd_card_t *card;
|
||||
ad1848_t *chip;
|
||||
struct snd_card *card;
|
||||
struct snd_ad1848 *chip;
|
||||
|
||||
if (sbport[dev] == SNDRV_AUTO_PORT) {
|
||||
snd_printk(KERN_ERR PFX "specify SB port\n");
|
||||
|
|
Loading…
Reference in New Issue