diff mbox

[14/20] pxa2xx-flash: switch from ioremap_cache to memremap

Message ID 20151009221651.32203.63446.stgit@dwillia2-desk3.jf.intel.com (mailing list archive)
State New, archived
Headers show

Commit Message

Dan Williams Oct. 9, 2015, 10:16 p.m. UTC
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>
[brian: also convert iounmap to memunmap]
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
---
 drivers/mtd/maps/pxa2xx-flash.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Comments

Brian Norris Oct. 12, 2015, 5:58 p.m. UTC | #1
You missed linux-mtd again. Please use scripts/get_maintainer.pl next
time to at least get the relevant mailing list(s). (The individual CC's
are not always necessary, but the subsystem lists definitely are.)

Brian

On Fri, Oct 09, 2015 at 06:16:51PM -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>
> [brian: also convert iounmap to memunmap]
> Signed-off-by: Dan Williams <dan.j.williams@intel.com>
> ---
>  drivers/mtd/maps/pxa2xx-flash.c |    6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/mtd/maps/pxa2xx-flash.c b/drivers/mtd/maps/pxa2xx-flash.c
> index 12fa75df5008..5ff6cc5b4844 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_WB);
>  	if (!info->map.cached)
>  		printk(KERN_WARNING "Failed to ioremap cached %s\n",
>  		       info->map.name);
> @@ -111,7 +111,7 @@ static int pxa2xx_flash_remove(struct platform_device *dev)
>  	map_destroy(info->mtd);
>  	iounmap(info->map.virt);
>  	if (info->map.cached)
> -		iounmap(info->map.cached);
> +		memunmap(info->map.cached);
>  	kfree(info);
>  	return 0;
>  }
>
Brian Norris Oct. 12, 2015, 8:31 p.m. UTC | #2
On Mon, Oct 12, 2015 at 10:58:03AM -0700, Brian Norris wrote:
> You missed linux-mtd again. Please use scripts/get_maintainer.pl next
> time to at least get the relevant mailing list(s). (The individual CC's
> are not always necessary, but the subsystem lists definitely are.)

Anyway, pushed to l2-mtd.git.

Brian

> On Fri, Oct 09, 2015 at 06:16:51PM -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>
> > [brian: also convert iounmap to memunmap]
> > Signed-off-by: Dan Williams <dan.j.williams@intel.com>
> > ---
> >  drivers/mtd/maps/pxa2xx-flash.c |    6 +++---
> >  1 file changed, 3 insertions(+), 3 deletions(-)
> > 
> > diff --git a/drivers/mtd/maps/pxa2xx-flash.c b/drivers/mtd/maps/pxa2xx-flash.c
> > index 12fa75df5008..5ff6cc5b4844 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_WB);
> >  	if (!info->map.cached)
> >  		printk(KERN_WARNING "Failed to ioremap cached %s\n",
> >  		       info->map.name);
> > @@ -111,7 +111,7 @@ static int pxa2xx_flash_remove(struct platform_device *dev)
> >  	map_destroy(info->mtd);
> >  	iounmap(info->map.virt);
> >  	if (info->map.cached)
> > -		iounmap(info->map.cached);
> > +		memunmap(info->map.cached);
> >  	kfree(info);
> >  	return 0;
> >  }
> >
Dan Williams Oct. 12, 2015, 8:36 p.m. UTC | #3
On Mon, Oct 12, 2015 at 1:31 PM, Brian Norris
<computersforpeace@gmail.com> wrote:
> On Mon, Oct 12, 2015 at 10:58:03AM -0700, Brian Norris wrote:
>> You missed linux-mtd again. Please use scripts/get_maintainer.pl next
>> time to at least get the relevant mailing list(s). (The individual CC's
>> are not always necessary, but the subsystem lists definitely are.)
>
> Anyway, pushed to l2-mtd.git.
>

Thanks Brian, I'll watch out for that next time.
diff mbox

Patch

diff --git a/drivers/mtd/maps/pxa2xx-flash.c b/drivers/mtd/maps/pxa2xx-flash.c
index 12fa75df5008..5ff6cc5b4844 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_WB);
 	if (!info->map.cached)
 		printk(KERN_WARNING "Failed to ioremap cached %s\n",
 		       info->map.name);
@@ -111,7 +111,7 @@  static int pxa2xx_flash_remove(struct platform_device *dev)
 	map_destroy(info->mtd);
 	iounmap(info->map.virt);
 	if (info->map.cached)
-		iounmap(info->map.cached);
+		memunmap(info->map.cached);
 	kfree(info);
 	return 0;
 }