浏览代码

iio: cros_ec: Move cros_ec_sensors_core.h in /include

Similar to other common iio frameworks, move cros_ec_sensors_core.h from
drivers/iio/common/cros_ec_sensors/ to include/linux/iio/common.

Signed-off-by: Gwendal Grignou <gwendal@chromium.org>
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Gwendal Grignou 7 年之前
父节点
当前提交
5a0b8cb466

+ 1 - 2
drivers/iio/common/cros_ec_sensors/cros_ec_sensors.c

@@ -19,6 +19,7 @@
 #include <linux/delay.h>
 #include <linux/delay.h>
 #include <linux/device.h>
 #include <linux/device.h>
 #include <linux/iio/buffer.h>
 #include <linux/iio/buffer.h>
+#include <linux/iio/common/cros_ec_sensors_core.h>
 #include <linux/iio/iio.h>
 #include <linux/iio/iio.h>
 #include <linux/iio/kfifo_buf.h>
 #include <linux/iio/kfifo_buf.h>
 #include <linux/iio/trigger_consumer.h>
 #include <linux/iio/trigger_consumer.h>
@@ -31,8 +32,6 @@
 #include <linux/slab.h>
 #include <linux/slab.h>
 #include <linux/sysfs.h>
 #include <linux/sysfs.h>
 
 
-#include "cros_ec_sensors_core.h"
-
 #define CROS_EC_SENSORS_MAX_CHANNELS 4
 #define CROS_EC_SENSORS_MAX_CHANNELS 4
 
 
 /* State data for ec_sensors iio driver. */
 /* State data for ec_sensors iio driver. */

+ 1 - 2
drivers/iio/common/cros_ec_sensors/cros_ec_sensors_core.c

@@ -16,6 +16,7 @@
 #include <linux/delay.h>
 #include <linux/delay.h>
 #include <linux/device.h>
 #include <linux/device.h>
 #include <linux/iio/buffer.h>
 #include <linux/iio/buffer.h>
+#include <linux/iio/common/cros_ec_sensors_core.h>
 #include <linux/iio/iio.h>
 #include <linux/iio/iio.h>
 #include <linux/iio/kfifo_buf.h>
 #include <linux/iio/kfifo_buf.h>
 #include <linux/iio/trigger_consumer.h>
 #include <linux/iio/trigger_consumer.h>
@@ -27,8 +28,6 @@
 #include <linux/sysfs.h>
 #include <linux/sysfs.h>
 #include <linux/platform_device.h>
 #include <linux/platform_device.h>
 
 
-#include "cros_ec_sensors_core.h"
-
 static char *cros_ec_loc[] = {
 static char *cros_ec_loc[] = {
 	[MOTIONSENSE_LOC_BASE] = "base",
 	[MOTIONSENSE_LOC_BASE] = "base",
 	[MOTIONSENSE_LOC_LID] = "lid",
 	[MOTIONSENSE_LOC_LID] = "lid",

+ 1 - 2
drivers/iio/light/cros_ec_light_prox.c

@@ -16,6 +16,7 @@
 #include <linux/delay.h>
 #include <linux/delay.h>
 #include <linux/device.h>
 #include <linux/device.h>
 #include <linux/iio/buffer.h>
 #include <linux/iio/buffer.h>
+#include <linux/iio/common/cros_ec_sensors_core.h>
 #include <linux/iio/iio.h>
 #include <linux/iio/iio.h>
 #include <linux/iio/kfifo_buf.h>
 #include <linux/iio/kfifo_buf.h>
 #include <linux/iio/trigger.h>
 #include <linux/iio/trigger.h>
@@ -29,8 +30,6 @@
 #include <linux/slab.h>
 #include <linux/slab.h>
 #include <linux/sysfs.h>
 #include <linux/sysfs.h>
 
 
-#include "../common/cros_ec_sensors/cros_ec_sensors_core.h"
-
 /*
 /*
  * We only represent one entry for light or proximity. EC is merging different
  * We only represent one entry for light or proximity. EC is merging different
  * light sensors to return the what the eye would see. For proximity, we
  * light sensors to return the what the eye would see. For proximity, we

+ 1 - 2
drivers/iio/pressure/cros_ec_baro.c

@@ -16,6 +16,7 @@
 #include <linux/delay.h>
 #include <linux/delay.h>
 #include <linux/device.h>
 #include <linux/device.h>
 #include <linux/iio/buffer.h>
 #include <linux/iio/buffer.h>
+#include <linux/iio/common/cros_ec_sensors_core.h>
 #include <linux/iio/iio.h>
 #include <linux/iio/iio.h>
 #include <linux/iio/kfifo_buf.h>
 #include <linux/iio/kfifo_buf.h>
 #include <linux/iio/trigger.h>
 #include <linux/iio/trigger.h>
@@ -28,8 +29,6 @@
 #include <linux/slab.h>
 #include <linux/slab.h>
 #include <linux/platform_device.h>
 #include <linux/platform_device.h>
 
 
-#include "../common/cros_ec_sensors/cros_ec_sensors_core.h"
-
 /*
 /*
  * One channel for pressure, the other for timestamp.
  * One channel for pressure, the other for timestamp.
  */
  */

+ 3 - 0
drivers/iio/common/cros_ec_sensors/cros_ec_sensors_core.h → include/linux/iio/common/cros_ec_sensors_core.h

@@ -16,7 +16,9 @@
 #ifndef __CROS_EC_SENSORS_CORE_H
 #ifndef __CROS_EC_SENSORS_CORE_H
 #define __CROS_EC_SENSORS_CORE_H
 #define __CROS_EC_SENSORS_CORE_H
 
 
+#include <linux/iio/iio.h>
 #include <linux/irqreturn.h>
 #include <linux/irqreturn.h>
+#include <linux/mfd/cros_ec.h>
 
 
 enum {
 enum {
 	CROS_EC_SENSOR_X,
 	CROS_EC_SENSOR_X,
@@ -103,6 +105,7 @@ int cros_ec_sensors_read_lpc(struct iio_dev *indio_dev, unsigned long scan_mask,
 int cros_ec_sensors_read_cmd(struct iio_dev *indio_dev, unsigned long scan_mask,
 int cros_ec_sensors_read_cmd(struct iio_dev *indio_dev, unsigned long scan_mask,
 			     s16 *data);
 			     s16 *data);
 
 
+struct platform_device;
 /**
 /**
  * cros_ec_sensors_core_init() - basic initialization of the core structure
  * cros_ec_sensors_core_init() - basic initialization of the core structure
  * @pdev:		platform device created for the sensors
  * @pdev:		platform device created for the sensors