From: Marek Behún Date: Wed, 10 Oct 2018 15:17:27 +0000 (+0200) Subject: watchdog: armada_37xx_wdt: use do_div for u64 division X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=c8ca6e70fb74cd3bb6fc0738aed40991b9de0b87;p=linux.git watchdog: armada_37xx_wdt: use do_div for u64 division When the driver is built on 32 bit architectures during compile test, the linker complains about "__udivdi3" being undefined. We have to use do_div macro instead of the division operator when dividing u64 value. Signed-off-by: Marek Behún Reviewed-by: Guenter Roeck Signed-off-by: Guenter Roeck Signed-off-by: Wim Van Sebroeck --- diff --git a/drivers/watchdog/armada_37xx_wdt.c b/drivers/watchdog/armada_37xx_wdt.c index c43c313ba63d4..4b4054f54df97 100644 --- a/drivers/watchdog/armada_37xx_wdt.c +++ b/drivers/watchdog/armada_37xx_wdt.c @@ -156,10 +156,10 @@ static int armada_37xx_wdt_ping(struct watchdog_device *wdt) static unsigned int armada_37xx_wdt_get_timeleft(struct watchdog_device *wdt) { struct armada_37xx_watchdog *dev = watchdog_get_drvdata(wdt); - unsigned int res; + u64 res; - res = get_counter_value(dev, CNTR_ID_WDOG) * - CNTR_CTRL_PRESCALE_MIN / dev->clk_rate; + res = get_counter_value(dev, CNTR_ID_WDOG) * CNTR_CTRL_PRESCALE_MIN; + do_div(res, dev->clk_rate); return res; } @@ -176,7 +176,8 @@ static int armada_37xx_wdt_set_timeout(struct watchdog_device *wdt, * prescaler, which divides the clock rate by 2 * (CNTR_CTRL_PRESCALE_MIN). */ - dev->timeout = (u64)dev->clk_rate * timeout / CNTR_CTRL_PRESCALE_MIN; + dev->timeout = (u64)dev->clk_rate * timeout; + do_div(dev->timeout, CNTR_CTRL_PRESCALE_MIN); return 0; }