diff options
| author | Tony Lindgren <tony@atomide.com> | 2017-11-28 17:12:32 +0100 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2017-11-28 17:12:32 +0100 |
| commit | bc686442f8a601bccac1f22506ecdb4b0d62cadd (patch) | |
| tree | b224ab4aa2350b233da640f5850f48bc6bfeb2d0 /arch/sh/drivers/heartbeat.c | |
| parent | ARM: dts: Add remote-wakeup-connected for omap OHCI (diff) | |
| parent | ARM: dts: am437x-cm-t43: Correct the dmas property of spi0 (diff) | |
| download | linux-bc686442f8a601bccac1f22506ecdb4b0d62cadd.tar.xz linux-bc686442f8a601bccac1f22506ecdb4b0d62cadd.zip | |
Merge branch 'dts-fixes' into omap-for-v4.15/fixes-dt
Diffstat (limited to 'arch/sh/drivers/heartbeat.c')
| -rw-r--r-- | arch/sh/drivers/heartbeat.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/sh/drivers/heartbeat.c b/arch/sh/drivers/heartbeat.c index c6d96049a0bb..e8af2ff29bc3 100644 --- a/arch/sh/drivers/heartbeat.c +++ b/arch/sh/drivers/heartbeat.c @@ -59,9 +59,9 @@ static inline void heartbeat_toggle_bit(struct heartbeat_data *hd, } } -static void heartbeat_timer(unsigned long data) +static void heartbeat_timer(struct timer_list *t) { - struct heartbeat_data *hd = (struct heartbeat_data *)data; + struct heartbeat_data *hd = from_timer(hd, t, timer); static unsigned bit = 0, up = 1; heartbeat_toggle_bit(hd, bit, hd->flags & HEARTBEAT_INVERTED); @@ -133,7 +133,7 @@ static int heartbeat_drv_probe(struct platform_device *pdev) } } - setup_timer(&hd->timer, heartbeat_timer, (unsigned long)hd); + timer_setup(&hd->timer, heartbeat_timer, 0); platform_set_drvdata(pdev, hd); return mod_timer(&hd->timer, jiffies + 1); |