Skip to content

Commit 5a0b8cb

Browse files
gwendalcrjic23
authored andcommitted
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 <[email protected]> Signed-off-by: Jonathan Cameron <[email protected]>
1 parent dcbe3cc commit 5a0b8cb

File tree

5 files changed

+7
-8
lines changed

5 files changed

+7
-8
lines changed

drivers/iio/common/cros_ec_sensors/cros_ec_sensors.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
#include <linux/delay.h>
2020
#include <linux/device.h>
2121
#include <linux/iio/buffer.h>
22+
#include <linux/iio/common/cros_ec_sensors_core.h>
2223
#include <linux/iio/iio.h>
2324
#include <linux/iio/kfifo_buf.h>
2425
#include <linux/iio/trigger_consumer.h>
@@ -31,8 +32,6 @@
3132
#include <linux/slab.h>
3233
#include <linux/sysfs.h>
3334

34-
#include "cros_ec_sensors_core.h"
35-
3635
#define CROS_EC_SENSORS_MAX_CHANNELS 4
3736

3837
/* State data for ec_sensors iio driver. */

drivers/iio/common/cros_ec_sensors/cros_ec_sensors_core.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
#include <linux/delay.h>
1717
#include <linux/device.h>
1818
#include <linux/iio/buffer.h>
19+
#include <linux/iio/common/cros_ec_sensors_core.h>
1920
#include <linux/iio/iio.h>
2021
#include <linux/iio/kfifo_buf.h>
2122
#include <linux/iio/trigger_consumer.h>
@@ -27,8 +28,6 @@
2728
#include <linux/sysfs.h>
2829
#include <linux/platform_device.h>
2930

30-
#include "cros_ec_sensors_core.h"
31-
3231
static char *cros_ec_loc[] = {
3332
[MOTIONSENSE_LOC_BASE] = "base",
3433
[MOTIONSENSE_LOC_LID] = "lid",

drivers/iio/light/cros_ec_light_prox.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
#include <linux/delay.h>
1717
#include <linux/device.h>
1818
#include <linux/iio/buffer.h>
19+
#include <linux/iio/common/cros_ec_sensors_core.h>
1920
#include <linux/iio/iio.h>
2021
#include <linux/iio/kfifo_buf.h>
2122
#include <linux/iio/trigger.h>
@@ -29,8 +30,6 @@
2930
#include <linux/slab.h>
3031
#include <linux/sysfs.h>
3132

32-
#include "../common/cros_ec_sensors/cros_ec_sensors_core.h"
33-
3433
/*
3534
* We only represent one entry for light or proximity. EC is merging different
3635
* light sensors to return the what the eye would see. For proximity, we

drivers/iio/pressure/cros_ec_baro.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
#include <linux/delay.h>
1717
#include <linux/device.h>
1818
#include <linux/iio/buffer.h>
19+
#include <linux/iio/common/cros_ec_sensors_core.h>
1920
#include <linux/iio/iio.h>
2021
#include <linux/iio/kfifo_buf.h>
2122
#include <linux/iio/trigger.h>
@@ -28,8 +29,6 @@
2829
#include <linux/slab.h>
2930
#include <linux/platform_device.h>
3031

31-
#include "../common/cros_ec_sensors/cros_ec_sensors_core.h"
32-
3332
/*
3433
* One channel for pressure, the other for timestamp.
3534
*/

drivers/iio/common/cros_ec_sensors/cros_ec_sensors_core.h renamed to include/linux/iio/common/cros_ec_sensors_core.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,9 @@
1616
#ifndef __CROS_EC_SENSORS_CORE_H
1717
#define __CROS_EC_SENSORS_CORE_H
1818

19+
#include <linux/iio/iio.h>
1920
#include <linux/irqreturn.h>
21+
#include <linux/mfd/cros_ec.h>
2022

2123
enum {
2224
CROS_EC_SENSOR_X,
@@ -103,6 +105,7 @@ int cros_ec_sensors_read_lpc(struct iio_dev *indio_dev, unsigned long scan_mask,
103105
int cros_ec_sensors_read_cmd(struct iio_dev *indio_dev, unsigned long scan_mask,
104106
s16 *data);
105107

108+
struct platform_device;
106109
/**
107110
* cros_ec_sensors_core_init() - basic initialization of the core structure
108111
* @pdev: platform device created for the sensors

0 commit comments

Comments
 (0)