Commit bdbeed75 authored by Arjan van de Ven's avatar Arjan van de Ven Committed by Linus Torvalds

pci: use pci_ioremap_bar() in drivers/misc

Use the newly introduced pci_ioremap_bar() function in drivers/misc.
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 avatarLinus Torvalds <torvalds@linux-foundation.org>
parent ea435467
...@@ -104,8 +104,7 @@ static int __devinit ibmasm_init_one(struct pci_dev *pdev, const struct pci_devi ...@@ -104,8 +104,7 @@ static int __devinit ibmasm_init_one(struct pci_dev *pdev, const struct pci_devi
} }
sp->irq = pdev->irq; sp->irq = pdev->irq;
sp->base_address = ioremap(pci_resource_start(pdev, 0), sp->base_address = pci_ioremap_bar(pdev, 0);
pci_resource_len(pdev, 0));
if (!sp->base_address) { if (!sp->base_address) {
dev_err(sp->dev, "Failed to ioremap pci memory\n"); dev_err(sp->dev, "Failed to ioremap pci memory\n");
result = -ENODEV; result = -ENODEV;
......
...@@ -354,8 +354,7 @@ static int tifm_7xx1_probe(struct pci_dev *dev, ...@@ -354,8 +354,7 @@ static int tifm_7xx1_probe(struct pci_dev *dev,
fm->has_ms_pif = tifm_7xx1_has_ms_pif; fm->has_ms_pif = tifm_7xx1_has_ms_pif;
pci_set_drvdata(dev, fm); pci_set_drvdata(dev, fm);
fm->addr = ioremap(pci_resource_start(dev, 0), fm->addr = pci_ioremap_bar(dev, 0);
pci_resource_len(dev, 0));
if (!fm->addr) if (!fm->addr)
goto err_out_free; goto err_out_free;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment