[PATCH] watchdog: rt2880_wdt: Remove assignment of dev pointer

[PATCH] watchdog: rt2880_wdt: Remove assignment of dev pointer

[Matt Redfearn]

Commit 0254e953537c ("watchdog: Drop pointer to watchdog device from
struct watchdog_device") removed the dev pointer from struct
watchdog_device, but this driver was still assigning it, leading to a
compilation error:

drivers/watchdog/rt2880_wdt.c: In function ‘rt288x_wdt_probe’:
drivers/watchdog/rt2880_wdt.c:161:16: error: ‘struct watchdog_device’
has no member named ‘dev’
  rt288x_wdt_dev.dev = &pdev->dev;
                ^
scripts/Makefile.build:289: recipe for target
'drivers/watchdog/rt2880_wdt.o' failed

Fix this by removing the assignment.

Fixes: 0254e953537c
Signed-off-by: Matt Redfearn <matt.redfearn@imgtec.com>
---

 drivers/watchdog/rt2880_wdt.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/drivers/watchdog/rt2880_wdt.c b/drivers/watchdog/rt2880_wdt.c
index 1967919ae743..14b4fd428fff 100644
--- a/drivers/watchdog/rt2880_wdt.c
+++ b/drivers/watchdog/rt2880_wdt.c
@@ -158,7 +158,6 @@ static int rt288x_wdt_probe(struct platform_device *pdev)
 
 	rt288x_wdt_freq = clk_get_rate(rt288x_wdt_clk) / RALINK_WDT_PRESCALE;
 
-	rt288x_wdt_dev.dev = &pdev->dev;
 	rt288x_wdt_dev.bootstatus = rt288x_wdt_bootcause();
 	rt288x_wdt_dev.max_timeout = (0xfffful / rt288x_wdt_freq);
 	rt288x_wdt_dev.parent = &pdev->dev;
-- 
2.7.4

Re: [PATCH] watchdog: rt2880_wdt: Remove assignment of dev pointer

[Guenter Roeck]

On 09/12/2016 02:35 AM, Matt Redfearn wrote:
> Commit 0254e953537c ("watchdog: Drop pointer to watchdog device from
> struct watchdog_device") removed the dev pointer from struct
> watchdog_device, but this driver was still assigning it, leading to a
> compilation error:
>
> drivers/watchdog/rt2880_wdt.c: In function ‘rt288x_wdt_probe’:
> drivers/watchdog/rt2880_wdt.c:161:16: error: ‘struct watchdog_device’
> has no member named ‘dev’
>   rt288x_wdt_dev.dev = &pdev->dev;
>                 ^
> scripts/Makefile.build:289: recipe for target
> 'drivers/watchdog/rt2880_wdt.o' failed
>
> Fix this by removing the assignment.
>
> Fixes: 0254e953537c

Fixes: 0254e953537c ("watchdog: Drop pointer to watchdog device ...")

> Signed-off-by: Matt Redfearn <matt.redfearn@imgtec.com>

Cc: stable@vger.kernel.org # v4.5+

Reviewed-by: Guenter Roeck <linux@roeck-us.net>

> ---
>
>  drivers/watchdog/rt2880_wdt.c | 1 -
>  1 file changed, 1 deletion(-)
>
> diff --git a/drivers/watchdog/rt2880_wdt.c b/drivers/watchdog/rt2880_wdt.c
> index 1967919ae743..14b4fd428fff 100644
> --- a/drivers/watchdog/rt2880_wdt.c
> +++ b/drivers/watchdog/rt2880_wdt.c
> @@ -158,7 +158,6 @@ static int rt288x_wdt_probe(struct platform_device *pdev)
>
>  	rt288x_wdt_freq = clk_get_rate(rt288x_wdt_clk) / RALINK_WDT_PRESCALE;
>
> -	rt288x_wdt_dev.dev = &pdev->dev;
>  	rt288x_wdt_dev.bootstatus = rt288x_wdt_bootcause();
>  	rt288x_wdt_dev.max_timeout = (0xfffful / rt288x_wdt_freq);
>  	rt288x_wdt_dev.parent = &pdev->dev;
>

Re: [PATCH] watchdog: rt2880_wdt: Remove assignment of dev pointer

[Wim Van Sebroeck]

Hi Matt,

> Commit 0254e953537c ("watchdog: Drop pointer to watchdog device from
> struct watchdog_device") removed the dev pointer from struct
> watchdog_device, but this driver was still assigning it, leading to a
> compilation error:
> 
> drivers/watchdog/rt2880_wdt.c: In function ‘rt288x_wdt_probe’:
> drivers/watchdog/rt2880_wdt.c:161:16: error: ‘struct watchdog_device’
> has no member named ‘dev’
>   rt288x_wdt_dev.dev = &pdev->dev;
>                 ^
> scripts/Makefile.build:289: recipe for target
> 'drivers/watchdog/rt2880_wdt.o' failed
> 
> Fix this by removing the assignment.
> 
> Fixes: 0254e953537c
> Signed-off-by: Matt Redfearn <matt.redfearn@imgtec.com>
> ---

This patch and a similar patch from Guenter regarding mt7621_wdt was
added to linux-watchdog-next almost 2 weeks ago.

Kind regards,
Wim.