| Message ID | 20170521220212.1404-2-wsa@the-dreams.de |
|---|---|
| State | Superseded |
| Headers | show |
On 22/05/2017 at 00:02:08 +0200, Wolfram Sang wrote: > include/linux/i2c is not for client devices. Move the header file to a > more appropriate location. > > Signed-off-by: Wolfram Sang <wsa@the-dreams.de> Acked-by: Alexandre Belloni <alexandre.belloni@free-electrons.com> > --- > drivers/input/misc/dm355evm_keys.c | 2 +- > drivers/mfd/dm355evm_msp.c | 2 +- > drivers/rtc/rtc-dm355evm.c | 2 +- > include/linux/{i2c => mfd}/dm355evm_msp.h | 0 > 4 files changed, 3 insertions(+), 3 deletions(-) > rename include/linux/{i2c => mfd}/dm355evm_msp.h (100%) > > diff --git a/drivers/input/misc/dm355evm_keys.c b/drivers/input/misc/dm355evm_keys.c > index bab256ef32b9b3..c803db64a3760d 100644 > --- a/drivers/input/misc/dm355evm_keys.c > +++ b/drivers/input/misc/dm355evm_keys.c > @@ -15,7 +15,7 @@ > #include <linux/platform_device.h> > #include <linux/interrupt.h> > > -#include <linux/i2c/dm355evm_msp.h> > +#include <linux/mfd/dm355evm_msp.h> > #include <linux/module.h> > > > diff --git a/drivers/mfd/dm355evm_msp.c b/drivers/mfd/dm355evm_msp.c > index 86eca614507bd8..2a2756709f22f0 100644 > --- a/drivers/mfd/dm355evm_msp.c > +++ b/drivers/mfd/dm355evm_msp.c > @@ -18,7 +18,7 @@ > #include <linux/gpio.h> > #include <linux/leds.h> > #include <linux/i2c.h> > -#include <linux/i2c/dm355evm_msp.h> > +#include <linux/mfd/dm355evm_msp.h> > > > /* > diff --git a/drivers/rtc/rtc-dm355evm.c b/drivers/rtc/rtc-dm355evm.c > index f225cd873ff6c2..97d8259b94940f 100644 > --- a/drivers/rtc/rtc-dm355evm.c > +++ b/drivers/rtc/rtc-dm355evm.c > @@ -13,7 +13,7 @@ > #include <linux/rtc.h> > #include <linux/platform_device.h> > > -#include <linux/i2c/dm355evm_msp.h> > +#include <linux/mfd/dm355evm_msp.h> > #include <linux/module.h> > > > diff --git a/include/linux/i2c/dm355evm_msp.h b/include/linux/mfd/dm355evm_msp.h > similarity index 100% > rename from include/linux/i2c/dm355evm_msp.h > rename to include/linux/mfd/dm355evm_msp.h > -- > 2.11.0 >
On Mon, May 22, 2017 at 12:02:08AM +0200, Wolfram Sang wrote: > include/linux/i2c is not for client devices. Move the header file to a > more appropriate location. > > Signed-off-by: Wolfram Sang <wsa@the-dreams.de> > --- > drivers/input/misc/dm355evm_keys.c | 2 +- Acked-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> > drivers/mfd/dm355evm_msp.c | 2 +- > drivers/rtc/rtc-dm355evm.c | 2 +- > include/linux/{i2c => mfd}/dm355evm_msp.h | 0 > 4 files changed, 3 insertions(+), 3 deletions(-) > rename include/linux/{i2c => mfd}/dm355evm_msp.h (100%) > > diff --git a/drivers/input/misc/dm355evm_keys.c b/drivers/input/misc/dm355evm_keys.c > index bab256ef32b9b3..c803db64a3760d 100644 > --- a/drivers/input/misc/dm355evm_keys.c > +++ b/drivers/input/misc/dm355evm_keys.c > @@ -15,7 +15,7 @@ > #include <linux/platform_device.h> > #include <linux/interrupt.h> > > -#include <linux/i2c/dm355evm_msp.h> > +#include <linux/mfd/dm355evm_msp.h> > #include <linux/module.h> > > > diff --git a/drivers/mfd/dm355evm_msp.c b/drivers/mfd/dm355evm_msp.c > index 86eca614507bd8..2a2756709f22f0 100644 > --- a/drivers/mfd/dm355evm_msp.c > +++ b/drivers/mfd/dm355evm_msp.c > @@ -18,7 +18,7 @@ > #include <linux/gpio.h> > #include <linux/leds.h> > #include <linux/i2c.h> > -#include <linux/i2c/dm355evm_msp.h> > +#include <linux/mfd/dm355evm_msp.h> > > > /* > diff --git a/drivers/rtc/rtc-dm355evm.c b/drivers/rtc/rtc-dm355evm.c > index f225cd873ff6c2..97d8259b94940f 100644 > --- a/drivers/rtc/rtc-dm355evm.c > +++ b/drivers/rtc/rtc-dm355evm.c > @@ -13,7 +13,7 @@ > #include <linux/rtc.h> > #include <linux/platform_device.h> > > -#include <linux/i2c/dm355evm_msp.h> > +#include <linux/mfd/dm355evm_msp.h> > #include <linux/module.h> > > > diff --git a/include/linux/i2c/dm355evm_msp.h b/include/linux/mfd/dm355evm_msp.h > similarity index 100% > rename from include/linux/i2c/dm355evm_msp.h > rename to include/linux/mfd/dm355evm_msp.h > -- > 2.11.0 >
On Mon, 22 May 2017, Wolfram Sang wrote: > include/linux/i2c is not for client devices. Move the header file to a > more appropriate location. > > Signed-off-by: Wolfram Sang <wsa@the-dreams.de> > --- > drivers/input/misc/dm355evm_keys.c | 2 +- > drivers/mfd/dm355evm_msp.c | 2 +- For my own reference: Acked-for-MFD-by: Lee Jones <lee.jones@linaro.org> > drivers/rtc/rtc-dm355evm.c | 2 +- > include/linux/{i2c => mfd}/dm355evm_msp.h | 0 > 4 files changed, 3 insertions(+), 3 deletions(-) > rename include/linux/{i2c => mfd}/dm355evm_msp.h (100%) > > diff --git a/drivers/input/misc/dm355evm_keys.c b/drivers/input/misc/dm355evm_keys.c > index bab256ef32b9b3..c803db64a3760d 100644 > --- a/drivers/input/misc/dm355evm_keys.c > +++ b/drivers/input/misc/dm355evm_keys.c > @@ -15,7 +15,7 @@ > #include <linux/platform_device.h> > #include <linux/interrupt.h> > > -#include <linux/i2c/dm355evm_msp.h> > +#include <linux/mfd/dm355evm_msp.h> > #include <linux/module.h> > > > diff --git a/drivers/mfd/dm355evm_msp.c b/drivers/mfd/dm355evm_msp.c > index 86eca614507bd8..2a2756709f22f0 100644 > --- a/drivers/mfd/dm355evm_msp.c > +++ b/drivers/mfd/dm355evm_msp.c > @@ -18,7 +18,7 @@ > #include <linux/gpio.h> > #include <linux/leds.h> > #include <linux/i2c.h> > -#include <linux/i2c/dm355evm_msp.h> > +#include <linux/mfd/dm355evm_msp.h> > > > /* > diff --git a/drivers/rtc/rtc-dm355evm.c b/drivers/rtc/rtc-dm355evm.c > index f225cd873ff6c2..97d8259b94940f 100644 > --- a/drivers/rtc/rtc-dm355evm.c > +++ b/drivers/rtc/rtc-dm355evm.c > @@ -13,7 +13,7 @@ > #include <linux/rtc.h> > #include <linux/platform_device.h> > > -#include <linux/i2c/dm355evm_msp.h> > +#include <linux/mfd/dm355evm_msp.h> > #include <linux/module.h> > > > diff --git a/include/linux/i2c/dm355evm_msp.h b/include/linux/mfd/dm355evm_msp.h > similarity index 100% > rename from include/linux/i2c/dm355evm_msp.h > rename to include/linux/mfd/dm355evm_msp.h
On Tue, May 23, 2017 at 08:17:27AM +0100, Lee Jones wrote: > On Mon, 22 May 2017, Wolfram Sang wrote: > > > include/linux/i2c is not for client devices. Move the header file to a > > more appropriate location. > > > > Signed-off-by: Wolfram Sang <wsa@the-dreams.de> > > --- > > drivers/input/misc/dm355evm_keys.c | 2 +- > > > drivers/mfd/dm355evm_msp.c | 2 +- > > For my own reference: > Acked-for-MFD-by: Lee Jones <lee.jones@linaro.org> Does that mean it will be in 4.14? Or is something else needed?
On Sun, 13 Aug 2017, Wolfram Sang wrote: > On Tue, May 23, 2017 at 08:17:27AM +0100, Lee Jones wrote: > > On Mon, 22 May 2017, Wolfram Sang wrote: > > > > > include/linux/i2c is not for client devices. Move the header file to a > > > more appropriate location. > > > > > > Signed-off-by: Wolfram Sang <wsa@the-dreams.de> > > > --- > > > drivers/input/misc/dm355evm_keys.c | 2 +- > > > > > drivers/mfd/dm355evm_msp.c | 2 +- > > > > For my own reference: > > Acked-for-MFD-by: Lee Jones <lee.jones@linaro.org> > > Does that mean it will be in 4.14? Or is something else needed? Can this patch be applied on its own, or does it have dependencies?
On Mon, Aug 14, 2017 at 07:43:36AM +0100, Lee Jones wrote: > On Sun, 13 Aug 2017, Wolfram Sang wrote: > > > On Tue, May 23, 2017 at 08:17:27AM +0100, Lee Jones wrote: > > > On Mon, 22 May 2017, Wolfram Sang wrote: > > > > > > > include/linux/i2c is not for client devices. Move the header file to a > > > > more appropriate location. > > > > > > > > Signed-off-by: Wolfram Sang <wsa@the-dreams.de> > > > > --- > > > > drivers/input/misc/dm355evm_keys.c | 2 +- > > > > > > > drivers/mfd/dm355evm_msp.c | 2 +- > > > > > > For my own reference: > > > Acked-for-MFD-by: Lee Jones <lee.jones@linaro.org> > > > > Does that mean it will be in 4.14? Or is something else needed? > > Can this patch be applied on its own, or does it have dependencies? These patches are self-contained; they only move an include file from A to B.
diff --git a/drivers/input/misc/dm355evm_keys.c b/drivers/input/misc/dm355evm_keys.c index bab256ef32b9b3..c803db64a3760d 100644 --- a/drivers/input/misc/dm355evm_keys.c +++ b/drivers/input/misc/dm355evm_keys.c @@ -15,7 +15,7 @@ #include <linux/platform_device.h> #include <linux/interrupt.h> -#include <linux/i2c/dm355evm_msp.h> +#include <linux/mfd/dm355evm_msp.h> #include <linux/module.h> diff --git a/drivers/mfd/dm355evm_msp.c b/drivers/mfd/dm355evm_msp.c index 86eca614507bd8..2a2756709f22f0 100644 --- a/drivers/mfd/dm355evm_msp.c +++ b/drivers/mfd/dm355evm_msp.c @@ -18,7 +18,7 @@ #include <linux/gpio.h> #include <linux/leds.h> #include <linux/i2c.h> -#include <linux/i2c/dm355evm_msp.h> +#include <linux/mfd/dm355evm_msp.h> /* diff --git a/drivers/rtc/rtc-dm355evm.c b/drivers/rtc/rtc-dm355evm.c index f225cd873ff6c2..97d8259b94940f 100644 --- a/drivers/rtc/rtc-dm355evm.c +++ b/drivers/rtc/rtc-dm355evm.c @@ -13,7 +13,7 @@ #include <linux/rtc.h> #include <linux/platform_device.h> -#include <linux/i2c/dm355evm_msp.h> +#include <linux/mfd/dm355evm_msp.h> #include <linux/module.h> diff --git a/include/linux/i2c/dm355evm_msp.h b/include/linux/mfd/dm355evm_msp.h similarity index 100% rename from include/linux/i2c/dm355evm_msp.h rename to include/linux/mfd/dm355evm_msp.h
include/linux/i2c is not for client devices. Move the header file to a more appropriate location. Signed-off-by: Wolfram Sang <wsa@the-dreams.de> --- drivers/input/misc/dm355evm_keys.c | 2 +- drivers/mfd/dm355evm_msp.c | 2 +- drivers/rtc/rtc-dm355evm.c | 2 +- include/linux/{i2c => mfd}/dm355evm_msp.h | 0 4 files changed, 3 insertions(+), 3 deletions(-) rename include/linux/{i2c => mfd}/dm355evm_msp.h (100%)