Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

pci: use pci_ioremap_bar() in drivers/serial

Browse source 
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: Arjan van de Ven <arjan@linux.intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Arjan van de Ven 2009-06-24 18:34:58 +01:00 committed by Linus Torvalds
parent ce89294c05
commit 24ed3abaa1
2 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
drivers/serial/8250_pci.c
View file

@ -398,8 +398,7 @@ static int sbs_init(struct pci_dev *dev)
{ {
u8 __iomem *p; u8 __iomem *p;
p = ioremap_nocache(pci_resource_start(dev, 0), p = pci_ioremap_bar(dev, 0);
pci_resource_len(dev, 0));
if (p == NULL) if (p == NULL)
return -ENOMEM; return -ENOMEM;
@ -423,8 +422,7 @@ static void __devexit sbs_exit(struct pci_dev *dev)
{ {
u8 __iomem *p; u8 __iomem *p;
p = ioremap_nocache(pci_resource_start(dev, 0), p = pci_ioremap_bar(dev, 0);
pci_resource_len(dev, 0));
/* FIXME: What if resource_len < OCT_REG_CR_OFF */ /* FIXME: What if resource_len < OCT_REG_CR_OFF */
if (p != NULL) if (p != NULL)
writeb(0, p + OCT_REG_CR_OFF); writeb(0, p + OCT_REG_CR_OFF);

3
drivers/serial/icom.c
View file

@ -1548,8 +1548,7 @@ static int __devinit icom_probe(struct pci_dev *dev,
goto probe_exit1; goto probe_exit1;
} }
icom_adapter->base_addr = ioremap(icom_adapter->base_addr_pci, icom_adapter->base_addr = pci_ioremap_bar(dev, 0);
pci_resource_len(dev, 0));
if (!icom_adapter->base_addr) if (!icom_adapter->base_addr)
goto probe_exit1; goto probe_exit1;