[PATCH v2 0/2] i2c: mux: move include files out of include/linux/i2c

[PATCH v2 0/2] i2c: mux: move include files out of include/linux/i2c

[Wolfram Sang]

include/linux/i2c is to be deprecated, so move these header files only
including platform_data to the better suited platform_data directory.

Peter, I know I said I'll include these two patches in my for-current branch.
But other of these cleanup patches missed this merge window as well. Since I
need to wait for the next merge window anyhow (until all patches are applied),
I'd think these patches can also go the proper way via your tree, too.

These patches are rebased to v4.13-rc4 (let me know if you prefer a
different base). The PCA patch has an empty line removed now.

Thanks,

   Wolfram


Wolfram Sang (2):
  i2c: mux: pca954x: move header file out of I2C realm
  i2c: mux: mlxcpld: move header file out of I2C realm

 drivers/i2c/muxes/i2c-mux-mlxcpld.c                | 2 +-
 drivers/i2c/muxes/i2c-mux-pca9541.c                | 3 +--
 drivers/i2c/muxes/i2c-mux-pca954x.c                | 2 +-
 include/linux/{i2c => platform_data}/pca954x.h     | 0
 include/linux/{i2c => platform_data/x86}/mlxcpld.h | 0
 5 files changed, 3 insertions(+), 4 deletions(-)
 rename include/linux/{i2c => platform_data}/pca954x.h (100%)
 rename include/linux/{i2c => platform_data/x86}/mlxcpld.h (100%)

-- 
2.11.0

[PATCH v2 1/2] i2c: mux: pca954x: move header file out of I2C realm

[Wolfram Sang]

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/i2c/muxes/i2c-mux-pca9541.c            | 3 +--
 drivers/i2c/muxes/i2c-mux-pca954x.c            | 2 +-
 include/linux/{i2c => platform_data}/pca954x.h | 0
 3 files changed, 2 insertions(+), 3 deletions(-)
 rename include/linux/{i2c => platform_data}/pca954x.h (100%)

diff --git a/drivers/i2c/muxes/i2c-mux-pca9541.c b/drivers/i2c/muxes/i2c-mux-pca9541.c
index 9e318c9516c767..56e1f550b2ed0b 100644
--- a/drivers/i2c/muxes/i2c-mux-pca9541.c
+++ b/drivers/i2c/muxes/i2c-mux-pca9541.c
@@ -23,8 +23,7 @@
 #include <linux/device.h>
 #include <linux/i2c.h>
 #include <linux/i2c-mux.h>
-
-#include <linux/i2c/pca954x.h>
+#include <linux/platform_data/pca954x.h>
 
 /*
  * The PCA9541 is a bus master selector. It supports two I2C masters connected
diff --git a/drivers/i2c/muxes/i2c-mux-pca954x.c b/drivers/i2c/muxes/i2c-mux-pca954x.c
index f1751c290af67c..8de13d1ad223b2 100644
--- a/drivers/i2c/muxes/i2c-mux-pca954x.c
+++ b/drivers/i2c/muxes/i2c-mux-pca954x.c
@@ -39,7 +39,7 @@
 #include <linux/gpio/consumer.h>
 #include <linux/i2c.h>
 #include <linux/i2c-mux.h>
-#include <linux/i2c/pca954x.h>
+#include <linux/platform_data/pca954x.h>
 #include <linux/interrupt.h>
 #include <linux/irq.h>
 #include <linux/module.h>
diff --git a/include/linux/i2c/pca954x.h b/include/linux/platform_data/pca954x.h
similarity index 100%
rename from include/linux/i2c/pca954x.h
rename to include/linux/platform_data/pca954x.h
-- 
2.11.0

[PATCH v2 2/2] i2c: mux: mlxcpld: move header file out of I2C realm

[Wolfram Sang]

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/i2c/muxes/i2c-mux-mlxcpld.c                | 2 +-
 include/linux/{i2c => platform_data/x86}/mlxcpld.h | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename include/linux/{i2c => platform_data/x86}/mlxcpld.h (100%)

diff --git a/drivers/i2c/muxes/i2c-mux-mlxcpld.c b/drivers/i2c/muxes/i2c-mux-mlxcpld.c
index e53f2abd135070..63458b025ef904 100644
--- a/drivers/i2c/muxes/i2c-mux-mlxcpld.c
+++ b/drivers/i2c/muxes/i2c-mux-mlxcpld.c
@@ -40,7 +40,7 @@
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/slab.h>
-#include <linux/i2c/mlxcpld.h>
+#include <linux/platform_data/x86/mlxcpld.h>
 
 #define CPLD_MUX_MAX_NCHANS	8
 
diff --git a/include/linux/i2c/mlxcpld.h b/include/linux/platform_data/x86/mlxcpld.h
similarity index 100%
rename from include/linux/i2c/mlxcpld.h
rename to include/linux/platform_data/x86/mlxcpld.h
-- 
2.11.0

Re: [PATCH v2 0/2] i2c: mux: move include files out of include/linux/i2c

[Peter Rosin]

On 2017-08-13 15:58, Wolfram Sang wrote:
> include/linux/i2c is to be deprecated, so move these header files only
> including platform_data to the better suited platform_data directory.
> 
> Peter, I know I said I'll include these two patches in my for-current branch.
> But other of these cleanup patches missed this merge window as well. Since I
> need to wait for the next merge window anyhow (until all patches are applied),
> I'd think these patches can also go the proper way via your tree, too.
> 
> These patches are rebased to v4.13-rc4 (let me know if you prefer a
> different base). The PCA patch has an empty line removed now.

Right, no problem, I'm happy to take them. However, I know I probably acked
them and all, but now that I look at them I see that the #includes are no
longer sorted. Care to fix that?

Cheers,
peda

> Thanks,
> 
>    Wolfram
> 
> 
> Wolfram Sang (2):
>   i2c: mux: pca954x: move header file out of I2C realm
>   i2c: mux: mlxcpld: move header file out of I2C realm
> 
>  drivers/i2c/muxes/i2c-mux-mlxcpld.c                | 2 +-
>  drivers/i2c/muxes/i2c-mux-pca9541.c                | 3 +--
>  drivers/i2c/muxes/i2c-mux-pca954x.c                | 2 +-
>  include/linux/{i2c => platform_data}/pca954x.h     | 0
>  include/linux/{i2c => platform_data/x86}/mlxcpld.h | 0
>  5 files changed, 3 insertions(+), 4 deletions(-)
>  rename include/linux/{i2c => platform_data}/pca954x.h (100%)
>  rename include/linux/{i2c => platform_data/x86}/mlxcpld.h (100%)
> 

Re: [PATCH v2 0/2] i2c: mux: move include files out of include/linux/i2c

[Wolfram Sang]

[-- Attachment #1: Type: text/plain, Size: 207 bytes --]


> Right, no problem, I'm happy to take them. However, I know I probably acked
> them and all, but now that I look at them I see that the #includes are no
> longer sorted. Care to fix that?

Sure, will do.


[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]