diff options
author | Takashi Iwai <tiwai@suse.de> | 2014-02-25 12:00:26 -0500 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2014-02-26 10:45:30 -0500 |
commit | 03d3ac21780be4d78f8d7679e428bb98fa9411ea (patch) | |
tree | 8632f5b2c249cad9369fee85496fbbc45420d892 /sound/pci/oxygen/oxygen_lib.c | |
parent | a3fe03f412daf40ab39ba0fbd3f78bf1f0d62856 (diff) |
ALSA: oxygen: Use standard printk helpers
Convert with dev_err() and co from snd_printk(), etc.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/oxygen/oxygen_lib.c')
-rw-r--r-- | sound/pci/oxygen/oxygen_lib.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sound/pci/oxygen/oxygen_lib.c b/sound/pci/oxygen/oxygen_lib.c index efa610cd735c..b67e30602473 100644 --- a/sound/pci/oxygen/oxygen_lib.c +++ b/sound/pci/oxygen/oxygen_lib.c | |||
@@ -313,7 +313,7 @@ static void oxygen_restore_eeprom(struct oxygen *chip, | |||
313 | oxygen_clear_bits8(chip, OXYGEN_MISC, | 313 | oxygen_clear_bits8(chip, OXYGEN_MISC, |
314 | OXYGEN_MISC_WRITE_PCI_SUBID); | 314 | OXYGEN_MISC_WRITE_PCI_SUBID); |
315 | 315 | ||
316 | snd_printk(KERN_INFO "EEPROM ID restored\n"); | 316 | dev_info(chip->card->dev, "EEPROM ID restored\n"); |
317 | } | 317 | } |
318 | } | 318 | } |
319 | 319 | ||
@@ -617,13 +617,13 @@ int oxygen_pci_probe(struct pci_dev *pci, int index, char *id, | |||
617 | 617 | ||
618 | err = pci_request_regions(pci, DRIVER); | 618 | err = pci_request_regions(pci, DRIVER); |
619 | if (err < 0) { | 619 | if (err < 0) { |
620 | snd_printk(KERN_ERR "cannot reserve PCI resources\n"); | 620 | dev_err(card->dev, "cannot reserve PCI resources\n"); |
621 | goto err_pci_enable; | 621 | goto err_pci_enable; |
622 | } | 622 | } |
623 | 623 | ||
624 | if (!(pci_resource_flags(pci, 0) & IORESOURCE_IO) || | 624 | if (!(pci_resource_flags(pci, 0) & IORESOURCE_IO) || |
625 | pci_resource_len(pci, 0) < OXYGEN_IO_SIZE) { | 625 | pci_resource_len(pci, 0) < OXYGEN_IO_SIZE) { |
626 | snd_printk(KERN_ERR "invalid PCI I/O range\n"); | 626 | dev_err(card->dev, "invalid PCI I/O range\n"); |
627 | err = -ENXIO; | 627 | err = -ENXIO; |
628 | goto err_pci_regions; | 628 | goto err_pci_regions; |
629 | } | 629 | } |
@@ -658,7 +658,7 @@ int oxygen_pci_probe(struct pci_dev *pci, int index, char *id, | |||
658 | err = request_irq(pci->irq, oxygen_interrupt, IRQF_SHARED, | 658 | err = request_irq(pci->irq, oxygen_interrupt, IRQF_SHARED, |
659 | KBUILD_MODNAME, chip); | 659 | KBUILD_MODNAME, chip); |
660 | if (err < 0) { | 660 | if (err < 0) { |
661 | snd_printk(KERN_ERR "cannot grab interrupt %d\n", pci->irq); | 661 | dev_err(card->dev, "cannot grab interrupt %d\n", pci->irq); |
662 | goto err_card; | 662 | goto err_card; |
663 | } | 663 | } |
664 | chip->irq = pci->irq; | 664 | chip->irq = pci->irq; |
@@ -796,7 +796,7 @@ static int oxygen_pci_resume(struct device *dev) | |||
796 | pci_set_power_state(pci, PCI_D0); | 796 | pci_set_power_state(pci, PCI_D0); |
797 | pci_restore_state(pci); | 797 | pci_restore_state(pci); |
798 | if (pci_enable_device(pci) < 0) { | 798 | if (pci_enable_device(pci) < 0) { |
799 | snd_printk(KERN_ERR "cannot reenable device"); | 799 | dev_err(dev, "cannot reenable device"); |
800 | snd_card_disconnect(card); | 800 | snd_card_disconnect(card); |
801 | return -EIO; | 801 | return -EIO; |
802 | } | 802 | } |