@@ -960,7 +960,7 @@ snd_ad1889_create(struct snd_card *card,
return err;
}
- if ((err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, chip, &ops)) < 0) {
+ if ((err = snd_device_new(card, SNDRV_DEV_CARD, chip, &ops)) < 0) {
snd_ad1889_free(chip);
return err;
}
@@ -2212,7 +2212,7 @@ static int snd_ali_create(struct snd_card *card,
}
snd_ali_printk("snd_device_new is called.\n");
- err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, codec, &ops);
+ err = snd_device_new(card, SNDRV_DEV_CARD, codec, &ops);
if (err < 0) {
snd_ali_free(codec);
return err;
@@ -755,7 +755,7 @@ static int snd_als300_create(struct snd_card *card,
return err;
}
- if ((err = snd_device_new(card, SNDRV_DEV_LOWLEVEL,
+ if ((err = snd_device_new(card, SNDRV_DEV_CARD,
chip, &ops)) < 0) {
snd_als300_free(chip);
return err;
@@ -1652,7 +1652,7 @@ static int snd_atiixp_create(struct snd_card *card,
pci_set_master(pci);
synchronize_irq(chip->irq);
- if ((err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, chip, &ops)) < 0) {
+ if ((err = snd_device_new(card, SNDRV_DEV_CARD, chip, &ops)) < 0) {
snd_atiixp_free(chip);
return err;
}
@@ -1277,7 +1277,7 @@ static int snd_atiixp_create(struct snd_card *card,
pci_set_master(pci);
synchronize_irq(chip->irq);
- if ((err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, chip, &ops)) < 0) {
+ if ((err = snd_device_new(card, SNDRV_DEV_CARD, chip, &ops)) < 0) {
snd_atiixp_free(chip);
return err;
}
@@ -207,7 +207,7 @@ snd_vortex_create(struct snd_card *card, struct pci_dev *pci, vortex_t ** rchip)
// End of PCI setup.
// Register alsa root device.
- if ((err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, chip, &ops)) < 0) {
+ if ((err = snd_device_new(card, SNDRV_DEV_CARD, chip, &ops)) < 0) {
goto alloc_out;
}
@@ -312,7 +312,7 @@ static int snd_aw2_create(struct snd_card *card,
}
chip->irq = pci->irq;
- err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, chip, &ops);
+ err = snd_device_new(card, SNDRV_DEV_CARD, chip, &ops);
if (err < 0) {
free_irq(chip->irq, (void *)chip);
iounmap(chip->iobase_virt);
@@ -2570,7 +2570,7 @@ snd_azf3328_create(struct snd_card *card,
snd_azf3328_debug_show_ports(chip);
- err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, chip, &ops);
+ err = snd_device_new(card, SNDRV_DEV_CARD, chip, &ops);
if (err < 0)
goto out_err;
@@ -769,7 +769,7 @@ static int snd_bt87x_create(struct snd_card *card,
pci_set_master(pci);
synchronize_irq(chip->irq);
- err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, chip, &ops);
+ err = snd_device_new(card, SNDRV_DEV_CARD, chip, &ops);
if (err < 0)
goto fail;
@@ -1736,7 +1736,7 @@ static int snd_ca0106_create(int dev, struct snd_card *card,
ca0106_init_chip(chip, 0);
- err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, chip, &ops);
+ err = snd_device_new(card, SNDRV_DEV_CARD, chip, &ops);
if (err < 0) {
snd_ca0106_free(chip);
return err;
@@ -3164,7 +3164,7 @@ static int snd_cmipci_create(struct snd_card *card, struct pci_dev *pci,
sprintf(card->longname, "%s%s at %#lx, irq %i",
card->shortname, modelstr, cm->iobase, cm->irq);
- if ((err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, cm, &ops)) < 0) {
+ if ((err = snd_device_new(card, SNDRV_DEV_CARD, cm, &ops)) < 0) {
snd_cmipci_free(cm);
return err;
}
@@ -1395,7 +1395,7 @@ static int snd_cs4281_create(struct snd_card *card,
return tmp;
}
- if ((err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, chip, &ops)) < 0) {
+ if ((err = snd_device_new(card, SNDRV_DEV_CARD, chip, &ops)) < 0) {
snd_cs4281_free(chip);
return err;
}
@@ -4040,7 +4040,7 @@ int snd_cs46xx_create(struct snd_card *card,
return err;
}
- if ((err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, chip, &ops)) < 0) {
+ if ((err = snd_device_new(card, SNDRV_DEV_CARD, chip, &ops)) < 0) {
snd_cs46xx_free(chip);
return err;
}
@@ -238,7 +238,7 @@ static int snd_cs5530_create(struct snd_card *card,
return err;
}
- err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, chip, &ops);
+ err = snd_device_new(card, SNDRV_DEV_CARD, chip, &ops);
if (err < 0) {
snd_cs5530_free(chip);
return err;
@@ -320,7 +320,7 @@ static int snd_cs5535audio_create(struct snd_card *card,
cs5535au->irq = pci->irq;
pci_set_master(pci);
- if ((err = snd_device_new(card, SNDRV_DEV_LOWLEVEL,
+ if ((err = snd_device_new(card, SNDRV_DEV_CARD,
cs5535au, &ops)) < 0)
goto sndfail;
@@ -1735,7 +1735,7 @@ int ct_atc_create(struct snd_card *card, struct pci_dev *pci,
goto error1;
}
- err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, atc, &ops);
+ err = snd_device_new(card, SNDRV_DEV_CARD, atc, &ops);
if (err < 0)
goto error1;
@@ -2028,7 +2028,7 @@ static int snd_echo_create(struct snd_card *card,
}
DE_INIT(("Card init OK\n"));
- if ((err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, chip, &ops)) < 0) {
+ if ((err = snd_device_new(card, SNDRV_DEV_CARD, chip, &ops)) < 0) {
snd_echo_free(chip);
return err;
}
@@ -2013,7 +2013,7 @@ int snd_emu10k1_create(struct snd_card *card,
goto error;
snd_emu10k1_audio_enable(emu);
- err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, emu, &ops);
+ err = snd_device_new(card, SNDRV_DEV_CARD, emu, &ops);
if (err < 0)
goto error;
@@ -1013,7 +1013,7 @@ static int snd_emu10k1x_create(struct snd_card *card,
outl(HCFG_LOCKSOUNDCACHE|HCFG_AUDIOENABLE, chip->port+HCFG);
- if ((err = snd_device_new(card, SNDRV_DEV_LOWLEVEL,
+ if ((err = snd_device_new(card, SNDRV_DEV_CARD,
chip, &ops)) < 0) {
snd_emu10k1x_free(chip);
return err;
@@ -2173,7 +2173,7 @@ static int snd_ensoniq_create(struct snd_card *card,
snd_ensoniq_chip_init(ensoniq);
- if ((err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, ensoniq, &ops)) < 0) {
+ if ((err = snd_device_new(card, SNDRV_DEV_CARD, ensoniq, &ops)) < 0) {
snd_ensoniq_free(ensoniq);
return err;
}
@@ -1653,7 +1653,7 @@ static int snd_es1938_create(struct snd_card *card,
snd_es1938_chip_init(chip);
- if ((err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, chip, &ops)) < 0) {
+ if ((err = snd_device_new(card, SNDRV_DEV_CARD, chip, &ops)) < 0) {
snd_es1938_free(chip);
return err;
}
@@ -2778,7 +2778,7 @@ static int snd_es1968_create(struct snd_card *card,
snd_es1968_chip_init(chip);
- if ((err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, chip, &ops)) < 0) {
+ if ((err = snd_device_new(card, SNDRV_DEV_CARD, chip, &ops)) < 0) {
snd_es1968_free(chip);
return err;
}
@@ -1246,7 +1246,7 @@ static int snd_fm801_create(struct snd_card *card,
chip->irq = -1;
}
- if ((err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, chip, &ops)) < 0) {
+ if ((err = snd_device_new(card, SNDRV_DEV_CARD, chip, &ops)) < 0) {
snd_fm801_free(chip);
return err;
}
@@ -3584,7 +3584,7 @@ static int azx_create(struct snd_card *card, struct pci_dev *pci,
}
}
- err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, chip, &ops);
+ err = snd_device_new(card, SNDRV_DEV_CARD, chip, &ops);
if (err < 0) {
snd_printk(KERN_ERR SFX "%s: Error creating device [card]!\n",
pci_name(chip->pci));
@@ -2633,7 +2633,7 @@ static int snd_ice1712_create(struct snd_card *card,
ICEREG(ice, IRQMASK));
outb(0x00, ICEMT(ice, IRQ));
- err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, ice, &ops);
+ err = snd_device_new(card, SNDRV_DEV_CARD, ice, &ops);
if (err < 0) {
snd_ice1712_free(ice);
return err;
@@ -2603,7 +2603,7 @@ static int snd_vt1724_create(struct snd_card *card,
return -EIO;
}
- err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, ice, &ops);
+ err = snd_device_new(card, SNDRV_DEV_CARD, ice, &ops);
if (err < 0) {
snd_vt1724_free(ice);
return err;
@@ -3212,7 +3212,7 @@ static int snd_intel8x0_create(struct snd_card *card,
}
chip->irq = pci->irq;
- if ((err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, chip, &ops)) < 0) {
+ if ((err = snd_device_new(card, SNDRV_DEV_CARD, chip, &ops)) < 0) {
snd_intel8x0_free(chip);
return err;
}
@@ -1238,7 +1238,7 @@ static int snd_intel8x0m_create(struct snd_card *card,
return err;
}
- if ((err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, chip, &ops)) < 0) {
+ if ((err = snd_device_new(card, SNDRV_DEV_CARD, chip, &ops)) < 0) {
snd_intel8x0m_free(chip);
return err;
}
@@ -2372,7 +2372,7 @@ static int snd_korg1212_create(struct snd_card *card, struct pci_dev *pci,
if (rc)
K1212_DEBUG_PRINTK("K1212_DEBUG: Reboot Card - RC = %d [%s]\n", rc, stateName[korg1212->cardState]);
- if ((err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, korg1212, &ops)) < 0) {
+ if ((err = snd_device_new(card, SNDRV_DEV_CARD, korg1212, &ops)) < 0) {
snd_korg1212_free(korg1212);
return err;
}
@@ -678,7 +678,7 @@ static int lola_create(struct snd_card *card, struct pci_dev *pci,
if (err < 0)
goto errout;
- err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, chip, &ops);
+ err = snd_device_new(card, SNDRV_DEV_CARD, chip, &ops);
if (err < 0) {
snd_printk(KERN_ERR SFX "Error creating device [card]!\n");
goto errout;
@@ -1039,7 +1039,7 @@ static int snd_lx6464es_create(struct snd_card *card,
}
chip->irq = pci->irq;
- err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, chip, &ops);
+ err = snd_device_new(card, SNDRV_DEV_CARD, chip, &ops);
if (err < 0)
goto device_new_failed;
@@ -2664,7 +2664,7 @@ snd_m3_create(struct snd_card *card, struct pci_dev *pci,
snd_printk(KERN_WARNING "can't allocate apm buffer\n");
#endif
- if ((err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, chip, &ops)) < 0) {
+ if ((err = snd_device_new(card, SNDRV_DEV_CARD, chip, &ops)) < 0) {
snd_m3_free(chip);
return err;
}
@@ -1022,7 +1022,7 @@ static int snd_mixart_create(struct mixart_mgr *mgr, struct snd_card *card, int
chip->chip_idx = idx;
chip->mgr = mgr;
- if ((err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, chip, &ops)) < 0) {
+ if ((err = snd_device_new(card, SNDRV_DEV_CARD, chip, &ops)) < 0) {
snd_mixart_chip_free(chip);
return err;
}
@@ -1623,7 +1623,7 @@ snd_nm256_create(struct snd_card *card, struct pci_dev *pci,
// pci_set_master(pci); /* needed? */
- if ((err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, chip, &ops)) < 0)
+ if ((err = snd_device_new(card, SNDRV_DEV_CARD, chip, &ops)) < 0)
goto __error;
*chip_ret = chip;
@@ -1233,7 +1233,7 @@ static int pcxhr_create(struct pcxhr_mgr *mgr,
chip->nb_streams_capt = 1; /* or 1 stereo stream */
}
- if ((err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, chip, &ops)) < 0) {
+ if ((err = snd_device_new(card, SNDRV_DEV_CARD, chip, &ops)) < 0) {
pcxhr_chip_free(chip);
return err;
}
@@ -1911,7 +1911,7 @@ snd_riptide_create(struct snd_card *card, struct pci_dev *pci,
return err;
}
- if ((err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, chip, &ops)) < 0) {
+ if ((err = snd_device_new(card, SNDRV_DEV_CARD, chip, &ops)) < 0) {
snd_riptide_free(chip);
return err;
}
@@ -1400,7 +1400,7 @@ static int sis_chip_create(struct snd_card *card,
voice->num = SIS_CAPTURE_CHAN_AC97_PCM_IN;
voice->ctrl_base = SIS_CAPTURE_DMA_ADDR(sis->ioaddr, voice->num);
- rc = snd_device_new(card, SNDRV_DEV_LOWLEVEL, sis, &ops);
+ rc = snd_device_new(card, SNDRV_DEV_CARD, sis, &ops);
if (rc)
goto error_out_cleanup;
@@ -1385,7 +1385,7 @@ static int snd_sonicvibes_create(struct snd_card *card,
#endif
sonic->revision = snd_sonicvibes_in(sonic, SV_IREG_REVISION);
- if ((err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, sonic, &ops)) < 0) {
+ if ((err = snd_device_new(card, SNDRV_DEV_CARD, sonic, &ops)) < 0) {
snd_sonicvibes_free(sonic);
return err;
}
@@ -3638,7 +3638,7 @@ int snd_trident_create(struct snd_card *card,
return err;
}
- if ((err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, trident, &ops)) < 0) {
+ if ((err = snd_device_new(card, SNDRV_DEV_CARD, trident, &ops)) < 0) {
snd_trident_free(trident);
return err;
}
@@ -2431,7 +2431,7 @@ static int snd_via82xx_create(struct snd_card *card,
return err;
}
- if ((err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, chip, &ops)) < 0) {
+ if ((err = snd_device_new(card, SNDRV_DEV_CARD, chip, &ops)) < 0) {
snd_via82xx_free(chip);
return err;
}
@@ -1151,7 +1151,7 @@ static int snd_via82xx_create(struct snd_card *card,
return err;
}
- if ((err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, chip, &ops)) < 0) {
+ if ((err = snd_device_new(card, SNDRV_DEV_CARD, chip, &ops)) < 0) {
snd_via82xx_free(chip);
return err;
}
@@ -176,7 +176,7 @@ static int snd_vx222_create(struct snd_card *card, struct pci_dev *pci,
}
chip->irq = pci->irq;
- if ((err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, chip, &ops)) < 0) {
+ if ((err = snd_device_new(card, SNDRV_DEV_CARD, chip, &ops)) < 0) {
snd_vx222_free(chip);
return err;
}
@@ -2480,7 +2480,7 @@ int snd_ymfpci_create(struct snd_card *card,
}
#endif
- if ((err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, chip, &ops)) < 0) {
+ if ((err = snd_device_new(card, SNDRV_DEV_CARD, chip, &ops)) < 0) {
snd_ymfpci_free(chip);
return err;
}
... instead of SNDRV_DEV_LOWLEVEL. No functional change at this point. Signed-off-by: Takashi Iwai <tiwai@suse.de> --- sound/pci/ad1889.c | 2 +- sound/pci/ali5451/ali5451.c | 2 +- sound/pci/als300.c | 2 +- sound/pci/atiixp.c | 2 +- sound/pci/atiixp_modem.c | 2 +- sound/pci/au88x0/au88x0.c | 2 +- sound/pci/aw2/aw2-alsa.c | 2 +- sound/pci/azt3328.c | 2 +- sound/pci/bt87x.c | 2 +- sound/pci/ca0106/ca0106_main.c | 2 +- sound/pci/cmipci.c | 2 +- sound/pci/cs4281.c | 2 +- sound/pci/cs46xx/cs46xx_lib.c | 2 +- sound/pci/cs5530.c | 2 +- sound/pci/cs5535audio/cs5535audio.c | 2 +- sound/pci/ctxfi/ctatc.c | 2 +- sound/pci/echoaudio/echoaudio.c | 2 +- sound/pci/emu10k1/emu10k1_main.c | 2 +- sound/pci/emu10k1/emu10k1x.c | 2 +- sound/pci/ens1370.c | 2 +- sound/pci/es1938.c | 2 +- sound/pci/es1968.c | 2 +- sound/pci/fm801.c | 2 +- sound/pci/hda/hda_intel.c | 2 +- sound/pci/ice1712/ice1712.c | 2 +- sound/pci/ice1712/ice1724.c | 2 +- sound/pci/intel8x0.c | 2 +- sound/pci/intel8x0m.c | 2 +- sound/pci/korg1212/korg1212.c | 2 +- sound/pci/lola/lola.c | 2 +- sound/pci/lx6464es/lx6464es.c | 2 +- sound/pci/maestro3.c | 2 +- sound/pci/mixart/mixart.c | 2 +- sound/pci/nm256/nm256.c | 2 +- sound/pci/pcxhr/pcxhr.c | 2 +- sound/pci/riptide/riptide.c | 2 +- sound/pci/sis7019.c | 2 +- sound/pci/sonicvibes.c | 2 +- sound/pci/trident/trident_main.c | 2 +- sound/pci/via82xx.c | 2 +- sound/pci/via82xx_modem.c | 2 +- sound/pci/vx222/vx222.c | 2 +- sound/pci/ymfpci/ymfpci_main.c | 2 +- 43 files changed, 43 insertions(+), 43 deletions(-)