From e989703071246a9d4e6d75e8de34b746b707ecde Mon Sep 17 00:00:00 2001 From: Patrik Jakobsson Date: Thu, 30 Apr 2020 10:26:09 +0200 Subject: [PATCH] Replace ioremap_nocache() with ioremap() ioremap_nocache() got removed from upstream because ioremap() always gave "nocache". Use ioremap() instead. Fixes: 4bdc0d676a643140bdf17dbf7eafedee3d496a3c remove ioremap_nocache and devm_ioremap_nocache Signed-off-by: Patrik Jakobsson --- fthd_drv.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/fthd_drv.c b/fthd_drv.c index 2255d30..b266f7f 100644 --- a/fthd_drv.c +++ b/fthd_drv.c @@ -70,19 +70,19 @@ static int fthd_pci_reserve_mem(struct fthd_private *dev_priv) /* S2 IO */ start = pci_resource_start(dev_priv->pdev, FTHD_PCI_S2_IO); len = pci_resource_len(dev_priv->pdev, FTHD_PCI_S2_IO); - dev_priv->s2_io = ioremap_nocache(start, len); + dev_priv->s2_io = ioremap(start, len); dev_priv->s2_io_len = len; /* S2 MEM */ start = pci_resource_start(dev_priv->pdev, FTHD_PCI_S2_MEM); len = pci_resource_len(dev_priv->pdev, FTHD_PCI_S2_MEM); - dev_priv->s2_mem = ioremap_nocache(start, len); + dev_priv->s2_mem = ioremap(start, len); dev_priv->s2_mem_len = len; /* ISP IO */ start = pci_resource_start(dev_priv->pdev, FTHD_PCI_ISP_IO); len = pci_resource_len(dev_priv->pdev, FTHD_PCI_ISP_IO); - dev_priv->isp_io = ioremap_nocache(start, len); + dev_priv->isp_io = ioremap(start, len); dev_priv->isp_io_len = len; pr_debug("Allocated S2 regs (BAR %d). %u bytes at 0x%p\n",