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

It doesn't make sense to use include/linux/i2c for client drivers which may in
fact rather be hwmon or input or whatever devices. As a result, I want to
deprecate include/linux/i2c for good. This series moves the include files to a
better location, largely include/linux/platform_data because that is what most
of the moved include files contain. Note that some files don't seem to have
upstream users in board code, so they maybe could even be removed? I didn't
check for that now, but I did it for one i2c master driver recently. So, it may
be possible.

I prefer the series to go upstream via the subsystem tree; if you prefer that I
take it via I2C, just let me know.

No runtime testing because of no HW, but buildbot is happy with this series at
least. A branch can be found here:

git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git i2c/platform_data

Thanks and kind regards,

   Wolfram


Wolfram Sang (2):
  video: adp8860: move header file out of I2C realm
  video: adp8870: move header file out of I2C realm

 arch/blackfin/mach-bf537/boards/stamp.c        | 4 ++--
 drivers/video/backlight/adp8860_bl.c           | 2 +-
 drivers/video/backlight/adp8870_bl.c           | 2 +-
 include/linux/{i2c => platform_data}/adp8860.h | 0
 include/linux/{i2c => platform_data}/adp8870.h | 0
 5 files changed, 4 insertions(+), 4 deletions(-)
 rename include/linux/{i2c => platform_data}/adp8860.h (100%)
 rename include/linux/{i2c => platform_data}/adp8870.h (100%)

-- 
2.11.0

include/linux/i2c is not for client devices. Move the header file to a
more appropriate location.

Signed-off-by: Wolfram Sang <redacted>
---
 arch/blackfin/mach-bf537/boards/stamp.c        | 2 +-
 drivers/video/backlight/adp8870_bl.c           | 2 +-
 include/linux/{i2c => platform_data}/adp8870.h | 0
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename include/linux/{i2c => platform_data}/adp8870.h (100%)

diff --git a/arch/blackfin/mach-bf537/boards/stamp.c b/arch/blackfin/mach-bf537/boards/stamp.c
index 7db90c72bd8ddc..7528148dc4925b 100644
--- a/arch/blackfin/mach-bf537/boards/stamp.c
+++ b/arch/blackfin/mach-bf537/boards/stamp.c

@@ -1995,7 +1995,7 @@ static struct adp5588_gpio_platform_data adp5588_gpio_data = {
 #endif
 
 #if IS_ENABLED(CONFIG_BACKLIGHT_ADP8870)
-#include <linux/i2c/adp8870.h>
+#include <linux/platform_data/adp8870.h>
 static struct led_info adp8870_leds[] = {
 	{
 		.name = "adp8870-led7",

diff --git a/drivers/video/backlight/adp8870_bl.c b/drivers/video/backlight/adp8870_bl.c
index 21acac90fd773f..058d1def2d1f4b 100644
--- a/drivers/video/backlight/adp8870_bl.c
+++ b/drivers/video/backlight/adp8870_bl.c

@@ -18,7 +18,7 @@
 #include <linux/workqueue.h>
 #include <linux/slab.h>
 
-#include <linux/i2c/adp8870.h>
+#include <linux/platform_data/adp8870.h>
 #define ADP8870_EXT_FEATURES
 #define ADP8870_USE_LEDS
 

diff --git a/include/linux/i2c/adp8870.h b/include/linux/platform_data/adp8870.h
similarity index 100%
rename from include/linux/i2c/adp8870.h
rename to include/linux/platform_data/adp8870.h
-- 
2.11.0

include/linux/i2c is not for client devices. Move the header file to a
more appropriate location.

Signed-off-by: Wolfram Sang <redacted>
---
 arch/blackfin/mach-bf537/boards/stamp.c        | 2 +-
 drivers/video/backlight/adp8860_bl.c           | 2 +-
 include/linux/{i2c => platform_data}/adp8860.h | 0
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename include/linux/{i2c => platform_data}/adp8860.h (100%)

diff --git a/arch/blackfin/mach-bf537/boards/stamp.c b/arch/blackfin/mach-bf537/boards/stamp.c
index 24985e658c19cd..7db90c72bd8ddc 100644
--- a/arch/blackfin/mach-bf537/boards/stamp.c
+++ b/arch/blackfin/mach-bf537/boards/stamp.c

@@ -2047,7 +2047,7 @@ static struct adp8870_backlight_platform_data adp8870_pdata = {
 #endif
 
 #if IS_ENABLED(CONFIG_BACKLIGHT_ADP8860)
-#include <linux/i2c/adp8860.h>
+#include <linux/platform_data/adp8860.h>
 static struct led_info adp8860_leds[] = {
 	{
 		.name = "adp8860-led7",

diff --git a/drivers/video/backlight/adp8860_bl.c b/drivers/video/backlight/adp8860_bl.c
index 510e559c060e59..e7315bf14d6015 100644
--- a/drivers/video/backlight/adp8860_bl.c
+++ b/drivers/video/backlight/adp8860_bl.c

@@ -18,7 +18,7 @@
 #include <linux/slab.h>
 #include <linux/workqueue.h>
 
-#include <linux/i2c/adp8860.h>
+#include <linux/platform_data/adp8860.h>
 #define ADP8860_EXT_FEATURES
 #define ADP8860_USE_LEDS
 

diff --git a/include/linux/i2c/adp8860.h b/include/linux/platform_data/adp8860.h
similarity index 100%
rename from include/linux/i2c/adp8860.h
rename to include/linux/platform_data/adp8860.h
-- 
2.11.0

On Monday, May 22, 2017 12:09:52 AM 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 <redacted>

Acked-by: Bartlomiej Zolnierkiewicz <redacted>

---
 arch/blackfin/mach-bf537/boards/stamp.c        | 2 +-
 drivers/video/backlight/adp8860_bl.c           | 2 +-
 include/linux/{i2c => platform_data}/adp8860.h | 0
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename include/linux/{i2c => platform_data}/adp8860.h (100%)

Best regards,
--
Bartlomiej Zolnierkiewicz
Samsung R&D Institute Poland
Samsung Electronics

On Monday, May 22, 2017 12:09:53 AM 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 <redacted>

Acked-by: Bartlomiej Zolnierkiewicz <redacted>

---
 arch/blackfin/mach-bf537/boards/stamp.c        | 2 +-
 drivers/video/backlight/adp8870_bl.c           | 2 +-
 include/linux/{i2c => platform_data}/adp8870.h | 0
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename include/linux/{i2c => platform_data}/adp8870.h (100%)

Best regards,
--
Bartlomiej Zolnierkiewicz
Samsung R&D Institute Poland
Samsung Electronics

On 21/05/17 23:09, 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 <redacted>

Acked-by: Daniel Thompson <redacted>

On 21/05/17 23:09, 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 <redacted>

Acked-by: Daniel Thompson <redacted>

On 07.06.2017 12:57, Daniel Thompson wrote:

On 21/05/17 23:09, Wolfram Sang wrote:

quoted

include/linux/i2c is not for client devices. Move the header file to a
more appropriate location.

Signed-off-by: Wolfram Sang <redacted>

Acked-by: Daniel Thompson <redacted>

Acked-by: Michael Hennerich <michael.hennerich@analog.com>

quoted

---
  arch/blackfin/mach-bf537/boards/stamp.c        | 2 +-
  drivers/video/backlight/adp8860_bl.c           | 2 +-
  include/linux/{i2c => platform_data}/adp8860.h | 0
  3 files changed, 2 insertions(+), 2 deletions(-)
  rename include/linux/{i2c => platform_data}/adp8860.h (100%)

diff --git a/arch/blackfin/mach-bf537/boards/stamp.c 

b/arch/blackfin/mach-bf537/boards/stamp.c
index 24985e658c19cd..7db90c72bd8ddc 100644

--- a/arch/blackfin/mach-bf537/boards/stamp.c
+++ b/arch/blackfin/mach-bf537/boards/stamp.c

@@ -2047,7 +2047,7 @@ static struct adp8870_backlight_platform_data 

adp8870_pdata = {
  #endif
  #if IS_ENABLED(CONFIG_BACKLIGHT_ADP8860)
-#include <linux/i2c/adp8860.h>
+#include <linux/platform_data/adp8860.h>
  static struct led_info adp8860_leds[] = {
      {
          .name = "adp8860-led7",

diff --git a/drivers/video/backlight/adp8860_bl.c 

b/drivers/video/backlight/adp8860_bl.c
index 510e559c060e59..e7315bf14d6015 100644

--- a/drivers/video/backlight/adp8860_bl.c
+++ b/drivers/video/backlight/adp8860_bl.c

@@ -18,7 +18,7 @@
  #include <linux/slab.h>
  #include <linux/workqueue.h>
-#include <linux/i2c/adp8860.h>
+#include <linux/platform_data/adp8860.h>
  #define ADP8860_EXT_FEATURES
  #define ADP8860_USE_LEDS

diff --git a/include/linux/i2c/adp8860.h 

b/include/linux/platform_data/adp8860.h
similarity index 100%
rename from include/linux/i2c/adp8860.h
rename to include/linux/platform_data/adp8860.h

-- 
Greetings,
Michael

--
Analog Devices GmbH      Otl-Aicher Strasse 60-64      80807 München
Sitz der Gesellschaft München, Registergericht München HRB 40368,
Geschäftsführer: Peter Kolberg, Ali Raza Husain, Eileen Wynne

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 <redacted>
---
 arch/blackfin/mach-bf537/boards/stamp.c        | 2 +-
 drivers/video/backlight/adp8860_bl.c           | 2 +-
 include/linux/{i2c => platform_data}/adp8860.h | 0
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename include/linux/{i2c => platform_data}/adp8860.h (100%)

Applied, thanks.

-- 
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog

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 <redacted>
---
 arch/blackfin/mach-bf537/boards/stamp.c        | 2 +-
 drivers/video/backlight/adp8870_bl.c           | 2 +-
 include/linux/{i2c => platform_data}/adp8870.h | 0
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename include/linux/{i2c => platform_data}/adp8870.h (100%)

Applied, thanks.

-- 
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog

On Fri, 09 Jun 2017, Lee Jones wrote:

On Mon, 22 May 2017, Wolfram Sang wrote:

quoted

include/linux/i2c is not for client devices. Move the header file to a
more appropriate location.

Signed-off-by: Wolfram Sang <redacted>
---
 arch/blackfin/mach-bf537/boards/stamp.c        | 2 +-
 drivers/video/backlight/adp8870_bl.c           | 2 +-
 include/linux/{i2c => platform_data}/adp8870.h | 0
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename include/linux/{i2c => platform_data}/adp8870.h (100%)

Applied, thanks.

Scrap that.  I can't actually apply these without Steven's Ack.

quoted

diff --git a/arch/blackfin/mach-bf537/boards/stamp.c b/arch/blackfin/mach-bf537/boards/stamp.c
index 7db90c72bd8ddc..7528148dc4925b 100644
--- a/arch/blackfin/mach-bf537/boards/stamp.c
+++ b/arch/blackfin/mach-bf537/boards/stamp.c

@@ -1995,7 +1995,7 @@ static struct adp5588_gpio_platform_data adp5588_gpio_data = {
 #endif
 
 #if IS_ENABLED(CONFIG_BACKLIGHT_ADP8870)
-#include <linux/i2c/adp8870.h>
+#include <linux/platform_data/adp8870.h>
 static struct led_info adp8870_leds[] = {
 	{
 		.name = "adp8870-led7",

diff --git a/drivers/video/backlight/adp8870_bl.c b/drivers/video/backlight/adp8870_bl.c
index 21acac90fd773f..058d1def2d1f4b 100644
--- a/drivers/video/backlight/adp8870_bl.c
+++ b/drivers/video/backlight/adp8870_bl.c

@@ -18,7 +18,7 @@
 #include <linux/workqueue.h>
 #include <linux/slab.h>
 
-#include <linux/i2c/adp8870.h>
+#include <linux/platform_data/adp8870.h>
 #define ADP8870_EXT_FEATURES
 #define ADP8870_USE_LEDS
 

diff --git a/include/linux/i2c/adp8870.h b/include/linux/platform_data/adp8870.h
similarity index 100%
rename from include/linux/i2c/adp8870.h
rename to include/linux/platform_data/adp8870.h

-- 
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog

On Fri, 09 Jun 2017, Lee Jones wrote:

On Mon, 22 May 2017, Wolfram Sang wrote:

quoted

include/linux/i2c is not for client devices. Move the header file to a
more appropriate location.

Signed-off-by: Wolfram Sang <redacted>
---
 arch/blackfin/mach-bf537/boards/stamp.c        | 2 +-
 drivers/video/backlight/adp8860_bl.c           | 2 +-
 include/linux/{i2c => platform_data}/adp8860.h | 0
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename include/linux/{i2c => platform_data}/adp8860.h (100%)

Applied, thanks.

Scrap that.  I can't actually apply these without Steven's Ack.

quoted

diff --git a/arch/blackfin/mach-bf537/boards/stamp.c b/arch/blackfin/mach-bf537/boards/stamp.c
index 24985e658c19cd..7db90c72bd8ddc 100644
--- a/arch/blackfin/mach-bf537/boards/stamp.c
+++ b/arch/blackfin/mach-bf537/boards/stamp.c

@@ -2047,7 +2047,7 @@ static struct adp8870_backlight_platform_data adp8870_pdata = {
 #endif
 
 #if IS_ENABLED(CONFIG_BACKLIGHT_ADP8860)
-#include <linux/i2c/adp8860.h>
+#include <linux/platform_data/adp8860.h>
 static struct led_info adp8860_leds[] = {
 	{
 		.name = "adp8860-led7",

diff --git a/drivers/video/backlight/adp8860_bl.c b/drivers/video/backlight/adp8860_bl.c
index 510e559c060e59..e7315bf14d6015 100644
--- a/drivers/video/backlight/adp8860_bl.c
+++ b/drivers/video/backlight/adp8860_bl.c

@@ -18,7 +18,7 @@
 #include <linux/slab.h>
 #include <linux/workqueue.h>
 
-#include <linux/i2c/adp8860.h>
+#include <linux/platform_data/adp8860.h>
 #define ADP8860_EXT_FEATURES
 #define ADP8860_USE_LEDS
 

diff --git a/include/linux/i2c/adp8860.h b/include/linux/platform_data/adp8860.h
similarity index 100%
rename from include/linux/i2c/adp8860.h
rename to include/linux/platform_data/adp8860.h

-- 
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog