Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2e32725c authored by Muli Ben-Yehuda's avatar Muli Ben-Yehuda Committed by Linus Torvalds
Browse files

OSS trident: replace deprecated pci_find_device with pci_get_device 



Signed-off-by: default avatarMuli Ben-Yehuda <muli@il.ibm.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 3b20b9b4

sound/oss/trident.c

+5 −3
Original line number Original line Diff line number Diff line
@@ -4454,7 +4454,7 @@ trident_probe(struct pci_dev *pci_dev, const struct pci_device_id *pci_id) 




		/* Add H/W Volume Control By Matt Wu Jul. 06, 2001 */

		/* Add H/W Volume Control By Matt Wu Jul. 06, 2001 */

		card->hwvolctl = 0;

		card->hwvolctl = 0;

		pci_dev_m1533 = pci_find_device(PCI_VENDOR_ID_AL,

		pci_dev_m1533 = pci_get_device(PCI_VENDOR_ID_AL,

					       PCI_DEVICE_ID_AL_M1533,

					       PCI_DEVICE_ID_AL_M1533,

					       pci_dev_m1533);

					       pci_dev_m1533);

		rc = -ENODEV;

		rc = -ENODEV;
@@ -4470,6 +4470,8 @@ trident_probe(struct pci_dev *pci_dev, const struct pci_device_id *pci_id) 
			bits &= 0xbf;	/*clear bit 6 */

			bits &= 0xbf;	/*clear bit 6 */

			pci_write_config_byte(pci_dev_m1533, 0x7b, bits);

			pci_write_config_byte(pci_dev_m1533, 0x7b, bits);

		}

		}

		pci_dev_put(pci_dev_m1533);



	} else if (card->pci_id == PCI_DEVICE_ID_INTERG_5050) {

	} else if (card->pci_id == PCI_DEVICE_ID_INTERG_5050) {

		card->alloc_pcm_channel = cyber_alloc_pcm_channel;

		card->alloc_pcm_channel = cyber_alloc_pcm_channel;

		card->alloc_rec_pcm_channel = cyber_alloc_pcm_channel;

		card->alloc_rec_pcm_channel = cyber_alloc_pcm_channel;