Re: [v3,21/27] watchdog: replace devm_ioremap_nocache with devm_ioremap

From: Guenter Roeck
Date: Tue Dec 26 2017 - 12:28:37 EST


On Sat, Dec 23, 2017 at 07:01:37PM +0800, Yisheng Xie wrote:
> Default ioremap is ioremap_nocache, so devm_ioremap has the same
> function with devm_ioremap_nocache, which can just be killed to
> save the size of devres.o
>
> This patch is to use use devm_ioremap instead of devm_ioremap_nocache,
> which should not have any function change but prepare for killing
> devm_ioremap_nocache.
>
I don't have issues with the patch itself - on mips, the definitions
_are_ the same - but with the description. It is not universally correct
that the definitions are the same. Please update and resubmit.

Guenter

> Cc: Wim Van Sebroeck <wim@xxxxxxxxx>
> Cc: Guenter Roeck <linux@xxxxxxxxxxxx>
> Cc: linux-watchdog@xxxxxxxxxxxxxxx
> Signed-off-by: Yisheng Xie <xieyisheng1@xxxxxxxxxx>
> ---
> drivers/watchdog/bcm63xx_wdt.c | 4 ++--
> drivers/watchdog/rc32434_wdt.c | 4 ++--
> 2 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/watchdog/bcm63xx_wdt.c b/drivers/watchdog/bcm63xx_wdt.c
> index 8555afc..697a7e7 100644
> --- a/drivers/watchdog/bcm63xx_wdt.c
> +++ b/drivers/watchdog/bcm63xx_wdt.c
> @@ -248,8 +248,8 @@ static int bcm63xx_wdt_probe(struct platform_device *pdev)
> return -ENODEV;
> }
>
> - bcm63xx_wdt_device.regs = devm_ioremap_nocache(&pdev->dev, r->start,
> - resource_size(r));
> + bcm63xx_wdt_device.regs = devm_ioremap(&pdev->dev, r->start,
> + resource_size(r));
> if (!bcm63xx_wdt_device.regs) {
> dev_err(&pdev->dev, "failed to remap I/O resources\n");
> return -ENXIO;
> diff --git a/drivers/watchdog/rc32434_wdt.c b/drivers/watchdog/rc32434_wdt.c
> index 3a75f3b..7d519c5 100644
> --- a/drivers/watchdog/rc32434_wdt.c
> +++ b/drivers/watchdog/rc32434_wdt.c
> @@ -31,7 +31,7 @@
> #include <linux/platform_device.h> /* For platform_driver framework */
> #include <linux/spinlock.h> /* For spin_lock/spin_unlock/... */
> #include <linux/uaccess.h> /* For copy_to_user/put_user/... */
> -#include <linux/io.h> /* For devm_ioremap_nocache */
> +#include <linux/io.h> /* For devm_ioremap */
>
> #include <asm/mach-rc32434/integ.h> /* For the Watchdog registers */
>
> @@ -271,7 +271,7 @@ static int rc32434_wdt_probe(struct platform_device *pdev)
> return -ENODEV;
> }
>
> - wdt_reg = devm_ioremap_nocache(&pdev->dev, r->start, resource_size(r));
> + wdt_reg = devm_ioremap(&pdev->dev, r->start, resource_size(r));
> if (!wdt_reg) {
> pr_err("failed to remap I/O resources\n");
> return -ENXIO;