pci: use pci_ioremap_bar() in drivers/serial
PATCH 1/3 pci: use pci_ioremap_bar() in drivers/serial
From: Arjan van de Ven <[email protected]>
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 <[email protected]>
Acked-by Alan Cox <[email protected]>
Signed-off-by Andrew Morton <[email protected]>
---
drivers/serial/8250_pci.c | 6 ++---- drivers/serial/icom.c | 3 +-- 2 files changed, 3 insertions(+), 6 deletions(-)
drivers/serial/8250_pci.c renamed from drivers/serial/8250_pci.c~pci-use-pci_ioremap_bar-in-drivers-serial +2 -4
@@ -341,8 +341,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 ;
@@ -366,8 +365,7 @@ static void __devexit sbs_exit(struct pc {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 renamed from drivers/serial/icom.c~pci-use-pci_ioremap_bar-in-drivers-serial +1 -2
@@ -1553,8 +1553,7 @@ static int __devinit icom_probe(struct p 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;
_