diff options
Diffstat (limited to 'drivers/serial')
-rw-r--r-- | drivers/serial/8250_pci.c | 6 | ||||
-rw-r--r-- | drivers/serial/icom.c | 3 |
2 files changed, 3 insertions, 6 deletions
diff --git a/drivers/serial/8250_pci.c b/drivers/serial/8250_pci.c index e371a9c15341..a07015d646dd 100644 --- a/drivers/serial/8250_pci.c +++ b/drivers/serial/8250_pci.c | |||
@@ -398,8 +398,7 @@ static int sbs_init(struct pci_dev *dev) | |||
398 | { | 398 | { |
399 | u8 __iomem *p; | 399 | u8 __iomem *p; |
400 | 400 | ||
401 | p = ioremap_nocache(pci_resource_start(dev, 0), | 401 | p = pci_ioremap_bar(dev, 0); |
402 | pci_resource_len(dev, 0)); | ||
403 | 402 | ||
404 | if (p == NULL) | 403 | if (p == NULL) |
405 | return -ENOMEM; | 404 | return -ENOMEM; |
@@ -423,8 +422,7 @@ static void __devexit sbs_exit(struct pci_dev *dev) | |||
423 | { | 422 | { |
424 | u8 __iomem *p; | 423 | u8 __iomem *p; |
425 | 424 | ||
426 | p = ioremap_nocache(pci_resource_start(dev, 0), | 425 | p = pci_ioremap_bar(dev, 0); |
427 | pci_resource_len(dev, 0)); | ||
428 | /* FIXME: What if resource_len < OCT_REG_CR_OFF */ | 426 | /* FIXME: What if resource_len < OCT_REG_CR_OFF */ |
429 | if (p != NULL) | 427 | if (p != NULL) |
430 | writeb(0, p + OCT_REG_CR_OFF); | 428 | writeb(0, p + OCT_REG_CR_OFF); |
diff --git a/drivers/serial/icom.c b/drivers/serial/icom.c index 9f2891c2c4a2..cd1b6a45bb82 100644 --- a/drivers/serial/icom.c +++ b/drivers/serial/icom.c | |||
@@ -1548,8 +1548,7 @@ static int __devinit icom_probe(struct pci_dev *dev, | |||
1548 | goto probe_exit1; | 1548 | goto probe_exit1; |
1549 | } | 1549 | } |
1550 | 1550 | ||
1551 | icom_adapter->base_addr = ioremap(icom_adapter->base_addr_pci, | 1551 | icom_adapter->base_addr = pci_ioremap_bar(dev, 0); |
1552 | pci_resource_len(dev, 0)); | ||
1553 | 1552 | ||
1554 | if (!icom_adapter->base_addr) | 1553 | if (!icom_adapter->base_addr) |
1555 | goto probe_exit1; | 1554 | goto probe_exit1; |