Commit 2861be4c authored by Gwendal Grignou's avatar Gwendal Grignou Committed by Enric Balletbo i Serra
Browse files

iio: cros_ec: Remove pm function 



Since cros_ec_sensorhub is shutting down the FIFO when the device
suspends, no need to slow down the EC sampling period rate.

It was necesseary to do that before command CMD_FIFO_INT_ENABLE was
introduced, but now all supported chromebooks have it.

Signed-off-by: default avatarGwendal Grignou <gwendal@chromium.org>
Acked-by: default avatarJonathan Cameron <Jonathan.Cameron@huawei.com>
Acked-by: default avatarLee Jones <lee.jones@linaro.org>
Signed-off-by: default avatarEnric Balletbo i Serra <enric.balletbo@collabora.com>
parent aa984f1b

drivers/iio/common/cros_ec_sensors/cros_ec_lid_angle.c

+0 −1
Original line number Diff line number Diff line
@@ -127,7 +127,6 @@ MODULE_DEVICE_TABLE(platform, cros_ec_lid_angle_ids); 
static struct platform_driver cros_ec_lid_angle_platform_driver = {

	.driver = {

		.name	= DRV_NAME,

		.pm	= &cros_ec_sensors_pm_ops,

	},

	.probe		= cros_ec_lid_angle_probe,

	.id_table	= cros_ec_lid_angle_ids,

drivers/iio/common/cros_ec_sensors/cros_ec_sensors.c

+0 −1
Original line number Diff line number Diff line
@@ -314,7 +314,6 @@ MODULE_DEVICE_TABLE(platform, cros_ec_sensors_ids); 
static struct platform_driver cros_ec_sensors_platform_driver = {

	.driver = {

		.name	= "cros-ec-sensors",

		.pm	= &cros_ec_sensors_pm_ops,

	},

	.probe		= cros_ec_sensors_probe,

	.id_table	= cros_ec_sensors_ids,

drivers/iio/common/cros_ec_sensors/cros_ec_sensors_core.c

+0 −47
Original line number Diff line number Diff line
@@ -738,52 +738,5 @@ int cros_ec_sensors_core_write(struct cros_ec_sensors_core_state *st, 
}

EXPORT_SYMBOL_GPL(cros_ec_sensors_core_write);



static int __maybe_unused cros_ec_sensors_prepare(struct device *dev)

{

	struct iio_dev *indio_dev = dev_get_drvdata(dev);

	struct cros_ec_sensors_core_state *st = iio_priv(indio_dev);



	if (st->curr_sampl_freq == 0)

		return 0;



	/*

	 * If the sensors are sampled at high frequency, we will not be able to

	 * sleep. Set sampling to a long period if necessary.

	 */

	if (st->curr_sampl_freq < CROS_EC_MIN_SUSPEND_SAMPLING_FREQUENCY) {

		mutex_lock(&st->cmd_lock);

		st->param.cmd = MOTIONSENSE_CMD_EC_RATE;

		st->param.ec_rate.data = CROS_EC_MIN_SUSPEND_SAMPLING_FREQUENCY;

		cros_ec_motion_send_host_cmd(st, 0);

		mutex_unlock(&st->cmd_lock);

	}

	return 0;

}



static void __maybe_unused cros_ec_sensors_complete(struct device *dev)

{

	struct iio_dev *indio_dev = dev_get_drvdata(dev);

	struct cros_ec_sensors_core_state *st = iio_priv(indio_dev);



	if (st->curr_sampl_freq == 0)

		return;



	if (st->curr_sampl_freq < CROS_EC_MIN_SUSPEND_SAMPLING_FREQUENCY) {

		mutex_lock(&st->cmd_lock);

		st->param.cmd = MOTIONSENSE_CMD_EC_RATE;

		st->param.ec_rate.data = st->curr_sampl_freq;

		cros_ec_motion_send_host_cmd(st, 0);

		mutex_unlock(&st->cmd_lock);

	}

}



const struct dev_pm_ops cros_ec_sensors_pm_ops = {

#ifdef CONFIG_PM_SLEEP

	.prepare = cros_ec_sensors_prepare,

	.complete = cros_ec_sensors_complete

#endif

};

EXPORT_SYMBOL_GPL(cros_ec_sensors_pm_ops);



MODULE_DESCRIPTION("ChromeOS EC sensor hub core functions");

MODULE_LICENSE("GPL v2");

drivers/iio/light/cros_ec_light_prox.c

+0 −1
Original line number Diff line number Diff line
@@ -255,7 +255,6 @@ MODULE_DEVICE_TABLE(platform, cros_ec_light_prox_ids); 
static struct platform_driver cros_ec_light_prox_platform_driver = {

	.driver = {

		.name	= "cros-ec-light-prox",

		.pm	= &cros_ec_sensors_pm_ops,

	},

	.probe		= cros_ec_light_prox_probe,

	.id_table	= cros_ec_light_prox_ids,

include/linux/iio/common/cros_ec_sensors_core.h

+0 −5
Original line number Diff line number Diff line
@@ -30,9 +30,6 @@ enum { 
 */

#define CROS_EC_SAMPLE_SIZE  (sizeof(s64) * 2)



/* Minimum sampling period to use when device is suspending */

#define CROS_EC_MIN_SUSPEND_SAMPLING_FREQUENCY 1000  /* 1 second */



typedef irqreturn_t (*cros_ec_sensors_capture_t)(int irq, void *p);



/**
@@ -117,8 +114,6 @@ int cros_ec_sensors_core_write(struct cros_ec_sensors_core_state *st, 
			       struct iio_chan_spec const *chan,

			       int val, int val2, long mask);



extern const struct dev_pm_ops cros_ec_sensors_pm_ops;



/* List of extended channel specification for all sensors */

extern const struct iio_chan_spec_ext_info cros_ec_sensors_ext_info[];

CRA Git | Maintained and supported by SUSTech CRA and CCSE