summaryrefslogtreecommitdiffstats
path: root/sound/pci/oxygen
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2014-01-29 08:20:19 -0500
committerTakashi Iwai <tiwai@suse.de>2014-02-12 05:17:52 -0500
commit60c5772b50fe8ce947685cfe3a80b9bf6ea92831 (patch)
treead2d8a112bd708ff58f96ccb2ec7b15d88676379 /sound/pci/oxygen
parent4323cc4d5b25b5138c0791e3c7d3b09bd7062b49 (diff)
ALSA: pci: Convert to snd_card_new() with a device pointer
Also remove superfluous snd_card_set_dev() calls. Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/oxygen')
-rw-r--r--sound/pci/oxygen/oxygen_lib.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/pci/oxygen/oxygen_lib.c b/sound/pci/oxygen/oxygen_lib.c
index b0cb48adddc7..efa610cd735c 100644
--- a/sound/pci/oxygen/oxygen_lib.c
+++ b/sound/pci/oxygen/oxygen_lib.c
@@ -595,7 +595,8 @@ int oxygen_pci_probe(struct pci_dev *pci, int index, char *id,
595 const struct pci_device_id *pci_id; 595 const struct pci_device_id *pci_id;
596 int err; 596 int err;
597 597
598 err = snd_card_create(index, id, owner, sizeof(*chip), &card); 598 err = snd_card_new(&pci->dev, index, id, owner,
599 sizeof(*chip), &card);
599 if (err < 0) 600 if (err < 0)
600 return err; 601 return err;
601 602
@@ -648,7 +649,6 @@ int oxygen_pci_probe(struct pci_dev *pci, int index, char *id,
648 } 649 }
649 650
650 pci_set_master(pci); 651 pci_set_master(pci);
651 snd_card_set_dev(card, &pci->dev);
652 card->private_free = oxygen_card_free; 652 card->private_free = oxygen_card_free;
653 653
654 configure_pcie_bridge(pci); 654 configure_pcie_bridge(pci);