From c392ed4642050577847cbd7247d0140022b9b703 Mon Sep 17 00:00:00 2001 From: Hugo Lefeuvre Date: Sun, 10 Feb 2019 18:12:12 +0100 Subject: 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: Hugo Lefeuvre Signed-off-by: Greg Kroah-Hartman --- drivers/tty/nozomi.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) (limited to 'drivers') diff --git a/drivers/tty/nozomi.c b/drivers/tty/nozomi.c index fed820e9ab9d..3214e22e79f3 100644 --- a/drivers/tty/nozomi.c +++ b/drivers/tty/nozomi.c @@ -1317,7 +1317,6 @@ static void remove_sysfs_files(struct nozomi *dc) static int nozomi_card_init(struct pci_dev *pdev, const struct pci_device_id *ent) { - resource_size_t start; int ret; struct nozomi *dc = NULL; int ndev_idx; @@ -1357,17 +1356,10 @@ static int nozomi_card_init(struct pci_dev *pdev, 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 */ 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) { dev_err(&pdev->dev, "Unable to map card MMIO\n"); ret = -ENODEV; -- cgit v1.2.3