Commit c392ed46 authored by Hugo Lefeuvre's avatar Hugo Lefeuvre Committed by Greg Kroah-Hartman

tty/nozomi: use pci_iomap instead of ioremap_nocache

Use pci_iomap instead of ioremap_nocache in nozomi_card_init(). This
is a cleaner way to do PCI MMIO (performs additional checks) and
allows to drop the manual call to pci_resource_start.

pci_iomap relies on ioremap for MMIO and thus has uncached behavior.
Signed-off-by: default avatarHugo Lefeuvre <hle@owl.eu.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 1355cba9
...@@ -1317,7 +1317,6 @@ static void remove_sysfs_files(struct nozomi *dc) ...@@ -1317,7 +1317,6 @@ static void remove_sysfs_files(struct nozomi *dc)
static int nozomi_card_init(struct pci_dev *pdev, static int nozomi_card_init(struct pci_dev *pdev,
const struct pci_device_id *ent) const struct pci_device_id *ent)
{ {
resource_size_t start;
int ret; int ret;
struct nozomi *dc = NULL; struct nozomi *dc = NULL;
int ndev_idx; int ndev_idx;
...@@ -1357,17 +1356,10 @@ static int nozomi_card_init(struct pci_dev *pdev, ...@@ -1357,17 +1356,10 @@ static int nozomi_card_init(struct pci_dev *pdev,
goto err_disable_device; goto err_disable_device;
} }
start = pci_resource_start(dc->pdev, 0);
if (start == 0) {
dev_err(&pdev->dev, "No I/O address for card detected\n");
ret = -ENODEV;
goto err_rel_regs;
}
/* Find out what card type it is */ /* Find out what card type it is */
nozomi_get_card_type(dc); nozomi_get_card_type(dc);
dc->base_addr = ioremap_nocache(start, dc->card_type); dc->base_addr = pci_iomap(dc->pdev, 0, dc->card_type);
if (!dc->base_addr) { if (!dc->base_addr) {
dev_err(&pdev->dev, "Unable to map card MMIO\n"); dev_err(&pdev->dev, "Unable to map card MMIO\n");
ret = -ENODEV; ret = -ENODEV;
......
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