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

Commit 2f5ad54e authored by Arjan van de Ven's avatar Arjan van de Ven Committed by Takashi Iwai
Browse files

pci: use pci_ioremap_bar() in sound/ 



Use the newly introduced pci_ioremap_bar() function in sound/.
pci_ioremap_bar() just takes a pci device and a bar number, with the goal
of making it really hard to get wrong, while also having a central place
to stick sanity checks.

Signed-off-by: default avatarArjan van de Ven <arjan@linux.intel.com>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 2515ddc6

sound/pci/ad1889.c

+1 −1
Original line number Diff line number Diff line
@@ -932,7 +932,7 @@ snd_ad1889_create(struct snd_card *card, 
		goto free_and_ret;



	chip->bar = pci_resource_start(pci, 0);

	chip->iobase = ioremap_nocache(chip->bar, pci_resource_len(pci, 0));

	chip->iobase = pci_ioremap_bar(pci, 0);

	if (chip->iobase == NULL) {

		printk(KERN_ERR PFX "unable to reserve region.\n");

		err = -EBUSY;

sound/pci/atiixp.c

+1 −1
Original line number Diff line number Diff line
@@ -1609,7 +1609,7 @@ static int __devinit snd_atiixp_create(struct snd_card *card, 
		return err;

	}

	chip->addr = pci_resource_start(pci, 0);

	chip->remap_addr = ioremap_nocache(chip->addr, pci_resource_len(pci, 0));

	chip->remap_addr = pci_ioremap_bar(pci, 0);

	if (chip->remap_addr == NULL) {

		snd_printk(KERN_ERR "AC'97 space ioremap problem\n");

		snd_atiixp_free(chip);

sound/pci/atiixp_modem.c

+1 −1
Original line number Diff line number Diff line
@@ -1252,7 +1252,7 @@ static int __devinit snd_atiixp_create(struct snd_card *card, 
		return err;

	}

	chip->addr = pci_resource_start(pci, 0);

	chip->remap_addr = ioremap_nocache(chip->addr, pci_resource_len(pci, 0));

	chip->remap_addr = pci_ioremap_bar(pci, 0);

	if (chip->remap_addr == NULL) {

		snd_printk(KERN_ERR "AC'97 space ioremap problem\n");

		snd_atiixp_free(chip);

sound/pci/au88x0/au88x0.c

+1 −2
Original line number Diff line number Diff line
@@ -180,8 +180,7 @@ snd_vortex_create(struct snd_card *card, struct pci_dev *pci, vortex_t ** rchip) 
	if ((err = pci_request_regions(pci, CARD_NAME_SHORT)) != 0)

		goto regions_out;



	chip->mmio = ioremap_nocache(pci_resource_start(pci, 0),

	                             pci_resource_len(pci, 0));

	chip->mmio = pci_ioremap_bar(pci, 0);

	if (!chip->mmio) {

		printk(KERN_ERR "MMIO area remap failed.\n");

		err = -ENOMEM;

sound/pci/bt87x.c

+1 −2
Original line number Diff line number Diff line
@@ -749,8 +749,7 @@ static int __devinit snd_bt87x_create(struct snd_card *card, 
		pci_disable_device(pci);

		return err;

	}

	chip->mmio = ioremap_nocache(pci_resource_start(pci, 0),

				     pci_resource_len(pci, 0));

	chip->mmio = pci_ioremap_bar(pci, 0);

	if (!chip->mmio) {

		snd_printk(KERN_ERR "cannot remap io memory\n");

		err = -ENOMEM;