releases/4.8.5/watchdog-rt2880_wdt-remove-assignment-of-dev-pointer.patch

   1 From df9c692b5618914d4ce7c9e3e011c5683fc16226 Mon Sep 17 00:00:00 2001
   2 From: Matt Redfearn <matt.redfearn@imgtec.com>
   3 Date: Mon, 12 Sep 2016 10:35:12 +0100
   4 Subject: watchdog: rt2880_wdt: Remove assignment of dev pointer
   5 MIME-Version: 1.0
   6 Content-Type: text/plain; charset=UTF-8
   7 Content-Transfer-Encoding: 8bit
   8
   9 From: Matt Redfearn <matt.redfearn@imgtec.com>
  10
  11 commit df9c692b5618914d4ce7c9e3e011c5683fc16226 upstream.
  12
  13 Commit 0254e953537c ("watchdog: Drop pointer to watchdog device from
  14 struct watchdog_device") removed the dev pointer from struct
  15 watchdog_device, but this driver was still assigning it, leading to a
  16 compilation error:
  17
  18 drivers/watchdog/rt2880_wdt.c: In function ‘rt288x_wdt_probe’:
  19 drivers/watchdog/rt2880_wdt.c:161:16: error: ‘struct watchdog_device’
  20 has no member named ‘dev’
  21   rt288x_wdt_dev.dev = &pdev->dev;
  22                 ^
  23 scripts/Makefile.build:289: recipe for target
  24 'drivers/watchdog/rt2880_wdt.o' failed
  25
  26 Fix this by removing the assignment.
  27
  28 Fixes: 0254e953537c ("watchdog: Drop pointer to watchdog device ...")
  29 Signed-off-by: Matt Redfearn <matt.redfearn@imgtec.com>
  30 Reviewed-by: Guenter Roeck <linux@roeck-us.net>
  31 Signed-off-by: Guenter Roeck <linux@roeck-us.net>
  32 Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
  33 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  34
  35 ---
  36  drivers/watchdog/rt2880_wdt.c |    1 -
  37  1 file changed, 1 deletion(-)
  38
  39 --- a/drivers/watchdog/rt2880_wdt.c
  40 +++ b/drivers/watchdog/rt2880_wdt.c
  41 @@ -158,7 +158,6 @@ static int rt288x_wdt_probe(struct platf
  42
  43         rt288x_wdt_freq = clk_get_rate(rt288x_wdt_clk) / RALINK_WDT_PRESCALE;
  44
  45 -       rt288x_wdt_dev.dev = &pdev->dev;
  46         rt288x_wdt_dev.bootstatus = rt288x_wdt_bootcause();
  47         rt288x_wdt_dev.max_timeout = (0xfffful / rt288x_wdt_freq);
  48         rt288x_wdt_dev.parent = &pdev->dev;