Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 699881fd authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "devfreq: Compilation error fix for 32-bit kernel"

parents da17976d edcd7199

drivers/devfreq/m4m-hwmon.c

+2 −2
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2014-2015, The Linux Foundation. All rights reserved.

 * Copyright (c) 2014-2015, 2019, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -221,7 +221,7 @@ static irqreturn_t m4m_hwmon_intr_handler(int irq, void *dev) 
	return IRQ_NONE;

}



static int count_to_mrps(unsigned long count, unsigned int us)

static int count_to_mrps(uint64_t count, unsigned int us)

{

	do_div(count, us);

	count++;

drivers/devfreq/msmcci-hwmon.c

+2 −2
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2014-2015, The Linux Foundation. All rights reserved.

 * Copyright (c) 2014-2015, 2019, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -224,7 +224,7 @@ static unsigned long mon_read_count_single(struct msmcci_hwmon *m, int idx) 
	return count;

}



static int count_to_mrps(unsigned long count, unsigned int us)

static int count_to_mrps(uint64_t count, unsigned int us)

{

	do_div(count, us);

	count++;