Re: linux-next: build failure after merge of the watchdog tree

[Mark Pearson]

Thanks Stephen,

On Tue, Mar 11, 2025, at 6:03 AM, Stephen Rothwell wrote:
> Hi all,
>
> After merging the watchdog tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> drivers/watchdog/lenovo_se30_wdt.c: In function 'lenovo_se30_wdt_probe':
> drivers/watchdog/lenovo_se30_wdt.c:272:31: error: implicit declaration 
> of function 'devm_ioremap' [-Wimplicit-function-declaration]
>   272 |         priv->shm_base_addr = devm_ioremap(dev, base_phys, 
> SHM_WIN_SIZE);
>       |                               ^~~~~~~~~~~~
> drivers/watchdog/lenovo_se30_wdt.c:272:29: error: assignment to 
> 'unsigned char *' from 'int' makes pointer from integer without a cast 
> [-Wint-conversion]
>   272 |         priv->shm_base_addr = devm_ioremap(dev, base_phys, 
> SHM_WIN_SIZE);
>       |                             ^
>
> Caused by commit
>
>   c284153a2c55 ("watchdog: lenovo_se30_wdt: Watchdog driver for Lenovo 
> SE30 platform")
>
> Somewhere alogn the way a change to some include file means that
> linux/io.h is no longer implicitly included.  I have added the following
> patch for today.
>
> From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
> Date: Tue, 11 Mar 2025 20:50:05 +1100
> Subject: [PATCH] watchdog: lenovo_se30_wdt: include io.h for devm_ioremap()
>
> Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
> ---
>  drivers/watchdog/lenovo_se30_wdt.c | 1 +
>  1 file changed, 1 insertion(+)
>
> diff --git a/drivers/watchdog/lenovo_se30_wdt.c 
> b/drivers/watchdog/lenovo_se30_wdt.c
> index f25429da0cec..024b842499b3 100644
> --- a/drivers/watchdog/lenovo_se30_wdt.c
> +++ b/drivers/watchdog/lenovo_se30_wdt.c
> @@ -5,6 +5,7 @@
> 
>  #define dev_fmt(fmt) KBUILD_MODNAME ": " fmt
> 
> +#include <linux/io.h>
>  #include <linux/dmi.h>
>  #include <linux/delay.h>
>  #include <linux/iommu.h>
> -- 
> 2.45.2
>
> -- 
Appreciate you getting this done so fast - it was on my todo list for today.
Apologies for the build break.

Change looks good to me.
Reviewed-by: Mark Pearson <mpearson-lenovo@xxxxxxxxx>

Mark