Commit 71ecb262 authored by Hanna V. Linder's avatar Hanna V. Linder Committed by Greg Kroah-Hartman

[PATCH] cmipci.c: convert pci_find_device to pci_get_device

As pci_find_device is going away I've replaced it with pci_get_device.
Signed-off-by: default avatarHanna Linder <hannal@us.ibm.com>
Signed-off-by: default avatarGreg Kroah-Hartman <greg@kroah.com>
parent 9acc8a77
...@@ -2572,6 +2572,10 @@ static int __devinit snd_cmipci_create(snd_card_t *card, struct pci_dev *pci, ...@@ -2572,6 +2572,10 @@ static int __devinit snd_cmipci_create(snd_card_t *card, struct pci_dev *pci,
long iomidi = mpu_port[dev]; long iomidi = mpu_port[dev];
long iosynth = fm_port[dev]; long iosynth = fm_port[dev];
int pcm_index, pcm_spdif_index; int pcm_index, pcm_spdif_index;
static struct pci_device_id intel_82437vx[] = {
{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82437VX) },
{ },
};
*rcmipci = NULL; *rcmipci = NULL;
...@@ -2647,8 +2651,7 @@ static int __devinit snd_cmipci_create(snd_card_t *card, struct pci_dev *pci, ...@@ -2647,8 +2651,7 @@ static int __devinit snd_cmipci_create(snd_card_t *card, struct pci_dev *pci,
switch (pci->device) { switch (pci->device) {
case PCI_DEVICE_ID_CMEDIA_CM8738: case PCI_DEVICE_ID_CMEDIA_CM8738:
case PCI_DEVICE_ID_CMEDIA_CM8738B: case PCI_DEVICE_ID_CMEDIA_CM8738B:
/* PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82437VX */ if (!pci_dev_present(intel_82437vx))
if (! pci_find_device(0x8086, 0x7030, NULL))
snd_cmipci_set_bit(cm, CM_REG_MISC_CTRL, CM_TXVX); snd_cmipci_set_bit(cm, CM_REG_MISC_CTRL, CM_TXVX);
break; break;
default: default:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment