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

Commit 24ed3aba authored by Arjan van de Ven's avatar Arjan van de Ven Committed by Linus Torvalds
Browse files

pci: use pci_ioremap_bar() in drivers/serial 



Use the newly introduced pci_ioremap_bar() function in drivers/serial.
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 avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarAlan Cox <alan@linux.intel.com>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent ce89294c

drivers/serial/8250_pci.c

+2 −4
Original line number Diff line number Diff line
@@ -398,8 +398,7 @@ static int sbs_init(struct pci_dev *dev) 
{

	u8 __iomem *p;



	p = ioremap_nocache(pci_resource_start(dev, 0),

						pci_resource_len(dev, 0));

	p = pci_ioremap_bar(dev, 0);



	if (p == NULL)

		return -ENOMEM;
@@ -423,8 +422,7 @@ static void __devexit sbs_exit(struct pci_dev *dev) 
{

	u8 __iomem *p;



	p = ioremap_nocache(pci_resource_start(dev, 0),

					pci_resource_len(dev, 0));

	p = pci_ioremap_bar(dev, 0);

	/* FIXME: What if resource_len < OCT_REG_CR_OFF */

	if (p != NULL)

		writeb(0, p + OCT_REG_CR_OFF);

drivers/serial/icom.c

+1 −2
Original line number Diff line number Diff line
@@ -1548,8 +1548,7 @@ static int __devinit icom_probe(struct pci_dev *dev, 
		goto probe_exit1;

	}



	 icom_adapter->base_addr = ioremap(icom_adapter->base_addr_pci,

						pci_resource_len(dev, 0));

	 icom_adapter->base_addr = pci_ioremap_bar(dev, 0);



	if (!icom_adapter->base_addr)

		goto probe_exit1;