* [PATCH 00/34] treewide: simplify getting the adapter of an I2C client
@ 2019-06-08 10:55 Wolfram Sang
2019-06-08 10:56 ` [PATCH 34/34] usb: typec: tcpm: fusb302: simplify getting the adapter of a client Wolfram Sang
` (2 more replies)
0 siblings, 3 replies; 7+ messages in thread
From: Wolfram Sang @ 2019-06-08 10:55 UTC (permalink / raw)
To: linux-i2c
Cc: Wolfram Sang, linux-renesas-soc, devel, dri-devel,
linux-arm-kernel, linux-clk, linux-iio, linux-kernel, linux-leds,
linux-media, linux-mtd, linux-pm, linux-rtc, linux-usb
While preparing a refactoring series, I noticed that some drivers use a
complicated way of determining the adapter of a client. The easy way is
to use the intended pointer: client->adapter
These drivers do:
to_i2c_adapter(client->dev.parent);
The I2C core populates the parent pointer as:
client->dev.parent = &client->adapter->dev;
Now take into consideration that
to_i2c_adapter(&adapter->dev);
is a complicated way of saying 'adapter', then we can even formally
prove that the complicated expression can be simplified by using
client->adapter.
The conversion was done using a coccinelle script with some manual
indentation fixes applied on top.
To avoid a brown paper bag mistake, I double checked this on a Renesas
Salvator-XS board (R-Car M3N) and verified both expression result in the
same pointer. Other than that, the series is only build tested.
A branch can be found here:
git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git i2c/no_to_adapter
Please apply the patches to the individual subsystem trees. There are no
dependencies.
Thanks and kind regards,
Wolfram
Wolfram Sang (34):
clk: clk-cdce706: simplify getting the adapter of a client
gpu: drm: bridge: sii9234: simplify getting the adapter of a client
iio: light: bh1780: simplify getting the adapter of a client
leds: leds-pca955x: simplify getting the adapter of a client
leds: leds-tca6507: simplify getting the adapter of a client
media: i2c: ak881x: simplify getting the adapter of a client
media: i2c: mt9m001: simplify getting the adapter of a client
media: i2c: mt9m111: simplify getting the adapter of a client
media: i2c: mt9p031: simplify getting the adapter of a client
media: i2c: ov2640: simplify getting the adapter of a client
media: i2c: tw9910: simplify getting the adapter of a client
misc: fsa9480: simplify getting the adapter of a client
misc: isl29003: simplify getting the adapter of a client
misc: tsl2550: simplify getting the adapter of a client
mtd: maps: pismo: simplify getting the adapter of a client
power: supply: bq24190_charger: simplify getting the adapter of a client
power: supply: bq24257_charger: simplify getting the adapter of a client
power: supply: bq25890_charger: simplify getting the adapter of a client
power: supply: max14656_charger_detector: simplify getting the adapter
of a client
power: supply: max17040_battery: simplify getting the adapter of a client
power: supply: max17042_battery: simplify getting the adapter of a client
power: supply: rt5033_battery: simplify getting the adapter of a client
power: supply: rt9455_charger: simplify getting the adapter of a client
power: supply: sbs-manager: simplify getting the adapter of a client
regulator: max8952: simplify getting the adapter of a client
rtc: fm3130: simplify getting the adapter of a client
rtc: m41t80: simplify getting the adapter of a client
rtc: rv8803: simplify getting the adapter of a client
rtc: rx8010: simplify getting the adapter of a client
rtc: rx8025: simplify getting the adapter of a client
staging: media: soc_camera: imx074: simplify getting the adapter of a client
staging: media: soc_camera: mt9t031: simplify getting the adapter of a client
staging: media: soc_camera: soc_mt9v022: simplify getting the adapter
of a client
usb: typec: tcpm: fusb302: simplify getting the adapter of a client
drivers/clk/clk-cdce706.c | 2 +-
drivers/gpu/drm/bridge/sii9234.c | 4 ++--
drivers/iio/light/bh1780.c | 2 +-
drivers/leds/leds-pca955x.c | 2 +-
drivers/leds/leds-tca6507.c | 2 +-
drivers/media/i2c/ak881x.c | 2 +-
drivers/media/i2c/mt9m001.c | 2 +-
drivers/media/i2c/mt9m111.c | 2 +-
drivers/media/i2c/mt9p031.c | 2 +-
drivers/media/i2c/ov2640.c | 2 +-
drivers/media/i2c/tw9910.c | 3 +--
drivers/misc/fsa9480.c | 2 +-
drivers/misc/isl29003.c | 2 +-
drivers/misc/tsl2550.c | 2 +-
drivers/mtd/maps/pismo.c | 2 +-
drivers/power/supply/bq24190_charger.c | 2 +-
drivers/power/supply/bq24257_charger.c | 2 +-
drivers/power/supply/bq25890_charger.c | 2 +-
drivers/power/supply/max14656_charger_detector.c | 2 +-
drivers/power/supply/max17040_battery.c | 2 +-
drivers/power/supply/max17042_battery.c | 2 +-
drivers/power/supply/rt5033_battery.c | 2 +-
drivers/power/supply/rt9455_charger.c | 2 +-
drivers/power/supply/sbs-manager.c | 2 +-
drivers/regulator/max8952.c | 2 +-
drivers/rtc/rtc-fm3130.c | 8 +++-----
drivers/rtc/rtc-m41t80.c | 2 +-
drivers/rtc/rtc-rv8803.c | 2 +-
drivers/rtc/rtc-rx8010.c | 2 +-
drivers/rtc/rtc-rx8025.c | 2 +-
drivers/staging/media/soc_camera/imx074.c | 2 +-
drivers/staging/media/soc_camera/mt9t031.c | 2 +-
drivers/staging/media/soc_camera/soc_mt9v022.c | 2 +-
drivers/usb/typec/tcpm/fusb302.c | 3 +--
34 files changed, 37 insertions(+), 41 deletions(-)
--
2.19.1
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH 34/34] usb: typec: tcpm: fusb302: simplify getting the adapter of a client
2019-06-08 10:55 [PATCH 00/34] treewide: simplify getting the adapter of an I2C client Wolfram Sang
@ 2019-06-08 10:56 ` Wolfram Sang
2019-06-08 12:59 ` Guenter Roeck
2019-06-09 16:37 ` [PATCH 00/34] treewide: simplify getting the adapter of an I2C client Peter Rosin
2019-06-27 18:28 ` Sebastian Reichel
2 siblings, 1 reply; 7+ messages in thread
From: Wolfram Sang @ 2019-06-08 10:56 UTC (permalink / raw)
To: linux-i2c
Cc: Wolfram Sang, Guenter Roeck, Heikki Krogerus, Greg Kroah-Hartman,
linux-usb, linux-kernel
We have a dedicated pointer for that, so use it. Much easier to read and
less computation involved.
Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
---
Please apply to your subsystem tree.
drivers/usb/typec/tcpm/fusb302.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/drivers/usb/typec/tcpm/fusb302.c b/drivers/usb/typec/tcpm/fusb302.c
index 7302f7501ec9..c524088246ee 100644
--- a/drivers/usb/typec/tcpm/fusb302.c
+++ b/drivers/usb/typec/tcpm/fusb302.c
@@ -1697,13 +1697,12 @@ static int fusb302_probe(struct i2c_client *client,
const struct i2c_device_id *id)
{
struct fusb302_chip *chip;
- struct i2c_adapter *adapter;
+ struct i2c_adapter *adapter = client->adapter;
struct device *dev = &client->dev;
const char *name;
int ret = 0;
u32 v;
- adapter = to_i2c_adapter(client->dev.parent);
if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_I2C_BLOCK)) {
dev_err(&client->dev,
"I2C/SMBus block functionality not supported!\n");
--
2.19.1
^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH 34/34] usb: typec: tcpm: fusb302: simplify getting the adapter of a client
2019-06-08 10:56 ` [PATCH 34/34] usb: typec: tcpm: fusb302: simplify getting the adapter of a client Wolfram Sang
@ 2019-06-08 12:59 ` Guenter Roeck
2019-06-13 9:54 ` Simon Horman
0 siblings, 1 reply; 7+ messages in thread
From: Guenter Roeck @ 2019-06-08 12:59 UTC (permalink / raw)
To: Wolfram Sang, linux-i2c
Cc: Heikki Krogerus, Greg Kroah-Hartman, linux-usb, linux-kernel
On 6/8/19 3:56 AM, Wolfram Sang wrote:
> We have a dedicated pointer for that, so use it. Much easier to read and
> less computation involved.
>
> Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
> ---
>
> Please apply to your subsystem tree.
>
> drivers/usb/typec/tcpm/fusb302.c | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/drivers/usb/typec/tcpm/fusb302.c b/drivers/usb/typec/tcpm/fusb302.c
> index 7302f7501ec9..c524088246ee 100644
> --- a/drivers/usb/typec/tcpm/fusb302.c
> +++ b/drivers/usb/typec/tcpm/fusb302.c
> @@ -1697,13 +1697,12 @@ static int fusb302_probe(struct i2c_client *client,
> const struct i2c_device_id *id)
> {
> struct fusb302_chip *chip;
> - struct i2c_adapter *adapter;
> + struct i2c_adapter *adapter = client->adapter;
> struct device *dev = &client->dev;
> const char *name;
> int ret = 0;
> u32 v;
>
> - adapter = to_i2c_adapter(client->dev.parent);
> if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_I2C_BLOCK)) {
> dev_err(&client->dev,
> "I2C/SMBus block functionality not supported!\n");
>
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 00/34] treewide: simplify getting the adapter of an I2C client
2019-06-08 10:55 [PATCH 00/34] treewide: simplify getting the adapter of an I2C client Wolfram Sang
2019-06-08 10:56 ` [PATCH 34/34] usb: typec: tcpm: fusb302: simplify getting the adapter of a client Wolfram Sang
@ 2019-06-09 16:37 ` Peter Rosin
2019-06-10 7:15 ` Wolfram Sang
2019-06-27 18:28 ` Sebastian Reichel
2 siblings, 1 reply; 7+ messages in thread
From: Peter Rosin @ 2019-06-09 16:37 UTC (permalink / raw)
To: Wolfram Sang, linux-i2c
Cc: linux-renesas-soc, devel, dri-devel, linux-arm-kernel, linux-clk,
linux-iio, linux-kernel, linux-leds, linux-media, linux-mtd,
linux-pm, linux-rtc, linux-usb
On 2019-06-08 12:55, Wolfram Sang wrote:
> While preparing a refactoring series, I noticed that some drivers use a
> complicated way of determining the adapter of a client. The easy way is
> to use the intended pointer: client->adapter
>
> These drivers do:
> to_i2c_adapter(client->dev.parent);
>
> The I2C core populates the parent pointer as:
> client->dev.parent = &client->adapter->dev;
>
> Now take into consideration that
> to_i2c_adapter(&adapter->dev);
>
> is a complicated way of saying 'adapter', then we can even formally
> prove that the complicated expression can be simplified by using
> client->adapter.
>
> The conversion was done using a coccinelle script with some manual
> indentation fixes applied on top.
>
> To avoid a brown paper bag mistake, I double checked this on a Renesas
> Salvator-XS board (R-Car M3N) and verified both expression result in the
> same pointer. Other than that, the series is only build tested.
Similar things go on in:
drivers/hwmon/lm90.c
drivers/leds/leds-is31fl319x.c
drivers/of/unittest.c
Those have this pattern:
struct device *dev = &client->dev;
struct i2c_adapter *adapter = to_i2c_adapter(dev->parent);
And drivers/rtc/rtc-fm3130.c has a couple of these:
tmp = i2c_transfer(to_i2c_adapter(fm3130->client->dev.parent),
...);
where fm3130->client is of type "struct i2c_client *"
Cheers,
Peter
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 00/34] treewide: simplify getting the adapter of an I2C client
2019-06-09 16:37 ` [PATCH 00/34] treewide: simplify getting the adapter of an I2C client Peter Rosin
@ 2019-06-10 7:15 ` Wolfram Sang
0 siblings, 0 replies; 7+ messages in thread
From: Wolfram Sang @ 2019-06-10 7:15 UTC (permalink / raw)
To: Peter Rosin
Cc: Wolfram Sang, linux-i2c, linux-renesas-soc, devel, dri-devel,
linux-arm-kernel, linux-clk, linux-iio, linux-kernel, linux-leds,
linux-media, linux-mtd, linux-pm, linux-rtc, linux-usb
[-- Attachment #1: Type: text/plain, Size: 305 bytes --]
Hi Peter,
> Similar things go on in:
>
> drivers/hwmon/lm90.c
> drivers/leds/leds-is31fl319x.c
> drivers/of/unittest.c
Right. I'll fix them, too.
> And drivers/rtc/rtc-fm3130.c has a couple of these:
These are fixed in patch 26 of this series.
Thanks and happy hacking,
Wolfram
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 34/34] usb: typec: tcpm: fusb302: simplify getting the adapter of a client
2019-06-08 12:59 ` Guenter Roeck
@ 2019-06-13 9:54 ` Simon Horman
0 siblings, 0 replies; 7+ messages in thread
From: Simon Horman @ 2019-06-13 9:54 UTC (permalink / raw)
To: Guenter Roeck
Cc: Wolfram Sang, linux-i2c, Heikki Krogerus, Greg Kroah-Hartman,
linux-usb, linux-kernel
On Sat, Jun 08, 2019 at 05:59:17AM -0700, Guenter Roeck wrote:
> On 6/8/19 3:56 AM, Wolfram Sang wrote:
> > We have a dedicated pointer for that, so use it. Much easier to read and
> > less computation involved.
> >
> > Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
>
> Reviewed-by: Guenter Roeck <linux@roeck-us.net>
Reviewed-by: Simon Horman <horms+renesas@verge.net.au>
>
> > ---
> >
> > Please apply to your subsystem tree.
> >
> > drivers/usb/typec/tcpm/fusb302.c | 3 +--
> > 1 file changed, 1 insertion(+), 2 deletions(-)
> >
> > diff --git a/drivers/usb/typec/tcpm/fusb302.c b/drivers/usb/typec/tcpm/fusb302.c
> > index 7302f7501ec9..c524088246ee 100644
> > --- a/drivers/usb/typec/tcpm/fusb302.c
> > +++ b/drivers/usb/typec/tcpm/fusb302.c
> > @@ -1697,13 +1697,12 @@ static int fusb302_probe(struct i2c_client *client,
> > const struct i2c_device_id *id)
> > {
> > struct fusb302_chip *chip;
> > - struct i2c_adapter *adapter;
> > + struct i2c_adapter *adapter = client->adapter;
> > struct device *dev = &client->dev;
> > const char *name;
> > int ret = 0;
> > u32 v;
> > - adapter = to_i2c_adapter(client->dev.parent);
> > if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_I2C_BLOCK)) {
> > dev_err(&client->dev,
> > "I2C/SMBus block functionality not supported!\n");
> >
>
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 00/34] treewide: simplify getting the adapter of an I2C client
2019-06-08 10:55 [PATCH 00/34] treewide: simplify getting the adapter of an I2C client Wolfram Sang
2019-06-08 10:56 ` [PATCH 34/34] usb: typec: tcpm: fusb302: simplify getting the adapter of a client Wolfram Sang
2019-06-09 16:37 ` [PATCH 00/34] treewide: simplify getting the adapter of an I2C client Peter Rosin
@ 2019-06-27 18:28 ` Sebastian Reichel
2 siblings, 0 replies; 7+ messages in thread
From: Sebastian Reichel @ 2019-06-27 18:28 UTC (permalink / raw)
To: Wolfram Sang
Cc: linux-i2c, linux-renesas-soc, devel, dri-devel, linux-arm-kernel,
linux-clk, linux-iio, linux-kernel, linux-leds, linux-media,
linux-mtd, linux-pm, linux-rtc, linux-usb
[-- Attachment #1: Type: text/plain, Size: 5906 bytes --]
Hi,
On Sat, Jun 08, 2019 at 12:55:39PM +0200, Wolfram Sang wrote:
> While preparing a refactoring series, I noticed that some drivers use a
> complicated way of determining the adapter of a client. The easy way is
> to use the intended pointer: client->adapter
>
> These drivers do:
> to_i2c_adapter(client->dev.parent);
>
> The I2C core populates the parent pointer as:
> client->dev.parent = &client->adapter->dev;
>
> Now take into consideration that
> to_i2c_adapter(&adapter->dev);
>
> is a complicated way of saying 'adapter', then we can even formally
> prove that the complicated expression can be simplified by using
> client->adapter.
>
> The conversion was done using a coccinelle script with some manual
> indentation fixes applied on top.
>
> To avoid a brown paper bag mistake, I double checked this on a Renesas
> Salvator-XS board (R-Car M3N) and verified both expression result in the
> same pointer. Other than that, the series is only build tested.
>
> A branch can be found here:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git i2c/no_to_adapter
>
> Please apply the patches to the individual subsystem trees. There are no
> dependencies.
>
> Thanks and kind regards,
>
> Wolfram
Thanks, I queued the patches prefixed with "power: supply: [...]".
-- Sebastian
> Wolfram Sang (34):
> clk: clk-cdce706: simplify getting the adapter of a client
> gpu: drm: bridge: sii9234: simplify getting the adapter of a client
> iio: light: bh1780: simplify getting the adapter of a client
> leds: leds-pca955x: simplify getting the adapter of a client
> leds: leds-tca6507: simplify getting the adapter of a client
> media: i2c: ak881x: simplify getting the adapter of a client
> media: i2c: mt9m001: simplify getting the adapter of a client
> media: i2c: mt9m111: simplify getting the adapter of a client
> media: i2c: mt9p031: simplify getting the adapter of a client
> media: i2c: ov2640: simplify getting the adapter of a client
> media: i2c: tw9910: simplify getting the adapter of a client
> misc: fsa9480: simplify getting the adapter of a client
> misc: isl29003: simplify getting the adapter of a client
> misc: tsl2550: simplify getting the adapter of a client
> mtd: maps: pismo: simplify getting the adapter of a client
> power: supply: bq24190_charger: simplify getting the adapter of a client
> power: supply: bq24257_charger: simplify getting the adapter of a client
> power: supply: bq25890_charger: simplify getting the adapter of a client
> power: supply: max14656_charger_detector: simplify getting the adapter
> of a client
> power: supply: max17040_battery: simplify getting the adapter of a client
> power: supply: max17042_battery: simplify getting the adapter of a client
> power: supply: rt5033_battery: simplify getting the adapter of a client
> power: supply: rt9455_charger: simplify getting the adapter of a client
> power: supply: sbs-manager: simplify getting the adapter of a client
> regulator: max8952: simplify getting the adapter of a client
> rtc: fm3130: simplify getting the adapter of a client
> rtc: m41t80: simplify getting the adapter of a client
> rtc: rv8803: simplify getting the adapter of a client
> rtc: rx8010: simplify getting the adapter of a client
> rtc: rx8025: simplify getting the adapter of a client
> staging: media: soc_camera: imx074: simplify getting the adapter of a client
> staging: media: soc_camera: mt9t031: simplify getting the adapter of a client
> staging: media: soc_camera: soc_mt9v022: simplify getting the adapter
> of a client
> usb: typec: tcpm: fusb302: simplify getting the adapter of a client
>
> drivers/clk/clk-cdce706.c | 2 +-
> drivers/gpu/drm/bridge/sii9234.c | 4 ++--
> drivers/iio/light/bh1780.c | 2 +-
> drivers/leds/leds-pca955x.c | 2 +-
> drivers/leds/leds-tca6507.c | 2 +-
> drivers/media/i2c/ak881x.c | 2 +-
> drivers/media/i2c/mt9m001.c | 2 +-
> drivers/media/i2c/mt9m111.c | 2 +-
> drivers/media/i2c/mt9p031.c | 2 +-
> drivers/media/i2c/ov2640.c | 2 +-
> drivers/media/i2c/tw9910.c | 3 +--
> drivers/misc/fsa9480.c | 2 +-
> drivers/misc/isl29003.c | 2 +-
> drivers/misc/tsl2550.c | 2 +-
> drivers/mtd/maps/pismo.c | 2 +-
> drivers/power/supply/bq24190_charger.c | 2 +-
> drivers/power/supply/bq24257_charger.c | 2 +-
> drivers/power/supply/bq25890_charger.c | 2 +-
> drivers/power/supply/max14656_charger_detector.c | 2 +-
> drivers/power/supply/max17040_battery.c | 2 +-
> drivers/power/supply/max17042_battery.c | 2 +-
> drivers/power/supply/rt5033_battery.c | 2 +-
> drivers/power/supply/rt9455_charger.c | 2 +-
> drivers/power/supply/sbs-manager.c | 2 +-
> drivers/regulator/max8952.c | 2 +-
> drivers/rtc/rtc-fm3130.c | 8 +++-----
> drivers/rtc/rtc-m41t80.c | 2 +-
> drivers/rtc/rtc-rv8803.c | 2 +-
> drivers/rtc/rtc-rx8010.c | 2 +-
> drivers/rtc/rtc-rx8025.c | 2 +-
> drivers/staging/media/soc_camera/imx074.c | 2 +-
> drivers/staging/media/soc_camera/mt9t031.c | 2 +-
> drivers/staging/media/soc_camera/soc_mt9v022.c | 2 +-
> drivers/usb/typec/tcpm/fusb302.c | 3 +--
> 34 files changed, 37 insertions(+), 41 deletions(-)
>
> --
> 2.19.1
>
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2019-06-27 18:28 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-06-08 10:55 [PATCH 00/34] treewide: simplify getting the adapter of an I2C client Wolfram Sang
2019-06-08 10:56 ` [PATCH 34/34] usb: typec: tcpm: fusb302: simplify getting the adapter of a client Wolfram Sang
2019-06-08 12:59 ` Guenter Roeck
2019-06-13 9:54 ` Simon Horman
2019-06-09 16:37 ` [PATCH 00/34] treewide: simplify getting the adapter of an I2C client Peter Rosin
2019-06-10 7:15 ` Wolfram Sang
2019-06-27 18:28 ` Sebastian Reichel
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).