[PATCH v3 0/3] i2c: mux: move include files out of include/linux/i2c

[PATCH v3 0/3] 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.

v3 makes sure includes keep sorted correctly. For PCA9541, a patch which does
the initial sorting has been added.

Thanks,

   Wolfram


Wolfram Sang (3):
  i2c: mux: pca9541: sort include files
  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                | 9 ++++-----
 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, 6 insertions(+), 7 deletions(-)
 rename include/linux/{i2c => platform_data}/pca954x.h (100%)
 rename include/linux/{i2c => platform_data/x86}/mlxcpld.h (100%)

-- 
2.11.0

[PATCH v3 1/3] i2c: mux: pca9541: sort include files

[Wolfram Sang]

Make it consistent with the other drivers.

Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
---
 drivers/i2c/muxes/i2c-mux-pca9541.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/drivers/i2c/muxes/i2c-mux-pca9541.c b/drivers/i2c/muxes/i2c-mux-pca9541.c
index 9e318c9516c767..be961f2855c75f 100644
--- a/drivers/i2c/muxes/i2c-mux-pca9541.c
+++ b/drivers/i2c/muxes/i2c-mux-pca9541.c
@@ -16,15 +16,14 @@
  * warranty of any kind, whether express or implied.
  */
 
-#include <linux/module.h>
-#include <linux/jiffies.h>
 #include <linux/delay.h>
-#include <linux/slab.h>
 #include <linux/device.h>
 #include <linux/i2c.h>
 #include <linux/i2c-mux.h>
-
 #include <linux/i2c/pca954x.h>
+#include <linux/jiffies.h>
+#include <linux/module.h>
+#include <linux/slab.h>
 
 /*
  * The PCA9541 is a bus master selector. It supports two I2C masters connected
-- 
2.11.0

[PATCH v3 2/3] 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            | 2 +-
 drivers/i2c/muxes/i2c-mux-pca954x.c            | 2 +-
 include/linux/{i2c => platform_data}/pca954x.h | 0
 3 files changed, 2 insertions(+), 2 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 be961f2855c75f..6a39adaf433f4a 100644
--- a/drivers/i2c/muxes/i2c-mux-pca9541.c
+++ b/drivers/i2c/muxes/i2c-mux-pca9541.c
@@ -20,9 +20,9 @@
 #include <linux/device.h>
 #include <linux/i2c.h>
 #include <linux/i2c-mux.h>
-#include <linux/i2c/pca954x.h>
 #include <linux/jiffies.h>
 #include <linux/module.h>
+#include <linux/platform_data/pca954x.h>
 #include <linux/slab.h>
 
 /*
diff --git a/drivers/i2c/muxes/i2c-mux-pca954x.c b/drivers/i2c/muxes/i2c-mux-pca954x.c
index f1751c290af67c..7b992db3802188 100644
--- a/drivers/i2c/muxes/i2c-mux-pca954x.c
+++ b/drivers/i2c/muxes/i2c-mux-pca954x.c
@@ -39,13 +39,13 @@
 #include <linux/gpio/consumer.h>
 #include <linux/i2c.h>
 #include <linux/i2c-mux.h>
-#include <linux/i2c/pca954x.h>
 #include <linux/interrupt.h>
 #include <linux/irq.h>
 #include <linux/module.h>
 #include <linux/of.h>
 #include <linux/of_device.h>
 #include <linux/of_irq.h>
+#include <linux/platform_data/pca954x.h>
 #include <linux/pm.h>
 #include <linux/slab.h>
 #include <linux/spinlock.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 v3 3/3] 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..12ad8d65faf642 100644
--- a/drivers/i2c/muxes/i2c-mux-mlxcpld.c
+++ b/drivers/i2c/muxes/i2c-mux-mlxcpld.c
@@ -38,9 +38,9 @@
 #include <linux/io.h>
 #include <linux/init.h>
 #include <linux/module.h>
+#include <linux/platform_data/x86/mlxcpld.h>
 #include <linux/platform_device.h>
 #include <linux/slab.h>
-#include <linux/i2c/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 v3 0/3] i2c: mux: move include files out of include/linux/i2c

[Peter Rosin]

On 2017-08-14 10:23, 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.
> 
> v3 makes sure includes keep sorted correctly. For PCA9541, a patch which does
> the initial sorting has been added.

Excellent, applied to my i2c-mux/for-next branch.

Cheers,
Peter