Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1646430 > unrolled thread
| Started by | Wolfram Sang <wsa@the-dreams.de> |
|---|---|
| First post | 2017-05-21 22:40 +0200 |
| Last post | 2017-05-22 08:40 +0200 |
| Articles | 8 — 2 participants |
Back to article view | Back to linux.kernel
[PATCH 0/5] hwmon: move include files out of include/linux/i2c Wolfram Sang <wsa@the-dreams.de> - 2017-05-21 22:40 +0200
[PATCH 2/5] hwmon: ds620: move header file out of I2C realm Wolfram Sang <wsa@the-dreams.de> - 2017-05-21 22:40 +0200
[PATCH 5/5] hwmon: pmbus: move header file out of I2C realm Wolfram Sang <wsa@the-dreams.de> - 2017-05-21 22:40 +0200
[PATCH 1/5] hwmon: ads1015: move header file out of I2C realm Wolfram Sang <wsa@the-dreams.de> - 2017-05-21 22:40 +0200
[PATCH 3/5] hwmon: ltc4245: move header file out of I2C realm Wolfram Sang <wsa@the-dreams.de> - 2017-05-21 22:40 +0200
[PATCH 4/5] hwmon: max6639: move header file out of I2C realm Wolfram Sang <wsa@the-dreams.de> - 2017-05-21 22:40 +0200
Re: [PATCH 0/5] hwmon: move include files out of include/linux/i2c Guenter Roeck <linux@roeck-us.net> - 2017-05-22 05:10 +0200
Re: [PATCH 0/5] hwmon: move include files out of include/linux/i2c Wolfram Sang <wsa@the-dreams.de> - 2017-05-22 08:40 +0200
| From | Wolfram Sang <wsa@the-dreams.de> |
|---|---|
| Date | 2017-05-21 22:40 +0200 |
| Subject | [PATCH 0/5] hwmon: move include files out of include/linux/i2c |
| Message-ID | <tJFNT-49M-15@gated-at.bofh.it> |
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/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. pmbus.h got moved just one layer upwards, see the patch description
there.
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 (5):
hwmon: ads1015: move header file out of I2C realm
hwmon: ds620: move header file out of I2C realm
hwmon: ltc4245: move header file out of I2C realm
hwmon: max6639: move header file out of I2C realm
hwmon: pmbus: move header file out of I2C realm
Documentation/hwmon/ads1015 | 2 +-
Documentation/hwmon/ltc4245 | 2 +-
Documentation/hwmon/pmbus-core | 2 +-
MAINTAINERS | 4 ++--
drivers/hwmon/ads1015.c | 2 +-
drivers/hwmon/ds620.c | 2 +-
drivers/hwmon/ltc4245.c | 2 +-
drivers/hwmon/max6639.c | 2 +-
drivers/hwmon/pmbus/pmbus.c | 2 +-
drivers/hwmon/pmbus/pmbus_core.c | 2 +-
drivers/hwmon/pmbus/ucd9000.c | 2 +-
drivers/hwmon/pmbus/ucd9200.c | 2 +-
drivers/iio/adc/ti-ads1015.c | 2 +-
include/linux/{i2c => platform_data}/ads1015.h | 0
include/linux/{i2c => platform_data}/ds620.h | 0
include/linux/{i2c => platform_data}/ltc4245.h | 0
include/linux/{i2c => platform_data}/max6639.h | 0
include/linux/{i2c => }/pmbus.h | 0
18 files changed, 14 insertions(+), 14 deletions(-)
rename include/linux/{i2c => platform_data}/ads1015.h (100%)
rename include/linux/{i2c => platform_data}/ds620.h (100%)
rename include/linux/{i2c => platform_data}/ltc4245.h (100%)
rename include/linux/{i2c => platform_data}/max6639.h (100%)
rename include/linux/{i2c => }/pmbus.h (100%)
--
2.11.0
[toc] | [next] | [standalone]
| From | Wolfram Sang <wsa@the-dreams.de> |
|---|---|
| Date | 2017-05-21 22:40 +0200 |
| Subject | [PATCH 2/5] hwmon: ds620: move header file out of I2C realm |
| Message-ID | <tJFNU-49M-17@gated-at.bofh.it> |
| In reply to | #1646430 |
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/hwmon/ds620.c | 2 +-
include/linux/{i2c => platform_data}/ds620.h | 0
2 files changed, 1 insertion(+), 1 deletion(-)
rename include/linux/{i2c => platform_data}/ds620.h (100%)
diff --git a/drivers/hwmon/ds620.c b/drivers/hwmon/ds620.c
index 0043a4c02b85b4..57d6958c74b8fa 100644
--- a/drivers/hwmon/ds620.c
+++ b/drivers/hwmon/ds620.c
@@ -30,7 +30,7 @@
#include <linux/err.h>
#include <linux/mutex.h>
#include <linux/sysfs.h>
-#include <linux/i2c/ds620.h>
+#include <linux/platform_data/ds620.h>
/*
* Many DS620 constants specified below
diff --git a/include/linux/i2c/ds620.h b/include/linux/platform_data/ds620.h
similarity index 100%
rename from include/linux/i2c/ds620.h
rename to include/linux/platform_data/ds620.h
--
2.11.0
[toc] | [prev] | [next] | [standalone]
| From | Wolfram Sang <wsa@the-dreams.de> |
|---|---|
| Date | 2017-05-21 22:40 +0200 |
| Subject | [PATCH 5/5] hwmon: pmbus: move header file out of I2C realm |
| Message-ID | <tJFNU-49M-19@gated-at.bofh.it> |
| In reply to | #1646430 |
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>
---
I decided to not move it to 'platform_data' but just one level up because
'pmbus.h' sounds pretty generic to me like 'i2c.h'. And it might contain
different stuff than platform data somewhen? Let me know if you think
different. Thanks!
Documentation/hwmon/pmbus-core | 2 +-
MAINTAINERS | 2 +-
drivers/hwmon/pmbus/pmbus.c | 2 +-
drivers/hwmon/pmbus/pmbus_core.c | 2 +-
drivers/hwmon/pmbus/ucd9000.c | 2 +-
drivers/hwmon/pmbus/ucd9200.c | 2 +-
include/linux/{i2c => }/pmbus.h | 0
7 files changed, 6 insertions(+), 6 deletions(-)
rename include/linux/{i2c => }/pmbus.h (100%)
diff --git a/Documentation/hwmon/pmbus-core b/Documentation/hwmon/pmbus-core
index 31e4720fed18c7..8ed10e9ddfb589 100644
--- a/Documentation/hwmon/pmbus-core
+++ b/Documentation/hwmon/pmbus-core
@@ -253,7 +253,7 @@ Specifically, it provides the following information.
PMBus driver platform data
==========================
-PMBus platform data is defined in include/linux/i2c/pmbus.h. Platform data
+PMBus platform data is defined in include/linux/pmbus.h. Platform data
currently only provides a flag field with a single bit used.
#define PMBUS_SKIP_STATUS_CHECK (1 << 0)
diff --git a/MAINTAINERS b/MAINTAINERS
index 33541336258e77..259cf67ac17067 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -10155,7 +10155,7 @@ T: git git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git
S: Maintained
F: Documentation/hwmon/pmbus
F: drivers/hwmon/pmbus/
-F: include/linux/i2c/pmbus.h
+F: include/linux/pmbus.h
PMC SIERRA MaxRAID DRIVER
L: linux-scsi@vger.kernel.org
diff --git a/drivers/hwmon/pmbus/pmbus.c b/drivers/hwmon/pmbus/pmbus.c
index 44ca8a94873d62..7718e58dbda543 100644
--- a/drivers/hwmon/pmbus/pmbus.c
+++ b/drivers/hwmon/pmbus/pmbus.c
@@ -25,7 +25,7 @@
#include <linux/slab.h>
#include <linux/mutex.h>
#include <linux/i2c.h>
-#include <linux/i2c/pmbus.h>
+#include <linux/pmbus.h>
#include "pmbus.h"
/*
diff --git a/drivers/hwmon/pmbus/pmbus_core.c b/drivers/hwmon/pmbus/pmbus_core.c
index ba59eaef2e075a..f1eff6b6c79826 100644
--- a/drivers/hwmon/pmbus/pmbus_core.c
+++ b/drivers/hwmon/pmbus/pmbus_core.c
@@ -28,7 +28,7 @@
#include <linux/hwmon.h>
#include <linux/hwmon-sysfs.h>
#include <linux/jiffies.h>
-#include <linux/i2c/pmbus.h>
+#include <linux/pmbus.h>
#include <linux/regulator/driver.h>
#include <linux/regulator/machine.h>
#include "pmbus.h"
diff --git a/drivers/hwmon/pmbus/ucd9000.c b/drivers/hwmon/pmbus/ucd9000.c
index 3518f0c0893447..b74dbeca2e8d89 100644
--- a/drivers/hwmon/pmbus/ucd9000.c
+++ b/drivers/hwmon/pmbus/ucd9000.c
@@ -26,7 +26,7 @@
#include <linux/err.h>
#include <linux/slab.h>
#include <linux/i2c.h>
-#include <linux/i2c/pmbus.h>
+#include <linux/pmbus.h>
#include "pmbus.h"
enum chips { ucd9000, ucd90120, ucd90124, ucd90160, ucd9090, ucd90910 };
diff --git a/drivers/hwmon/pmbus/ucd9200.c b/drivers/hwmon/pmbus/ucd9200.c
index a8712c5ded4e93..3ed94585837a9d 100644
--- a/drivers/hwmon/pmbus/ucd9200.c
+++ b/drivers/hwmon/pmbus/ucd9200.c
@@ -25,7 +25,7 @@
#include <linux/err.h>
#include <linux/slab.h>
#include <linux/i2c.h>
-#include <linux/i2c/pmbus.h>
+#include <linux/pmbus.h>
#include "pmbus.h"
#define UCD9200_PHASE_INFO 0xd2
diff --git a/include/linux/i2c/pmbus.h b/include/linux/pmbus.h
similarity index 100%
rename from include/linux/i2c/pmbus.h
rename to include/linux/pmbus.h
--
2.11.0
[toc] | [prev] | [next] | [standalone]
| From | Wolfram Sang <wsa@the-dreams.de> |
|---|---|
| Date | 2017-05-21 22:40 +0200 |
| Subject | [PATCH 1/5] hwmon: ads1015: move header file out of I2C realm |
| Message-ID | <tJFNU-49M-23@gated-at.bofh.it> |
| In reply to | #1646430 |
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>
---
Documentation/hwmon/ads1015 | 2 +-
MAINTAINERS | 2 +-
drivers/hwmon/ads1015.c | 2 +-
drivers/iio/adc/ti-ads1015.c | 2 +-
include/linux/{i2c => platform_data}/ads1015.h | 0
5 files changed, 4 insertions(+), 4 deletions(-)
rename include/linux/{i2c => platform_data}/ads1015.h (100%)
diff --git a/Documentation/hwmon/ads1015 b/Documentation/hwmon/ads1015
index 063b80d857b1f8..02d2a459385f39 100644
--- a/Documentation/hwmon/ads1015
+++ b/Documentation/hwmon/ads1015
@@ -40,7 +40,7 @@ By default all inputs are exported.
Platform Data
-------------
-In linux/i2c/ads1015.h platform data is defined, channel_data contains
+In linux/platform_data/ads1015.h platform data is defined, channel_data contains
configuration data for the used input combinations:
- pga is the programmable gain amplifier (values are full scale)
0: +/- 6.144 V
diff --git a/MAINTAINERS b/MAINTAINERS
index 9e984645c4b08b..33541336258e77 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -478,7 +478,7 @@ L: linux-hwmon@vger.kernel.org
S: Maintained
F: Documentation/hwmon/ads1015
F: drivers/hwmon/ads1015.c
-F: include/linux/i2c/ads1015.h
+F: include/linux/platform_data/ads1015.h
ADT746X FAN DRIVER
M: Colin Leroy <colin@colino.net>
diff --git a/drivers/hwmon/ads1015.c b/drivers/hwmon/ads1015.c
index 5140c27d16dd03..357b4260716404 100644
--- a/drivers/hwmon/ads1015.c
+++ b/drivers/hwmon/ads1015.c
@@ -34,7 +34,7 @@
#include <linux/of_device.h>
#include <linux/of.h>
-#include <linux/i2c/ads1015.h>
+#include <linux/platform_data/ads1015.h>
/* ADS1015 registers */
enum {
diff --git a/drivers/iio/adc/ti-ads1015.c b/drivers/iio/adc/ti-ads1015.c
index f76d979fb7e86e..884b8e461b1755 100644
--- a/drivers/iio/adc/ti-ads1015.c
+++ b/drivers/iio/adc/ti-ads1015.c
@@ -23,7 +23,7 @@
#include <linux/mutex.h>
#include <linux/delay.h>
-#include <linux/i2c/ads1015.h>
+#include <linux/platform_data/ads1015.h>
#include <linux/iio/iio.h>
#include <linux/iio/types.h>
diff --git a/include/linux/i2c/ads1015.h b/include/linux/platform_data/ads1015.h
similarity index 100%
rename from include/linux/i2c/ads1015.h
rename to include/linux/platform_data/ads1015.h
--
2.11.0
[toc] | [prev] | [next] | [standalone]
| From | Wolfram Sang <wsa@the-dreams.de> |
|---|---|
| Date | 2017-05-21 22:40 +0200 |
| Subject | [PATCH 3/5] hwmon: ltc4245: move header file out of I2C realm |
| Message-ID | <tJFNU-49M-21@gated-at.bofh.it> |
| In reply to | #1646430 |
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>
---
Documentation/hwmon/ltc4245 | 2 +-
drivers/hwmon/ltc4245.c | 2 +-
include/linux/{i2c => platform_data}/ltc4245.h | 0
3 files changed, 2 insertions(+), 2 deletions(-)
rename include/linux/{i2c => platform_data}/ltc4245.h (100%)
diff --git a/Documentation/hwmon/ltc4245 b/Documentation/hwmon/ltc4245
index b478b086496586..4ca7a9da09f918 100644
--- a/Documentation/hwmon/ltc4245
+++ b/Documentation/hwmon/ltc4245
@@ -96,7 +96,7 @@ slowly, -EAGAIN will be returned when you read the sysfs attribute containing
the sensor reading.
The LTC4245 chip can be configured to sample all GPIO pins with two methods:
-1) platform data -- see include/linux/i2c/ltc4245.h
+1) platform data -- see include/linux/platform_data/ltc4245.h
2) OF device tree -- add the "ltc4245,use-extra-gpios" property to each chip
The default mode of operation is to sample a single GPIO pin.
diff --git a/drivers/hwmon/ltc4245.c b/drivers/hwmon/ltc4245.c
index 4680d89556ce80..082f0a0bd8a0f1 100644
--- a/drivers/hwmon/ltc4245.c
+++ b/drivers/hwmon/ltc4245.c
@@ -23,7 +23,7 @@
#include <linux/hwmon.h>
#include <linux/hwmon-sysfs.h>
#include <linux/jiffies.h>
-#include <linux/i2c/ltc4245.h>
+#include <linux/platform_data/ltc4245.h>
/* Here are names of the chip's registers (a.k.a. commands) */
enum ltc4245_cmd {
diff --git a/include/linux/i2c/ltc4245.h b/include/linux/platform_data/ltc4245.h
similarity index 100%
rename from include/linux/i2c/ltc4245.h
rename to include/linux/platform_data/ltc4245.h
--
2.11.0
[toc] | [prev] | [next] | [standalone]
| From | Wolfram Sang <wsa@the-dreams.de> |
|---|---|
| Date | 2017-05-21 22:40 +0200 |
| Subject | [PATCH 4/5] hwmon: max6639: move header file out of I2C realm |
| Message-ID | <tJFNU-49M-29@gated-at.bofh.it> |
| In reply to | #1646430 |
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/hwmon/max6639.c | 2 +-
include/linux/{i2c => platform_data}/max6639.h | 0
2 files changed, 1 insertion(+), 1 deletion(-)
rename include/linux/{i2c => platform_data}/max6639.h (100%)
diff --git a/drivers/hwmon/max6639.c b/drivers/hwmon/max6639.c
index dac6d85f2fd956..f98a83c79ff147 100644
--- a/drivers/hwmon/max6639.c
+++ b/drivers/hwmon/max6639.c
@@ -32,7 +32,7 @@
#include <linux/hwmon-sysfs.h>
#include <linux/err.h>
#include <linux/mutex.h>
-#include <linux/i2c/max6639.h>
+#include <linux/platform_data/max6639.h>
/* Addresses to scan */
static const unsigned short normal_i2c[] = { 0x2c, 0x2e, 0x2f, I2C_CLIENT_END };
diff --git a/include/linux/i2c/max6639.h b/include/linux/platform_data/max6639.h
similarity index 100%
rename from include/linux/i2c/max6639.h
rename to include/linux/platform_data/max6639.h
--
2.11.0
[toc] | [prev] | [next] | [standalone]
| From | Guenter Roeck <linux@roeck-us.net> |
|---|---|
| Date | 2017-05-22 05:10 +0200 |
| Message-ID | <tJLTk-8mL-1@gated-at.bofh.it> |
| In reply to | #1646430 |
On 05/21/2017 01:34 PM, Wolfram Sang wrote:
> 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/platform_data because that is what most of th > 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
While I understand where you are coming from, I am not typically that aggressive.
Such removals force vendors who are not really forthcoming with upstreaming to
deviate even further from upstream. It makes them even less likely to submit their
code upstream, and it may result in enforcing their belief that upstream doesn't
really care about vendors struggling to release boards and systems to their
customers.
> that now, but I did it for one i2c master driver recently. So, it may be
> possible. pmbus.h got moved just one layer upwards, see the patch description
> there.
>
> I prefer the series to go upstream via the subsystem tree; if you prefer that I
> take it via I2C, just let me know.
>
Series applied to hwmon-next.
Thanks,
Guenter
> 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 (5):
> hwmon: ads1015: move header file out of I2C realm
> hwmon: ds620: move header file out of I2C realm
> hwmon: ltc4245: move header file out of I2C realm
> hwmon: max6639: move header file out of I2C realm
> hwmon: pmbus: move header file out of I2C realm
>
> Documentation/hwmon/ads1015 | 2 +-
> Documentation/hwmon/ltc4245 | 2 +-
> Documentation/hwmon/pmbus-core | 2 +-
> MAINTAINERS | 4 ++--
> drivers/hwmon/ads1015.c | 2 +-
> drivers/hwmon/ds620.c | 2 +-
> drivers/hwmon/ltc4245.c | 2 +-
> drivers/hwmon/max6639.c | 2 +-
> drivers/hwmon/pmbus/pmbus.c | 2 +-
> drivers/hwmon/pmbus/pmbus_core.c | 2 +-
> drivers/hwmon/pmbus/ucd9000.c | 2 +-
> drivers/hwmon/pmbus/ucd9200.c | 2 +-
> drivers/iio/adc/ti-ads1015.c | 2 +-
> include/linux/{i2c => platform_data}/ads1015.h | 0
> include/linux/{i2c => platform_data}/ds620.h | 0
> include/linux/{i2c => platform_data}/ltc4245.h | 0
> include/linux/{i2c => platform_data}/max6639.h | 0
> include/linux/{i2c => }/pmbus.h | 0
> 18 files changed, 14 insertions(+), 14 deletions(-)
> rename include/linux/{i2c => platform_data}/ads1015.h (100%)
> rename include/linux/{i2c => platform_data}/ds620.h (100%)
> rename include/linux/{i2c => platform_data}/ltc4245.h (100%)
> rename include/linux/{i2c => platform_data}/max6639.h (100%)
> rename include/linux/{i2c => }/pmbus.h (100%)
>
[toc] | [prev] | [next] | [standalone]
| From | Wolfram Sang <wsa@the-dreams.de> |
|---|---|
| Date | 2017-05-22 08:40 +0200 |
| Message-ID | <tJPay-1Wl-11@gated-at.bofh.it> |
| In reply to | #1646496 |
[Multipart message — attachments visible in raw view] — view raw
Hi Guenter, > > 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 > > While I understand where you are coming from, I am not typically that aggressive. > Such removals force vendors who are not really forthcoming with upstreaming to > deviate even further from upstream. It makes them even less likely to submit their > code upstream, and it may result in enforcing their belief that upstream doesn't > really care about vendors struggling to release boards and systems to their > customers. I clearly see your point. I meant more the case where platform_data became cruft because platforms moved to DT. I agree this is not so much the case for HWMON but it was true for the I2C master driver where I could remove the platform data and could save the include file and some code. That was just a nice cleanup. > >I prefer the series to go upstream via the subsystem tree; if you prefer that I > >take it via I2C, just let me know. > > > Series applied to hwmon-next. Super, thanks! Regards, Wolfram
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web