| Message ID | 20150725023945.8664.34842.stgit@dwillia2-desk3.amr.corp.intel.com (mailing list archive) |
|---|---|
| State | Superseded |
| Delegated to: | Dan Williams |
| Headers | show |
+ linux-mtd On Fri, Jul 24, 2015 at 10:39:45PM -0400, Dan Williams wrote: > In preparation for deprecating ioremap_cache() convert its usage in > pxa2xx-flash to memremap. > > Cc: David Woodhouse <dwmw2@infradead.org> > Cc: Brian Norris <computersforpeace@gmail.com> > Signed-off-by: Dan Williams <dan.j.williams@intel.com> > --- > drivers/mtd/maps/pxa2xx-flash.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/mtd/maps/pxa2xx-flash.c b/drivers/mtd/maps/pxa2xx-flash.c > index 12fa75df5008..758a8a7f86d9 100644 > --- a/drivers/mtd/maps/pxa2xx-flash.c > +++ b/drivers/mtd/maps/pxa2xx-flash.c > @@ -71,8 +71,8 @@ static int pxa2xx_flash_probe(struct platform_device *pdev) > info->map.name); > return -ENOMEM; > } > - info->map.cached = > - ioremap_cache(info->map.phys, info->map.size); > + info->map.cached = memremap(info->map.phys, info->map.size, > + MEMREMAP_CACHE); Should the corresponding iounmap() be changed too? Looks like a pretty thin wrapper right now, but it seems like the API would suggest we do this anyway. > if (!info->map.cached) > printk(KERN_WARNING "Failed to ioremap cached %s\n", > info->map.name); > Brian
On Fri, Oct 2, 2015 at 10:51 AM, Brian Norris <computersforpeace@gmail.com> wrote: > + linux-mtd > > On Fri, Jul 24, 2015 at 10:39:45PM -0400, Dan Williams wrote: >> In preparation for deprecating ioremap_cache() convert its usage in >> pxa2xx-flash to memremap. >> >> Cc: David Woodhouse <dwmw2@infradead.org> >> Cc: Brian Norris <computersforpeace@gmail.com> >> Signed-off-by: Dan Williams <dan.j.williams@intel.com> >> --- >> drivers/mtd/maps/pxa2xx-flash.c | 4 ++-- >> 1 file changed, 2 insertions(+), 2 deletions(-) >> >> diff --git a/drivers/mtd/maps/pxa2xx-flash.c b/drivers/mtd/maps/pxa2xx-flash.c >> index 12fa75df5008..758a8a7f86d9 100644 >> --- a/drivers/mtd/maps/pxa2xx-flash.c >> +++ b/drivers/mtd/maps/pxa2xx-flash.c >> @@ -71,8 +71,8 @@ static int pxa2xx_flash_probe(struct platform_device *pdev) >> info->map.name); >> return -ENOMEM; >> } >> - info->map.cached = >> - ioremap_cache(info->map.phys, info->map.size); >> + info->map.cached = memremap(info->map.phys, info->map.size, >> + MEMREMAP_CACHE); > > Should the corresponding iounmap() be changed too? Looks like a pretty > thin wrapper right now, but it seems like the API would suggest we do > this anyway. > Yes, thanks for that catch, addressed in the next rev.
diff --git a/drivers/mtd/maps/pxa2xx-flash.c b/drivers/mtd/maps/pxa2xx-flash.c index 12fa75df5008..758a8a7f86d9 100644 --- a/drivers/mtd/maps/pxa2xx-flash.c +++ b/drivers/mtd/maps/pxa2xx-flash.c @@ -71,8 +71,8 @@ static int pxa2xx_flash_probe(struct platform_device *pdev) info->map.name); return -ENOMEM; } - info->map.cached = - ioremap_cache(info->map.phys, info->map.size); + info->map.cached = memremap(info->map.phys, info->map.size, + MEMREMAP_CACHE); if (!info->map.cached) printk(KERN_WARNING "Failed to ioremap cached %s\n", info->map.name);
In preparation for deprecating ioremap_cache() convert its usage in pxa2xx-flash to memremap. Cc: David Woodhouse <dwmw2@infradead.org> Cc: Brian Norris <computersforpeace@gmail.com> Signed-off-by: Dan Williams <dan.j.williams@intel.com> --- drivers/mtd/maps/pxa2xx-flash.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)