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

Commit 02112260 authored by Matt Ranostay's avatar Matt Ranostay Committed by Jonathan Cameron
Browse files

iio: chemical: atlas-ph-sensor: use msleep() for long uncritical delays 

usleep_range() uses hrtimers and provides no advantage over msleep()
for larger delays.

Cc: Nicholas Mc Guire <hofrat@osadl.org>
Link: http://lkml.org/lkml/2017/1/11/377


Signed-off-by: default avatarMatt Ranostay <matt.ranostay@konsulko.com>
Reviewed-by: default avatarNicholas Mc Guire <hofrat@osadl.org>
Signed-off-by: default avatarJonathan Cameron <Jonathan.Cameron@huawei.com>
parent c18af98b

drivers/iio/chemical/atlas-ph-sensor.c

+7 −7
Original line number Original line Diff line number Diff line
@@ -61,9 +61,9 @@ 
#define ATLAS_REG_ORP_CALIB_STATUS	0x0d

#define ATLAS_REG_ORP_CALIB_STATUS	0x0d

#define ATLAS_REG_ORP_DATA		0x0e

#define ATLAS_REG_ORP_DATA		0x0e





#define ATLAS_PH_INT_TIME_IN_US		450000

#define ATLAS_PH_INT_TIME_IN_MS		450

#define ATLAS_EC_INT_TIME_IN_US		650000

#define ATLAS_EC_INT_TIME_IN_MS		650

#define ATLAS_ORP_INT_TIME_IN_US	450000

#define ATLAS_ORP_INT_TIME_IN_MS	450





enum {

enum {

	ATLAS_PH_SM,

	ATLAS_PH_SM,
@@ -270,21 +270,21 @@ static struct atlas_device atlas_devices[] = { 
				.num_channels = 3,

				.num_channels = 3,

				.data_reg = ATLAS_REG_PH_DATA,

				.data_reg = ATLAS_REG_PH_DATA,

				.calibration = &atlas_check_ph_calibration,

				.calibration = &atlas_check_ph_calibration,

				.delay = ATLAS_PH_INT_TIME_IN_US,

				.delay = ATLAS_PH_INT_TIME_IN_MS,

	},

	},

	[ATLAS_EC_SM] = {

	[ATLAS_EC_SM] = {

				.channels = atlas_ec_channels,

				.channels = atlas_ec_channels,

				.num_channels = 5,

				.num_channels = 5,

				.data_reg = ATLAS_REG_EC_DATA,

				.data_reg = ATLAS_REG_EC_DATA,

				.calibration = &atlas_check_ec_calibration,

				.calibration = &atlas_check_ec_calibration,

				.delay = ATLAS_EC_INT_TIME_IN_US,

				.delay = ATLAS_EC_INT_TIME_IN_MS,

	},

	},

	[ATLAS_ORP_SM] = {

	[ATLAS_ORP_SM] = {

				.channels = atlas_orp_channels,

				.channels = atlas_orp_channels,

				.num_channels = 2,

				.num_channels = 2,

				.data_reg = ATLAS_REG_ORP_DATA,

				.data_reg = ATLAS_REG_ORP_DATA,

				.calibration = &atlas_check_orp_calibration,

				.calibration = &atlas_check_orp_calibration,

				.delay = ATLAS_ORP_INT_TIME_IN_US,

				.delay = ATLAS_ORP_INT_TIME_IN_MS,

	},

	},

};

};
@@ -393,7 +393,7 @@ static int atlas_read_measurement(struct atlas_data *data, int reg, __be32 *val) 
	}

	}





	if (suspended)

	if (suspended)

		usleep_range(data->chip->delay, data->chip->delay + 100000);

		msleep(data->chip->delay);





	ret = regmap_bulk_read(data->regmap, reg, (u8 *) val, sizeof(*val));

	ret = regmap_bulk_read(data->regmap, reg, (u8 *) val, sizeof(*val));