Re: [PATCH] power: supply: intel_dc_ti_battery: fix 64bit divisions

[Jiri Slaby]

On 16. 10. 25, 8:23, Jiri Slaby (SUSE) wrote:
> On 32bit builds, I get:
> ERROR: modpost: "__udivdi3" [drivers/power/supply/intel_dc_ti_battery.ko] undefined!
>
> This is due to 64bit ktime divisions. Fix both by using div_u64().
>
> Fixes: 8c5795fe5527 ("power: supply: Add new Intel Dollar Cove TI battery driver")
> ---
> Cc: Linus Walleij <linus.walleij@xxxxxxxxxx>
> Cc: Hans de Goede <hansg@xxxxxxxxxx>
> Cc: Sebastian Reichel <sebastian.reichel@xxxxxxxxxxxxx>

Scratch this. Missing a SOB line.

> ---
>   drivers/power/supply/intel_dc_ti_battery.c | 4 ++--
>   1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/power/supply/intel_dc_ti_battery.c b/drivers/power/supply/intel_dc_ti_battery.c
> index 56b0c92e9d28..3d38106b638b 100644
> --- a/drivers/power/supply/intel_dc_ti_battery.c
> +++ b/drivers/power/supply/intel_dc_ti_battery.c
> @@ -141,7 +141,7 @@ static int dc_ti_battery_get_voltage_and_current_now(struct power_supply *psy, i
>   	if (ret)
>   		goto out_err;
>   
> -	cnt_start_usec = ktime_get_ns() / NSEC_PER_USEC;
> +	cnt_start_usec = div_u64(ktime_get_ns(), NSEC_PER_USEC);
>   
>   	/* Read Vbat, convert IIO mV to power-supply ųV */
>   	ret = iio_read_channel_processed_scale(chip->vbat_channel, volt, 1000);
> @@ -149,7 +149,7 @@ static int dc_ti_battery_get_voltage_and_current_now(struct power_supply *psy, i
>   		goto out_err;
>   
>   	/* Sleep at least 3 sample-times + slack to get 3+ CC samples */
> -	now_usec = ktime_get_ns() / NSEC_PER_USEC;
> +	now_usec = div_u64(ktime_get_ns(), NSEC_PER_USEC);
>   	sleep_usec = 3 * SMPL_INTVL_US + SLEEP_SLACK_US - (now_usec - cnt_start_usec);
>   	if (sleep_usec > 0 && sleep_usec < 1000000)
>   		usleep_range(sleep_usec, sleep_usec + SLEEP_SLACK_US);


--
js
suse labs