Skip to contentSkip to conversation

Patch "watchdog: rt2880_wdt: Remove assignment of dev pointer" has been added to the 4.8-stable tree

PATCH [email protected] 1 participant 1 message Oct 26, 2016

Subsystems (2)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

watchdog: rt2880_wdt: Remove assignment of dev pointer

to the 4.8-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
watchdog-rt2880_wdt-remove-assignment-of-dev-pointer.patch
and it can be found in the queue-4.8 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From df9c692b5618914d4ce7c9e3e011c5683fc16226 Mon Sep 17 00:00:00 2001

From: Matt Redfearn <[email protected]>
Date: Mon, 12 Sep 2016 10:35:12 +0100
Subject: watchdog: rt2880_wdt: Remove assignment of dev pointer
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

From: Matt Redfearn <[email protected]>

commit df9c692b5618914d4ce7c9e3e011c5683fc16226 upstream.

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 ("watchdog: Drop pointer to watchdog device ...")
---
 drivers/watchdog/rt2880_wdt.c |    1 -
 1 file changed, 1 deletion(-)
drivers/watchdog/rt2880_wdt.c +0 -1
@@ -158,7 +158,6 @@ static int rt288x_wdt_probe(struct platf
 
 	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;

Patches currently in stable-queue which might be from [email protected] are

queue-4.8/watchdog-rt2880_wdt-remove-assignment-of-dev-pointer.patch