* [PATCH] iio: cros_ec: Move cros_ec_sensors_core.h in /include
@ 2018-03-13 21:23 Gwendal Grignou
2018-03-17 19:56 ` Jonathan Cameron
0 siblings, 1 reply; 5+ messages in thread
From: Gwendal Grignou @ 2018-03-13 21:23 UTC (permalink / raw)
To: jic23, lars, paolocretaro, enric.balletbo; +Cc: linux-iio
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>
---
drivers/iio/common/cros_ec_sensors/cros_ec_sensors.c | 3 +--
drivers/iio/common/cros_ec_sensors/cros_ec_sensors_core.c | 3 +--
drivers/iio/light/cros_ec_light_prox.c | 3 +--
drivers/iio/pressure/cros_ec_baro.c | 3 +--
.../linux/iio/common}/cros_ec_sensors_core.h | 2 ++
5 files changed, 6 insertions(+), 8 deletions(-)
rename {drivers/iio/common/cros_ec_sensors => include/linux/iio/common}/cros_ec_sensors_core.h (99%)
diff --git a/drivers/iio/common/cros_ec_sensors/cros_ec_sensors.c b/drivers/iio/common/cros_ec_sensors/cros_ec_sensors.c
index 7d30c59da3e2..8e3f99a8b30c 100644
--- a/drivers/iio/common/cros_ec_sensors/cros_ec_sensors.c
+++ b/drivers/iio/common/cros_ec_sensors/cros_ec_sensors.c
@@ -19,6 +19,7 @@
#include <linux/delay.h>
#include <linux/device.h>
#include <linux/iio/buffer.h>
+#include <linux/iio/common/cros_ec_sensors_core.h>
#include <linux/iio/iio.h>
#include <linux/iio/kfifo_buf.h>
#include <linux/iio/trigger_consumer.h>
@@ -31,8 +32,6 @@
#include <linux/slab.h>
#include <linux/sysfs.h>
-#include "cros_ec_sensors_core.h"
-
#define CROS_EC_SENSORS_MAX_CHANNELS 4
/* State data for ec_sensors iio driver. */
diff --git a/drivers/iio/common/cros_ec_sensors/cros_ec_sensors_core.c b/drivers/iio/common/cros_ec_sensors/cros_ec_sensors_core.c
index 416cae5ebbd0..ea3268bd92f4 100644
--- a/drivers/iio/common/cros_ec_sensors/cros_ec_sensors_core.c
+++ b/drivers/iio/common/cros_ec_sensors/cros_ec_sensors_core.c
@@ -16,6 +16,7 @@
#include <linux/delay.h>
#include <linux/device.h>
#include <linux/iio/buffer.h>
+#include <linux/iio/common/cros_ec_sensors_core.h>
#include <linux/iio/iio.h>
#include <linux/iio/kfifo_buf.h>
#include <linux/iio/trigger_consumer.h>
@@ -27,8 +28,6 @@
#include <linux/sysfs.h>
#include <linux/platform_device.h>
-#include "cros_ec_sensors_core.h"
-
static char *cros_ec_loc[] = {
[MOTIONSENSE_LOC_BASE] = "base",
[MOTIONSENSE_LOC_LID] = "lid",
diff --git a/drivers/iio/light/cros_ec_light_prox.c b/drivers/iio/light/cros_ec_light_prox.c
index acfad4aeb27a..15bd105b08f3 100644
--- a/drivers/iio/light/cros_ec_light_prox.c
+++ b/drivers/iio/light/cros_ec_light_prox.c
@@ -16,6 +16,7 @@
#include <linux/delay.h>
#include <linux/device.h>
#include <linux/iio/buffer.h>
+#include <linux/iio/common/cros_ec_sensors_core.h>
#include <linux/iio/iio.h>
#include <linux/iio/kfifo_buf.h>
#include <linux/iio/trigger.h>
@@ -29,8 +30,6 @@
#include <linux/slab.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
* light sensors to return the what the eye would see. For proximity, we
diff --git a/drivers/iio/pressure/cros_ec_baro.c b/drivers/iio/pressure/cros_ec_baro.c
index 4599fde4dd25..87c07af9181f 100644
--- a/drivers/iio/pressure/cros_ec_baro.c
+++ b/drivers/iio/pressure/cros_ec_baro.c
@@ -16,6 +16,7 @@
#include <linux/delay.h>
#include <linux/device.h>
#include <linux/iio/buffer.h>
+#include <linux/iio/common/cros_ec_sensors_core.h>
#include <linux/iio/iio.h>
#include <linux/iio/kfifo_buf.h>
#include <linux/iio/trigger.h>
@@ -28,8 +29,6 @@
#include <linux/slab.h>
#include <linux/platform_device.h>
-#include "../common/cros_ec_sensors/cros_ec_sensors_core.h"
-
/*
* One channel for pressure, the other for timestamp.
*/
diff --git a/drivers/iio/common/cros_ec_sensors/cros_ec_sensors_core.h b/include/linux/iio/common/cros_ec_sensors_core.h
similarity index 99%
rename from drivers/iio/common/cros_ec_sensors/cros_ec_sensors_core.h
rename to include/linux/iio/common/cros_ec_sensors_core.h
index 8bc2ca3c2e2e..a6701827a773 100644
--- a/drivers/iio/common/cros_ec_sensors/cros_ec_sensors_core.h
+++ b/include/linux/iio/common/cros_ec_sensors_core.h
@@ -16,7 +16,9 @@
#ifndef __CROS_EC_SENSORS_CORE_H
#define __CROS_EC_SENSORS_CORE_H
+#include <linux/iio/iio.h>
#include <linux/irqreturn.h>
+#include <linux/mfd/cros_ec.h>
enum {
CROS_EC_SENSOR_X,
--
2.16.2.660.g709887971b-goog
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH] iio: cros_ec: Move cros_ec_sensors_core.h in /include
2018-03-13 21:23 [PATCH] iio: cros_ec: Move cros_ec_sensors_core.h in /include Gwendal Grignou
@ 2018-03-17 19:56 ` Jonathan Cameron
2018-03-17 20:00 ` Jonathan Cameron
0 siblings, 1 reply; 5+ messages in thread
From: Jonathan Cameron @ 2018-03-17 19:56 UTC (permalink / raw)
To: Gwendal Grignou; +Cc: lars, paolocretaro, enric.balletbo, linux-iio
On Tue, 13 Mar 2018 14:23:28 -0700
Gwendal Grignou <gwendal@chromium.org> wrote:
> 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>
Applied to the togreg branch of iio.git and pushed out as testing for the
autobuilders to play with it.
Thanks,
Jonathan
> ---
> drivers/iio/common/cros_ec_sensors/cros_ec_sensors.c | 3 +--
> drivers/iio/common/cros_ec_sensors/cros_ec_sensors_core.c | 3 +--
> drivers/iio/light/cros_ec_light_prox.c | 3 +--
> drivers/iio/pressure/cros_ec_baro.c | 3 +--
> .../linux/iio/common}/cros_ec_sensors_core.h | 2 ++
> 5 files changed, 6 insertions(+), 8 deletions(-)
> rename {drivers/iio/common/cros_ec_sensors => include/linux/iio/common}/cros_ec_sensors_core.h (99%)
>
> diff --git a/drivers/iio/common/cros_ec_sensors/cros_ec_sensors.c b/drivers/iio/common/cros_ec_sensors/cros_ec_sensors.c
> index 7d30c59da3e2..8e3f99a8b30c 100644
> --- a/drivers/iio/common/cros_ec_sensors/cros_ec_sensors.c
> +++ b/drivers/iio/common/cros_ec_sensors/cros_ec_sensors.c
> @@ -19,6 +19,7 @@
> #include <linux/delay.h>
> #include <linux/device.h>
> #include <linux/iio/buffer.h>
> +#include <linux/iio/common/cros_ec_sensors_core.h>
> #include <linux/iio/iio.h>
> #include <linux/iio/kfifo_buf.h>
> #include <linux/iio/trigger_consumer.h>
> @@ -31,8 +32,6 @@
> #include <linux/slab.h>
> #include <linux/sysfs.h>
>
> -#include "cros_ec_sensors_core.h"
> -
> #define CROS_EC_SENSORS_MAX_CHANNELS 4
>
> /* State data for ec_sensors iio driver. */
> diff --git a/drivers/iio/common/cros_ec_sensors/cros_ec_sensors_core.c b/drivers/iio/common/cros_ec_sensors/cros_ec_sensors_core.c
> index 416cae5ebbd0..ea3268bd92f4 100644
> --- a/drivers/iio/common/cros_ec_sensors/cros_ec_sensors_core.c
> +++ b/drivers/iio/common/cros_ec_sensors/cros_ec_sensors_core.c
> @@ -16,6 +16,7 @@
> #include <linux/delay.h>
> #include <linux/device.h>
> #include <linux/iio/buffer.h>
> +#include <linux/iio/common/cros_ec_sensors_core.h>
> #include <linux/iio/iio.h>
> #include <linux/iio/kfifo_buf.h>
> #include <linux/iio/trigger_consumer.h>
> @@ -27,8 +28,6 @@
> #include <linux/sysfs.h>
> #include <linux/platform_device.h>
>
> -#include "cros_ec_sensors_core.h"
> -
> static char *cros_ec_loc[] = {
> [MOTIONSENSE_LOC_BASE] = "base",
> [MOTIONSENSE_LOC_LID] = "lid",
> diff --git a/drivers/iio/light/cros_ec_light_prox.c b/drivers/iio/light/cros_ec_light_prox.c
> index acfad4aeb27a..15bd105b08f3 100644
> --- a/drivers/iio/light/cros_ec_light_prox.c
> +++ b/drivers/iio/light/cros_ec_light_prox.c
> @@ -16,6 +16,7 @@
> #include <linux/delay.h>
> #include <linux/device.h>
> #include <linux/iio/buffer.h>
> +#include <linux/iio/common/cros_ec_sensors_core.h>
> #include <linux/iio/iio.h>
> #include <linux/iio/kfifo_buf.h>
> #include <linux/iio/trigger.h>
> @@ -29,8 +30,6 @@
> #include <linux/slab.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
> * light sensors to return the what the eye would see. For proximity, we
> diff --git a/drivers/iio/pressure/cros_ec_baro.c b/drivers/iio/pressure/cros_ec_baro.c
> index 4599fde4dd25..87c07af9181f 100644
> --- a/drivers/iio/pressure/cros_ec_baro.c
> +++ b/drivers/iio/pressure/cros_ec_baro.c
> @@ -16,6 +16,7 @@
> #include <linux/delay.h>
> #include <linux/device.h>
> #include <linux/iio/buffer.h>
> +#include <linux/iio/common/cros_ec_sensors_core.h>
> #include <linux/iio/iio.h>
> #include <linux/iio/kfifo_buf.h>
> #include <linux/iio/trigger.h>
> @@ -28,8 +29,6 @@
> #include <linux/slab.h>
> #include <linux/platform_device.h>
>
> -#include "../common/cros_ec_sensors/cros_ec_sensors_core.h"
> -
> /*
> * One channel for pressure, the other for timestamp.
> */
> diff --git a/drivers/iio/common/cros_ec_sensors/cros_ec_sensors_core.h b/include/linux/iio/common/cros_ec_sensors_core.h
> similarity index 99%
> rename from drivers/iio/common/cros_ec_sensors/cros_ec_sensors_core.h
> rename to include/linux/iio/common/cros_ec_sensors_core.h
> index 8bc2ca3c2e2e..a6701827a773 100644
> --- a/drivers/iio/common/cros_ec_sensors/cros_ec_sensors_core.h
> +++ b/include/linux/iio/common/cros_ec_sensors_core.h
> @@ -16,7 +16,9 @@
> #ifndef __CROS_EC_SENSORS_CORE_H
> #define __CROS_EC_SENSORS_CORE_H
>
> +#include <linux/iio/iio.h>
> #include <linux/irqreturn.h>
> +#include <linux/mfd/cros_ec.h>
>
> enum {
> CROS_EC_SENSOR_X,
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] iio: cros_ec: Move cros_ec_sensors_core.h in /include
2018-03-17 19:56 ` Jonathan Cameron
@ 2018-03-17 20:00 ` Jonathan Cameron
2018-03-28 23:53 ` [PATCH v2] " Gwendal Grignou
0 siblings, 1 reply; 5+ messages in thread
From: Jonathan Cameron @ 2018-03-17 20:00 UTC (permalink / raw)
To: Gwendal Grignou; +Cc: lars, paolocretaro, enric.balletbo, linux-iio
On Sat, 17 Mar 2018 19:56:04 +0000
Jonathan Cameron <jic23@kernel.org> wrote:
> On Tue, 13 Mar 2018 14:23:28 -0700
> Gwendal Grignou <gwendal@chromium.org> wrote:
>
> > 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>
> Applied to the togreg branch of iio.git and pushed out as testing for the
> autobuilders to play with it.
I spoke too soon as my own build tests were running. The header ordering
change broke the build as there was no definition of struct platform_device.
I added it to the header and I think it is all fixed.
May be other problems hiding like that, but the autobuilders should find
them.
Jonathan
>
> Thanks,
>
> Jonathan
>
> > ---
> > drivers/iio/common/cros_ec_sensors/cros_ec_sensors.c | 3 +--
> > drivers/iio/common/cros_ec_sensors/cros_ec_sensors_core.c | 3 +--
> > drivers/iio/light/cros_ec_light_prox.c | 3 +--
> > drivers/iio/pressure/cros_ec_baro.c | 3 +--
> > .../linux/iio/common}/cros_ec_sensors_core.h | 2 ++
> > 5 files changed, 6 insertions(+), 8 deletions(-)
> > rename {drivers/iio/common/cros_ec_sensors => include/linux/iio/common}/cros_ec_sensors_core.h (99%)
> >
> > diff --git a/drivers/iio/common/cros_ec_sensors/cros_ec_sensors.c b/drivers/iio/common/cros_ec_sensors/cros_ec_sensors.c
> > index 7d30c59da3e2..8e3f99a8b30c 100644
> > --- a/drivers/iio/common/cros_ec_sensors/cros_ec_sensors.c
> > +++ b/drivers/iio/common/cros_ec_sensors/cros_ec_sensors.c
> > @@ -19,6 +19,7 @@
> > #include <linux/delay.h>
> > #include <linux/device.h>
> > #include <linux/iio/buffer.h>
> > +#include <linux/iio/common/cros_ec_sensors_core.h>
> > #include <linux/iio/iio.h>
> > #include <linux/iio/kfifo_buf.h>
> > #include <linux/iio/trigger_consumer.h>
> > @@ -31,8 +32,6 @@
> > #include <linux/slab.h>
> > #include <linux/sysfs.h>
> >
> > -#include "cros_ec_sensors_core.h"
> > -
> > #define CROS_EC_SENSORS_MAX_CHANNELS 4
> >
> > /* State data for ec_sensors iio driver. */
> > diff --git a/drivers/iio/common/cros_ec_sensors/cros_ec_sensors_core.c b/drivers/iio/common/cros_ec_sensors/cros_ec_sensors_core.c
> > index 416cae5ebbd0..ea3268bd92f4 100644
> > --- a/drivers/iio/common/cros_ec_sensors/cros_ec_sensors_core.c
> > +++ b/drivers/iio/common/cros_ec_sensors/cros_ec_sensors_core.c
> > @@ -16,6 +16,7 @@
> > #include <linux/delay.h>
> > #include <linux/device.h>
> > #include <linux/iio/buffer.h>
> > +#include <linux/iio/common/cros_ec_sensors_core.h>
> > #include <linux/iio/iio.h>
> > #include <linux/iio/kfifo_buf.h>
> > #include <linux/iio/trigger_consumer.h>
> > @@ -27,8 +28,6 @@
> > #include <linux/sysfs.h>
> > #include <linux/platform_device.h>
> >
> > -#include "cros_ec_sensors_core.h"
> > -
> > static char *cros_ec_loc[] = {
> > [MOTIONSENSE_LOC_BASE] = "base",
> > [MOTIONSENSE_LOC_LID] = "lid",
> > diff --git a/drivers/iio/light/cros_ec_light_prox.c b/drivers/iio/light/cros_ec_light_prox.c
> > index acfad4aeb27a..15bd105b08f3 100644
> > --- a/drivers/iio/light/cros_ec_light_prox.c
> > +++ b/drivers/iio/light/cros_ec_light_prox.c
> > @@ -16,6 +16,7 @@
> > #include <linux/delay.h>
> > #include <linux/device.h>
> > #include <linux/iio/buffer.h>
> > +#include <linux/iio/common/cros_ec_sensors_core.h>
> > #include <linux/iio/iio.h>
> > #include <linux/iio/kfifo_buf.h>
> > #include <linux/iio/trigger.h>
> > @@ -29,8 +30,6 @@
> > #include <linux/slab.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
> > * light sensors to return the what the eye would see. For proximity, we
> > diff --git a/drivers/iio/pressure/cros_ec_baro.c b/drivers/iio/pressure/cros_ec_baro.c
> > index 4599fde4dd25..87c07af9181f 100644
> > --- a/drivers/iio/pressure/cros_ec_baro.c
> > +++ b/drivers/iio/pressure/cros_ec_baro.c
> > @@ -16,6 +16,7 @@
> > #include <linux/delay.h>
> > #include <linux/device.h>
> > #include <linux/iio/buffer.h>
> > +#include <linux/iio/common/cros_ec_sensors_core.h>
> > #include <linux/iio/iio.h>
> > #include <linux/iio/kfifo_buf.h>
> > #include <linux/iio/trigger.h>
> > @@ -28,8 +29,6 @@
> > #include <linux/slab.h>
> > #include <linux/platform_device.h>
> >
> > -#include "../common/cros_ec_sensors/cros_ec_sensors_core.h"
> > -
> > /*
> > * One channel for pressure, the other for timestamp.
> > */
> > diff --git a/drivers/iio/common/cros_ec_sensors/cros_ec_sensors_core.h b/include/linux/iio/common/cros_ec_sensors_core.h
> > similarity index 99%
> > rename from drivers/iio/common/cros_ec_sensors/cros_ec_sensors_core.h
> > rename to include/linux/iio/common/cros_ec_sensors_core.h
> > index 8bc2ca3c2e2e..a6701827a773 100644
> > --- a/drivers/iio/common/cros_ec_sensors/cros_ec_sensors_core.h
> > +++ b/include/linux/iio/common/cros_ec_sensors_core.h
> > @@ -16,7 +16,9 @@
> > #ifndef __CROS_EC_SENSORS_CORE_H
> > #define __CROS_EC_SENSORS_CORE_H
> >
> > +#include <linux/iio/iio.h>
> > #include <linux/irqreturn.h>
> > +#include <linux/mfd/cros_ec.h>
> >
> > enum {
> > CROS_EC_SENSOR_X,
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-iio" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH v2] iio: cros_ec: Move cros_ec_sensors_core.h in /include
2018-03-17 20:00 ` Jonathan Cameron
@ 2018-03-28 23:53 ` Gwendal Grignou
2018-03-30 9:20 ` Jonathan Cameron
0 siblings, 1 reply; 5+ messages in thread
From: Gwendal Grignou @ 2018-03-28 23:53 UTC (permalink / raw)
To: jic23; +Cc: linux-iio, enric.balletbo
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>
---
Changes in v2:
- Include linux/platform_device.h in cros_ec_sensors_core.h
drivers/iio/common/cros_ec_sensors/cros_ec_sensors.c | 3 +--
drivers/iio/common/cros_ec_sensors/cros_ec_sensors_core.c | 3 +--
drivers/iio/light/cros_ec_light_prox.c | 3 +--
drivers/iio/pressure/cros_ec_baro.c | 3 +--
.../linux/iio/common}/cros_ec_sensors_core.h | 3 +++
5 files changed, 7 insertions(+), 8 deletions(-)
rename {drivers/iio/common/cros_ec_sensors => include/linux/iio/common}/cros_ec_sensors_core.h (98%)
diff --git a/drivers/iio/common/cros_ec_sensors/cros_ec_sensors.c b/drivers/iio/common/cros_ec_sensors/cros_ec_sensors.c
index 7d30c59da3e2..8e3f99a8b30c 100644
--- a/drivers/iio/common/cros_ec_sensors/cros_ec_sensors.c
+++ b/drivers/iio/common/cros_ec_sensors/cros_ec_sensors.c
@@ -19,6 +19,7 @@
#include <linux/delay.h>
#include <linux/device.h>
#include <linux/iio/buffer.h>
+#include <linux/iio/common/cros_ec_sensors_core.h>
#include <linux/iio/iio.h>
#include <linux/iio/kfifo_buf.h>
#include <linux/iio/trigger_consumer.h>
@@ -31,8 +32,6 @@
#include <linux/slab.h>
#include <linux/sysfs.h>
-#include "cros_ec_sensors_core.h"
-
#define CROS_EC_SENSORS_MAX_CHANNELS 4
/* State data for ec_sensors iio driver. */
diff --git a/drivers/iio/common/cros_ec_sensors/cros_ec_sensors_core.c b/drivers/iio/common/cros_ec_sensors/cros_ec_sensors_core.c
index 416cae5ebbd0..ea3268bd92f4 100644
--- a/drivers/iio/common/cros_ec_sensors/cros_ec_sensors_core.c
+++ b/drivers/iio/common/cros_ec_sensors/cros_ec_sensors_core.c
@@ -16,6 +16,7 @@
#include <linux/delay.h>
#include <linux/device.h>
#include <linux/iio/buffer.h>
+#include <linux/iio/common/cros_ec_sensors_core.h>
#include <linux/iio/iio.h>
#include <linux/iio/kfifo_buf.h>
#include <linux/iio/trigger_consumer.h>
@@ -27,8 +28,6 @@
#include <linux/sysfs.h>
#include <linux/platform_device.h>
-#include "cros_ec_sensors_core.h"
-
static char *cros_ec_loc[] = {
[MOTIONSENSE_LOC_BASE] = "base",
[MOTIONSENSE_LOC_LID] = "lid",
diff --git a/drivers/iio/light/cros_ec_light_prox.c b/drivers/iio/light/cros_ec_light_prox.c
index acfad4aeb27a..15bd105b08f3 100644
--- a/drivers/iio/light/cros_ec_light_prox.c
+++ b/drivers/iio/light/cros_ec_light_prox.c
@@ -16,6 +16,7 @@
#include <linux/delay.h>
#include <linux/device.h>
#include <linux/iio/buffer.h>
+#include <linux/iio/common/cros_ec_sensors_core.h>
#include <linux/iio/iio.h>
#include <linux/iio/kfifo_buf.h>
#include <linux/iio/trigger.h>
@@ -29,8 +30,6 @@
#include <linux/slab.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
* light sensors to return the what the eye would see. For proximity, we
diff --git a/drivers/iio/pressure/cros_ec_baro.c b/drivers/iio/pressure/cros_ec_baro.c
index 4599fde4dd25..87c07af9181f 100644
--- a/drivers/iio/pressure/cros_ec_baro.c
+++ b/drivers/iio/pressure/cros_ec_baro.c
@@ -16,6 +16,7 @@
#include <linux/delay.h>
#include <linux/device.h>
#include <linux/iio/buffer.h>
+#include <linux/iio/common/cros_ec_sensors_core.h>
#include <linux/iio/iio.h>
#include <linux/iio/kfifo_buf.h>
#include <linux/iio/trigger.h>
@@ -28,8 +29,6 @@
#include <linux/slab.h>
#include <linux/platform_device.h>
-#include "../common/cros_ec_sensors/cros_ec_sensors_core.h"
-
/*
* One channel for pressure, the other for timestamp.
*/
diff --git a/drivers/iio/common/cros_ec_sensors/cros_ec_sensors_core.h b/include/linux/iio/common/cros_ec_sensors_core.h
similarity index 98%
rename from drivers/iio/common/cros_ec_sensors/cros_ec_sensors_core.h
rename to include/linux/iio/common/cros_ec_sensors_core.h
index 8bc2ca3c2e2e..e6b6190ba8af 100644
--- a/drivers/iio/common/cros_ec_sensors/cros_ec_sensors_core.h
+++ b/include/linux/iio/common/cros_ec_sensors_core.h
@@ -16,7 +16,10 @@
#ifndef __CROS_EC_SENSORS_CORE_H
#define __CROS_EC_SENSORS_CORE_H
+#include <linux/iio/iio.h>
#include <linux/irqreturn.h>
+#include <linux/mfd/cros_ec.h>
+#include <linux/platform_device.h>
enum {
CROS_EC_SENSOR_X,
--
2.17.0.rc1.321.gba9d0f2565-goog
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH v2] iio: cros_ec: Move cros_ec_sensors_core.h in /include
2018-03-28 23:53 ` [PATCH v2] " Gwendal Grignou
@ 2018-03-30 9:20 ` Jonathan Cameron
0 siblings, 0 replies; 5+ messages in thread
From: Jonathan Cameron @ 2018-03-30 9:20 UTC (permalink / raw)
To: Gwendal Grignou; +Cc: linux-iio, enric.balletbo
On Wed, 28 Mar 2018 16:53:49 -0700
Gwendal Grignou <gwendal@chromium.org> wrote:
> 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>
Hi Gwendal,
My previous email wasn't very clear - I applied the original patch with
an appropriate fix. There was not need to include the platform_device
header - a forward declaration of struct platform_device was
less invasive and what I originally went with.
Thanks,
Jonathan
> ---
>
> Changes in v2:
> - Include linux/platform_device.h in cros_ec_sensors_core.h
>
> drivers/iio/common/cros_ec_sensors/cros_ec_sensors.c | 3 +--
> drivers/iio/common/cros_ec_sensors/cros_ec_sensors_core.c | 3 +--
> drivers/iio/light/cros_ec_light_prox.c | 3 +--
> drivers/iio/pressure/cros_ec_baro.c | 3 +--
> .../linux/iio/common}/cros_ec_sensors_core.h | 3 +++
> 5 files changed, 7 insertions(+), 8 deletions(-)
> rename {drivers/iio/common/cros_ec_sensors => include/linux/iio/common}/cros_ec_sensors_core.h (98%)
>
> diff --git a/drivers/iio/common/cros_ec_sensors/cros_ec_sensors.c b/drivers/iio/common/cros_ec_sensors/cros_ec_sensors.c
> index 7d30c59da3e2..8e3f99a8b30c 100644
> --- a/drivers/iio/common/cros_ec_sensors/cros_ec_sensors.c
> +++ b/drivers/iio/common/cros_ec_sensors/cros_ec_sensors.c
> @@ -19,6 +19,7 @@
> #include <linux/delay.h>
> #include <linux/device.h>
> #include <linux/iio/buffer.h>
> +#include <linux/iio/common/cros_ec_sensors_core.h>
> #include <linux/iio/iio.h>
> #include <linux/iio/kfifo_buf.h>
> #include <linux/iio/trigger_consumer.h>
> @@ -31,8 +32,6 @@
> #include <linux/slab.h>
> #include <linux/sysfs.h>
>
> -#include "cros_ec_sensors_core.h"
> -
> #define CROS_EC_SENSORS_MAX_CHANNELS 4
>
> /* State data for ec_sensors iio driver. */
> diff --git a/drivers/iio/common/cros_ec_sensors/cros_ec_sensors_core.c b/drivers/iio/common/cros_ec_sensors/cros_ec_sensors_core.c
> index 416cae5ebbd0..ea3268bd92f4 100644
> --- a/drivers/iio/common/cros_ec_sensors/cros_ec_sensors_core.c
> +++ b/drivers/iio/common/cros_ec_sensors/cros_ec_sensors_core.c
> @@ -16,6 +16,7 @@
> #include <linux/delay.h>
> #include <linux/device.h>
> #include <linux/iio/buffer.h>
> +#include <linux/iio/common/cros_ec_sensors_core.h>
> #include <linux/iio/iio.h>
> #include <linux/iio/kfifo_buf.h>
> #include <linux/iio/trigger_consumer.h>
> @@ -27,8 +28,6 @@
> #include <linux/sysfs.h>
> #include <linux/platform_device.h>
>
> -#include "cros_ec_sensors_core.h"
> -
> static char *cros_ec_loc[] = {
> [MOTIONSENSE_LOC_BASE] = "base",
> [MOTIONSENSE_LOC_LID] = "lid",
> diff --git a/drivers/iio/light/cros_ec_light_prox.c b/drivers/iio/light/cros_ec_light_prox.c
> index acfad4aeb27a..15bd105b08f3 100644
> --- a/drivers/iio/light/cros_ec_light_prox.c
> +++ b/drivers/iio/light/cros_ec_light_prox.c
> @@ -16,6 +16,7 @@
> #include <linux/delay.h>
> #include <linux/device.h>
> #include <linux/iio/buffer.h>
> +#include <linux/iio/common/cros_ec_sensors_core.h>
> #include <linux/iio/iio.h>
> #include <linux/iio/kfifo_buf.h>
> #include <linux/iio/trigger.h>
> @@ -29,8 +30,6 @@
> #include <linux/slab.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
> * light sensors to return the what the eye would see. For proximity, we
> diff --git a/drivers/iio/pressure/cros_ec_baro.c b/drivers/iio/pressure/cros_ec_baro.c
> index 4599fde4dd25..87c07af9181f 100644
> --- a/drivers/iio/pressure/cros_ec_baro.c
> +++ b/drivers/iio/pressure/cros_ec_baro.c
> @@ -16,6 +16,7 @@
> #include <linux/delay.h>
> #include <linux/device.h>
> #include <linux/iio/buffer.h>
> +#include <linux/iio/common/cros_ec_sensors_core.h>
> #include <linux/iio/iio.h>
> #include <linux/iio/kfifo_buf.h>
> #include <linux/iio/trigger.h>
> @@ -28,8 +29,6 @@
> #include <linux/slab.h>
> #include <linux/platform_device.h>
>
> -#include "../common/cros_ec_sensors/cros_ec_sensors_core.h"
> -
> /*
> * One channel for pressure, the other for timestamp.
> */
> diff --git a/drivers/iio/common/cros_ec_sensors/cros_ec_sensors_core.h b/include/linux/iio/common/cros_ec_sensors_core.h
> similarity index 98%
> rename from drivers/iio/common/cros_ec_sensors/cros_ec_sensors_core.h
> rename to include/linux/iio/common/cros_ec_sensors_core.h
> index 8bc2ca3c2e2e..e6b6190ba8af 100644
> --- a/drivers/iio/common/cros_ec_sensors/cros_ec_sensors_core.h
> +++ b/include/linux/iio/common/cros_ec_sensors_core.h
> @@ -16,7 +16,10 @@
> #ifndef __CROS_EC_SENSORS_CORE_H
> #define __CROS_EC_SENSORS_CORE_H
>
> +#include <linux/iio/iio.h>
> #include <linux/irqreturn.h>
> +#include <linux/mfd/cros_ec.h>
> +#include <linux/platform_device.h>
>
> enum {
> CROS_EC_SENSOR_X,
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2018-03-30 9:20 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-03-13 21:23 [PATCH] iio: cros_ec: Move cros_ec_sensors_core.h in /include Gwendal Grignou
2018-03-17 19:56 ` Jonathan Cameron
2018-03-17 20:00 ` Jonathan Cameron
2018-03-28 23:53 ` [PATCH v2] " Gwendal Grignou
2018-03-30 9:20 ` Jonathan Cameron
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).