Commit c05c3e5d authored by Dmitry Rokosov's avatar Dmitry Rokosov Committed by Jonathan Cameron
Browse files

iio: common: scmi_sensors: use HZ macro from units.h 



Remove duplicated definition of UHZ_PER_HZ, because it's available in
the units.h as MICROHZ_PER_HZ.

Signed-off-by: default avatarDmitry Rokosov <ddrokosov@sberdevices.ru>
Reviewed-by: default avatarAndy Shevchenko <andy.shevchenko@gmail.com>
Link: https://lore.kernel.org/r/20220812165243.22177-5-ddrokosov@sberdevices.ru


Signed-off-by: default avatarJonathan Cameron <Jonathan.Cameron@huawei.com>
parent fe49ce7a

drivers/iio/common/scmi_sensors/scmi_iio.c

+4 −4
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
#include <linux/scmi_protocol.h>

#include <linux/time.h>

#include <linux/types.h>

#include <linux/units.h>



#define SCMI_IIO_NUM_OF_AXIS 3
@@ -130,7 +131,6 @@ static const struct iio_buffer_setup_ops scmi_iio_buffer_ops = { 
static int scmi_iio_set_odr_val(struct iio_dev *iio_dev, int val, int val2)

{

	struct scmi_iio_priv *sensor = iio_priv(iio_dev);

	const unsigned long UHZ_PER_HZ = 1000000UL;

	u64 sec, mult, uHz, sf;

	u32 sensor_config;

	char buf[32];
@@ -145,7 +145,7 @@ static int scmi_iio_set_odr_val(struct iio_dev *iio_dev, int val, int val2) 
		return err;

	}



	uHz = val * UHZ_PER_HZ + val2;

	uHz = val * MICROHZ_PER_HZ + val2;



	/*

	 * The seconds field in the sensor interval in SCMI is 16 bits long
@@ -156,10 +156,10 @@ static int scmi_iio_set_odr_val(struct iio_dev *iio_dev, int val, int val2) 
	 * count the number of characters

	 */

	sf = (u64)uHz * 0xFFFF;

	do_div(sf,  UHZ_PER_HZ);

	do_div(sf,  MICROHZ_PER_HZ);

	mult = scnprintf(buf, sizeof(buf), "%llu", sf) - 1;



	sec = int_pow(10, mult) * UHZ_PER_HZ;

	sec = int_pow(10, mult) * MICROHZ_PER_HZ;

	do_div(sec, uHz);

	if (sec == 0) {

		dev_err(&iio_dev->dev,