>From 6c747c3592b0bc97ecb3864c9686029d191172cf Mon Sep 17 00:00:00 2001
From: Arjan van de Ven <arjan@xxxxxxxxxxxxxxx>
Date: Sun, 28 Sep 2008 16:17:38 -0700
Subject: [PATCH] pci: use pci_ioremap_bar() in drivers/pci/hotplug
Use the newly introduced pci_ioremap_bar() function in drivers/pci/hotplug.
Signed-off-by: Arjan van de Ven <arjan@xxxxxxxxxxxxxxx>
---
drivers/pci/hotplug/cpcihp_zt5550.c | 3 +--
drivers/pci/hotplug/cpqphp_core.c | 3 +--
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/drivers/pci/hotplug/cpcihp_zt5550.c b/drivers/pci/hotplug/cpcihp_zt5550.c
index 41f6a8d..0c3393c 100644
--- a/drivers/pci/hotplug/cpcihp_zt5550.c
+++ b/drivers/pci/hotplug/cpcihp_zt5550.c
@@ -105,8 +105,7 @@ static int zt5550_hc_config(struct pci_dev *pdev)
goto exit_disable_device;
}
- hc_registers =
- ioremap(pci_resource_start(hc_dev, 1), pci_resource_len(hc_dev, 1));
+ hc_registers = pci_ioremap_bar(hc_dev, 1);
if(!hc_registers) {
err("cannot remap MMIO region %llx @ %llx",
(unsigned long long)pci_resource_len(hc_dev, 1),
diff --git a/drivers/pci/hotplug/cpqphp_core.c b/drivers/pci/hotplug/cpqphp_core.c
index 54defec..5313623 100644
--- a/drivers/pci/hotplug/cpqphp_core.c
+++ b/drivers/pci/hotplug/cpqphp_core.c
@@ -1102,8 +1102,7 @@ static int cpqhpc_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
goto err_free_bus;
}
- ctrl->hpc_reg = ioremap(pci_resource_start(pdev, 0),
- pci_resource_len(pdev, 0));
+ ctrl->hpc_reg = pci_ioremap_bar(pdev, 0);
if (!ctrl->hpc_reg) {
err("cannot remap MMIO region %llx @ %llx\n",
(unsigned long long)pci_resource_len(pdev, 0),
--
1.5.5.1
--
Arjan van de Ven Intel Open Source Technology Centre
For development, discussion and tips for power savings,
visit http://www.lesswatts.org
--
To unsubscribe from this list: send the line "unsubscribe linux-pci" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
