|
From: Ognjen G. <smc...@gm...> - 2017-12-21 19:54:45
|
This patch adds the to_power_supply macro to upcast
a device to a power_supply struct.
This is needed because the same piece of code using
container_of is used in various other places, so we
abstract away such low-level operations via a macro.
---
v9:
* Split the pm changes from the thinkpad_acpi patch
into its own patch
Signed-off-by: Ognjen Galic <smc...@gm...>
---
drivers/power/supply/power_supply_core.c | 2 +-
include/linux/power_supply.h | 2 ++
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/power/supply/power_supply_core.c b/drivers/power/supply/power_supply_core.c
index 82f998a..feac7b0 100644
--- a/drivers/power/supply/power_supply_core.c
+++ b/drivers/power/supply/power_supply_core.c
@@ -668,7 +668,7 @@ EXPORT_SYMBOL_GPL(power_supply_powers);
static void power_supply_dev_release(struct device *dev)
{
- struct power_supply *psy = container_of(dev, struct power_supply, dev);
+ struct power_supply *psy = to_power_supply(dev);
dev_dbg(dev, "%s\n", __func__);
kfree(psy);
}
diff --git a/include/linux/power_supply.h b/include/linux/power_supply.h
index 79e90b3..f0139b4 100644
--- a/include/linux/power_supply.h
+++ b/include/linux/power_supply.h
@@ -371,6 +371,8 @@ devm_power_supply_register_no_ws(struct device *parent,
extern void power_supply_unregister(struct power_supply *psy);
extern int power_supply_powers(struct power_supply *psy, struct device *dev);
+#define to_power_supply(device) container_of(device, struct power_supply, dev)
+
extern void *power_supply_get_drvdata(struct power_supply *psy);
/* For APM emulation, think legacy userspace. */
extern struct class *power_supply_class;
--
2.7.4
|
|
From: Ognjen G. <smc...@gm...> - 2017-12-23 10:53:24
|
This patch adds the to_power_supply macro to upcast
a device to a power_supply struct.
This is needed because the same piece of code using
container_of is used in various other places, so we
abstract away such low-level operations via a macro.
---
v9:
* Split the pm changes from the thinkpad_acpi patch
into its own patch
v10:
* No changes in this patch in v10
Signed-off-by: Ognjen Galic <smc...@gm...>
---
drivers/power/supply/power_supply_core.c | 2 +-
include/linux/power_supply.h | 2 ++
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/power/supply/power_supply_core.c b/drivers/power/supply/power_supply_core.c
index 82f998a..feac7b0 100644
--- a/drivers/power/supply/power_supply_core.c
+++ b/drivers/power/supply/power_supply_core.c
@@ -668,7 +668,7 @@ EXPORT_SYMBOL_GPL(power_supply_powers);
static void power_supply_dev_release(struct device *dev)
{
- struct power_supply *psy = container_of(dev, struct power_supply, dev);
+ struct power_supply *psy = to_power_supply(dev);
dev_dbg(dev, "%s\n", __func__);
kfree(psy);
}
diff --git a/include/linux/power_supply.h b/include/linux/power_supply.h
index 79e90b3..f0139b4 100644
--- a/include/linux/power_supply.h
+++ b/include/linux/power_supply.h
@@ -371,6 +371,8 @@ devm_power_supply_register_no_ws(struct device *parent,
extern void power_supply_unregister(struct power_supply *psy);
extern int power_supply_powers(struct power_supply *psy, struct device *dev);
+#define to_power_supply(device) container_of(device, struct power_supply, dev)
+
extern void *power_supply_get_drvdata(struct power_supply *psy);
/* For APM emulation, think legacy userspace. */
extern struct class *power_supply_class;
--
2.7.4
|
|
From: Andy S. <and...@gm...> - 2017-12-28 08:19:39
|
On Sat, Dec 23, 2017 at 12:53 PM, Ognjen Galic <smc...@gm...> wrote:
> This patch adds the to_power_supply macro to upcast
> a device to a power_supply struct.
>
> This is needed because the same piece of code using
> container_of is used in various other places, so we
> abstract away such low-level operations via a macro.
> ---
This is wrong! You have to use *existing* --- line below. Otherwise
all mail parsers will cut this out including your SoB tag.
>
> v9:
> * Split the pm changes from the thinkpad_acpi patch
> into its own patch
>
> v10:
> * No changes in this patch in v10
>
> Signed-off-by: Ognjen Galic <smc...@gm...>
Missed:
Suggested-by: Andy Shevchenko <and...@li...>
> ---
> drivers/power/supply/power_supply_core.c | 2 +-
> include/linux/power_supply.h | 2 ++
> 2 files changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/power/supply/power_supply_core.c b/drivers/power/supply/power_supply_core.c
> index 82f998a..feac7b0 100644
> --- a/drivers/power/supply/power_supply_core.c
> +++ b/drivers/power/supply/power_supply_core.c
> @@ -668,7 +668,7 @@ EXPORT_SYMBOL_GPL(power_supply_powers);
>
> static void power_supply_dev_release(struct device *dev)
> {
> - struct power_supply *psy = container_of(dev, struct power_supply, dev);
> + struct power_supply *psy = to_power_supply(dev);
> dev_dbg(dev, "%s\n", __func__);
> kfree(psy);
> }
> diff --git a/include/linux/power_supply.h b/include/linux/power_supply.h
> index 79e90b3..f0139b4 100644
> --- a/include/linux/power_supply.h
> +++ b/include/linux/power_supply.h
> @@ -371,6 +371,8 @@ devm_power_supply_register_no_ws(struct device *parent,
> extern void power_supply_unregister(struct power_supply *psy);
> extern int power_supply_powers(struct power_supply *psy, struct device *dev);
>
> +#define to_power_supply(device) container_of(device, struct power_supply, dev)
> +
> extern void *power_supply_get_drvdata(struct power_supply *psy);
> /* For APM emulation, think legacy userspace. */
> extern struct class *power_supply_class;
Should fold in the changes you sent as a separate patch.
--
With Best Regards,
Andy Shevchenko
|
|
From: Ognjen G. <smc...@gm...> - 2017-12-29 23:50:07
|
On Čet, 2017-12-28 at 10:19 +0200, Andy Shevchenko wrote:
> On Sat, Dec 23, 2017 at 12:53 PM, Ognjen Galic <smc...@gm...>
> wrote:
> >
> > This patch adds the to_power_supply macro to upcast
> > a device to a power_supply struct.
> >
> > This is needed because the same piece of code using
> > container_of is used in various other places, so we
> > abstract away such low-level operations via a macro.
> >
> > ---
> This is wrong! You have to use *existing* --- line below. Otherwise
> all mail parsers will cut this out including your SoB tag.
>
My bad I guess. Want another patch revision with that fixed or
something?
> >
> >
> > v9:
> > * Split the pm changes from the thinkpad_acpi patch
> > into its own patch
> >
> > v10:
> > * No changes in this patch in v10
> >
> > Signed-off-by: Ognjen Galic <smc...@gm...>
> Missed:
>
> Suggested-by: Andy Shevchenko <and...@li...>
>
> >
> > ---
> > drivers/power/supply/power_supply_core.c | 2 +-
> > include/linux/power_supply.h | 2 ++
> > 2 files changed, 3 insertions(+), 1 deletion(-)
> >
> > diff --git a/drivers/power/supply/power_supply_core.c
> > b/drivers/power/supply/power_supply_core.c
> > index 82f998a..feac7b0 100644
> > --- a/drivers/power/supply/power_supply_core.c
> > +++ b/drivers/power/supply/power_supply_core.c
> > @@ -668,7 +668,7 @@ EXPORT_SYMBOL_GPL(power_supply_powers);
> >
> > static void power_supply_dev_release(struct device *dev)
> > {
> > - struct power_supply *psy = container_of(dev, struct
> > power_supply, dev);
> > + struct power_supply *psy = to_power_supply(dev);
> > dev_dbg(dev, "%s\n", __func__);
> > kfree(psy);
> > }
> > diff --git a/include/linux/power_supply.h
> > b/include/linux/power_supply.h
> > index 79e90b3..f0139b4 100644
> > --- a/include/linux/power_supply.h
> > +++ b/include/linux/power_supply.h
> > @@ -371,6 +371,8 @@ devm_power_supply_register_no_ws(struct device
> > *parent,
> > extern void power_supply_unregister(struct power_supply *psy);
> > extern int power_supply_powers(struct power_supply *psy, struct
> > device *dev);
> >
> > +#define to_power_supply(device) container_of(device, struct
> > power_supply, dev)
> > +
> > extern void *power_supply_get_drvdata(struct power_supply *psy);
> > /* For APM emulation, think legacy userspace. */
> > extern struct class *power_supply_class;
> Should fold in the changes you sent as a separate patch.
>
|
|
From: Andy S. <and...@gm...> - 2017-12-31 09:37:53
|
On Sat, Dec 30, 2017 at 1:49 AM, Ognjen Galić <smc...@gm...> wrote: > On Čet, 2017-12-28 at 10:19 +0200, Andy Shevchenko wrote: >> On Sat, Dec 23, 2017 at 12:53 PM, Ognjen Galic <smc...@gm...> >> wrote: >> > >> > This patch adds the to_power_supply macro to upcast >> > a device to a power_supply struct. >> > >> > This is needed because the same piece of code using >> > container_of is used in various other places, so we >> > abstract away such low-level operations via a macro. >> > >> > --- >> This is wrong! You have to use *existing* --- line below. Otherwise >> all mail parsers will cut this out including your SoB tag. >> > > My bad I guess. Want another patch revision with that fixed or > something? > You definitely need to send a new revision with all comments addressed. So far you didn't responce to them which I recognize as total agreement that they have to be addressed. -- With Best Regards, Andy Shevchenko |
|
From: Rafael J. W. <ra...@ke...> - 2017-12-31 11:17:55
|
On Sun, Dec 31, 2017 at 10:37 AM, Andy Shevchenko <and...@gm...> wrote: > On Sat, Dec 30, 2017 at 1:49 AM, Ognjen Galić <smc...@gm...> wrote: >> On Čet, 2017-12-28 at 10:19 +0200, Andy Shevchenko wrote: >>> On Sat, Dec 23, 2017 at 12:53 PM, Ognjen Galic <smc...@gm...> >>> wrote: >>> > >>> > This patch adds the to_power_supply macro to upcast >>> > a device to a power_supply struct. >>> > >>> > This is needed because the same piece of code using >>> > container_of is used in various other places, so we >>> > abstract away such low-level operations via a macro. >>> > >>> > --- >>> This is wrong! You have to use *existing* --- line below. Otherwise >>> all mail parsers will cut this out including your SoB tag. >>> >> >> My bad I guess. Want another patch revision with that fixed or >> something? >> > > You definitely need to send a new revision with all comments > addressed. So far you didn't responce to them which I recognize as > total agreement that they have to be addressed. I asked for not sending new versions before I have a chance to look at the current one in detail, but enough time has passed after the last one, so I agree. Sending a new version at this point won't hurt. :-) Thanks, Rafael |
|
From: Andy S. <and...@gm...> - 2017-12-31 12:40:48
|
On Sun, Dec 31, 2017 at 1:17 PM, Rafael J. Wysocki <ra...@ke...> wrote: > On Sun, Dec 31, 2017 at 10:37 AM, Andy Shevchenko > <and...@gm...> wrote: >> On Sat, Dec 30, 2017 at 1:49 AM, Ognjen Galić <smc...@gm...> wrote: >> You definitely need to send a new revision with all comments >> addressed. So far you didn't responce to them which I recognize as >> total agreement that they have to be addressed. > > I asked for not sending new versions before I have a chance to look at > the current one in detail, but enough time has passed after the last > one, so I agree. Sending a new version at this point won't hurt. :-) Thanks, Rafael, for clarification, that's exactly what I kept in mind when proposing a new version (I'm concerned as well of frequency of patch series to be not so high). -- With Best Regards, Andy Shevchenko |
|
From: Ognjen G. <smc...@gm...> - 2017-12-31 12:55:02
|
On Sun, Dec 31, 2017 at 02:40:41PM +0200, Andy Shevchenko wrote: > On Sun, Dec 31, 2017 at 1:17 PM, Rafael J. Wysocki <ra...@ke...> wrote: > > On Sun, Dec 31, 2017 at 10:37 AM, Andy Shevchenko > > <and...@gm...> wrote: > >> On Sat, Dec 30, 2017 at 1:49 AM, Ognjen Galić <smc...@gm...> wrote: > > >> You definitely need to send a new revision with all comments > >> addressed. So far you didn't responce to them which I recognize as > >> total agreement that they have to be addressed. > > > > I asked for not sending new versions before I have a chance to look at > > the current one in detail, but enough time has passed after the last > > one, so I agree. Sending a new version at this point won't hurt. :-) > > Thanks, Rafael, for clarification, that's exactly what I kept in mind > when proposing a new version (I'm concerned as well of frequency of > patch series to be not so high). > Well guys hold on tight, another patch revision is incoming: #11. Oh, and by the way, happy new year! > -- > With Best Regards, > Andy Shevchenko |
|
From: Ognjen G. <smc...@gm...> - 2017-12-31 14:17:11
|
This patch adds the to_power_supply macro to upcast
a device to a power_supply struct.
This is needed because the same piece of code using
container_of is used in various other places, so we
abstract away such low-level operations via a macro.
Suggested-by: Andy Shevchenko <and...@li...>
Signed-off-by: Ognjen Galic <smc...@gm...>
v9:
* Split the pm changes from the thinkpad_acpi patch
into its own patch
v10:
* No changes in this patch in v10
v11:
* Fix changelog formatting
---
drivers/power/supply/power_supply_core.c | 2 +-
include/linux/power_supply.h | 2 ++
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/power/supply/power_supply_core.c b/drivers/power/supply/power_supply_core.c
index 82f998a..feac7b0 100644
--- a/drivers/power/supply/power_supply_core.c
+++ b/drivers/power/supply/power_supply_core.c
@@ -668,7 +668,7 @@ EXPORT_SYMBOL_GPL(power_supply_powers);
static void power_supply_dev_release(struct device *dev)
{
- struct power_supply *psy = container_of(dev, struct power_supply, dev);
+ struct power_supply *psy = to_power_supply(dev);
dev_dbg(dev, "%s\n", __func__);
kfree(psy);
}
diff --git a/include/linux/power_supply.h b/include/linux/power_supply.h
index 79e90b3..f0139b4 100644
--- a/include/linux/power_supply.h
+++ b/include/linux/power_supply.h
@@ -371,6 +371,8 @@ devm_power_supply_register_no_ws(struct device *parent,
extern void power_supply_unregister(struct power_supply *psy);
extern int power_supply_powers(struct power_supply *psy, struct device *dev);
+#define to_power_supply(device) container_of(device, struct power_supply, dev)
+
extern void *power_supply_get_drvdata(struct power_supply *psy);
/* For APM emulation, think legacy userspace. */
extern struct class *power_supply_class;
--
2.7.4
|
|
From: Andy S. <and...@gm...> - 2018-01-01 09:56:24
|
On Sun, Dec 31, 2017 at 4:17 PM, Ognjen Galic <smc...@gm...> wrote: > This patch adds the to_power_supply macro to upcast > a device to a power_supply struct. > > This is needed because the same piece of code using > container_of is used in various other places, so we > abstract away such low-level operations via a macro. The patch 5 must be folded into this one. I told you that. Otherwise you will leave bisectability issue. > Suggested-by: Andy Shevchenko <and...@li...> > Signed-off-by: Ognjen Galic <smc...@gm...> > > v9: > * Split the pm changes from the thinkpad_acpi patch > into its own patch > > v10: > * No changes in this patch in v10 > > v11: > * Fix changelog formatting Changelog should go *after* --- line... > --- ...to here. > drivers/power/supply/power_supply_core.c | 2 +- > include/linux/power_supply.h | 2 ++ -- With Best Regards, Andy Shevchenko |
|
From: Ognjen G. <smc...@gm...> - 2018-01-03 11:59:15
|
This patch adds the to_power_supply macro to upcast
a device to a power_supply struct.
This is needed because the same piece of code using
container_of is used in various other places, so we
abstract away such low-level operations via a macro.
Suggested-by: Andy Shevchenko <and...@li...>
Signed-off-by: Ognjen Galic <smc...@gm...>
---
Notes:
v9:
* Split the pm changes from the thinkpad_acpi patch
into its own patch
v10:
* No changes in this patch in v10
v11:
* Fix changelog formatting
v12:
* Fix build issues in ds2781 and ds2780 battery drivers
drivers/power/supply/ds2780_battery.c | 5 -----
drivers/power/supply/ds2781_battery.c | 5 -----
drivers/power/supply/power_supply_core.c | 2 +-
include/linux/power_supply.h | 2 ++
4 files changed, 3 insertions(+), 11 deletions(-)
diff --git a/drivers/power/supply/ds2780_battery.c b/drivers/power/supply/ds2780_battery.c
index e5d81b4..370e910 100644
--- a/drivers/power/supply/ds2780_battery.c
+++ b/drivers/power/supply/ds2780_battery.c
@@ -56,11 +56,6 @@ to_ds2780_device_info(struct power_supply *psy)
return power_supply_get_drvdata(psy);
}
-static inline struct power_supply *to_power_supply(struct device *dev)
-{
- return dev_get_drvdata(dev);
-}
-
static inline int ds2780_battery_io(struct ds2780_device_info *dev_info,
char *buf, int addr, size_t count, int io)
{
diff --git a/drivers/power/supply/ds2781_battery.c b/drivers/power/supply/ds2781_battery.c
index efe83ef..d1b5a19 100644
--- a/drivers/power/supply/ds2781_battery.c
+++ b/drivers/power/supply/ds2781_battery.c
@@ -54,11 +54,6 @@ to_ds2781_device_info(struct power_supply *psy)
return power_supply_get_drvdata(psy);
}
-static inline struct power_supply *to_power_supply(struct device *dev)
-{
- return dev_get_drvdata(dev);
-}
-
static inline int ds2781_battery_io(struct ds2781_device_info *dev_info,
char *buf, int addr, size_t count, int io)
{
diff --git a/drivers/power/supply/power_supply_core.c b/drivers/power/supply/power_supply_core.c
index 82f998a..feac7b0 100644
--- a/drivers/power/supply/power_supply_core.c
+++ b/drivers/power/supply/power_supply_core.c
@@ -668,7 +668,7 @@ EXPORT_SYMBOL_GPL(power_supply_powers);
static void power_supply_dev_release(struct device *dev)
{
- struct power_supply *psy = container_of(dev, struct power_supply, dev);
+ struct power_supply *psy = to_power_supply(dev);
dev_dbg(dev, "%s\n", __func__);
kfree(psy);
}
diff --git a/include/linux/power_supply.h b/include/linux/power_supply.h
index 79e90b3..f0139b4 100644
--- a/include/linux/power_supply.h
+++ b/include/linux/power_supply.h
@@ -371,6 +371,8 @@ devm_power_supply_register_no_ws(struct device *parent,
extern void power_supply_unregister(struct power_supply *psy);
extern int power_supply_powers(struct power_supply *psy, struct device *dev);
+#define to_power_supply(device) container_of(device, struct power_supply, dev)
+
extern void *power_supply_get_drvdata(struct power_supply *psy);
/* For APM emulation, think legacy userspace. */
extern struct class *power_supply_class;
--
2.7.4
|
|
From: Andy S. <and...@gm...> - 2018-01-03 14:34:42
|
On Wed, Jan 3, 2018 at 1:59 PM, Ognjen Galic <smc...@gm...> wrote:
> This patch adds the to_power_supply macro to upcast
> a device to a power_supply struct.
>
> This is needed because the same piece of code using
> container_of is used in various other places, so we
> abstract away such low-level operations via a macro.
>
> Suggested-by: Andy Shevchenko <and...@li...>
> Signed-off-by: Ognjen Galic <smc...@gm...>
It took me a while to understand if those private implementations are
equivalent to what you introduced.
Looks so sysfs_create_group() adds the attributes to power supply
device kobject, thus the struct device pointer in the callback will be
power supply child, not the actual hardware which seems correct.
Reviewed-by: Andy Shevchenko <and...@gm...>
> ---
>
> Notes:
> v9:
> * Split the pm changes from the thinkpad_acpi patch
> into its own patch
>
> v10:
> * No changes in this patch in v10
>
> v11:
> * Fix changelog formatting
>
> v12:
> * Fix build issues in ds2781 and ds2780 battery drivers
>
> drivers/power/supply/ds2780_battery.c | 5 -----
> drivers/power/supply/ds2781_battery.c | 5 -----
> drivers/power/supply/power_supply_core.c | 2 +-
> include/linux/power_supply.h | 2 ++
> 4 files changed, 3 insertions(+), 11 deletions(-)
>
> diff --git a/drivers/power/supply/ds2780_battery.c b/drivers/power/supply/ds2780_battery.c
> index e5d81b4..370e910 100644
> --- a/drivers/power/supply/ds2780_battery.c
> +++ b/drivers/power/supply/ds2780_battery.c
> @@ -56,11 +56,6 @@ to_ds2780_device_info(struct power_supply *psy)
> return power_supply_get_drvdata(psy);
> }
>
> -static inline struct power_supply *to_power_supply(struct device *dev)
> -{
> - return dev_get_drvdata(dev);
> -}
> -
> static inline int ds2780_battery_io(struct ds2780_device_info *dev_info,
> char *buf, int addr, size_t count, int io)
> {
> diff --git a/drivers/power/supply/ds2781_battery.c b/drivers/power/supply/ds2781_battery.c
> index efe83ef..d1b5a19 100644
> --- a/drivers/power/supply/ds2781_battery.c
> +++ b/drivers/power/supply/ds2781_battery.c
> @@ -54,11 +54,6 @@ to_ds2781_device_info(struct power_supply *psy)
> return power_supply_get_drvdata(psy);
> }
>
> -static inline struct power_supply *to_power_supply(struct device *dev)
> -{
> - return dev_get_drvdata(dev);
> -}
> -
> static inline int ds2781_battery_io(struct ds2781_device_info *dev_info,
> char *buf, int addr, size_t count, int io)
> {
> diff --git a/drivers/power/supply/power_supply_core.c b/drivers/power/supply/power_supply_core.c
> index 82f998a..feac7b0 100644
> --- a/drivers/power/supply/power_supply_core.c
> +++ b/drivers/power/supply/power_supply_core.c
> @@ -668,7 +668,7 @@ EXPORT_SYMBOL_GPL(power_supply_powers);
>
> static void power_supply_dev_release(struct device *dev)
> {
> - struct power_supply *psy = container_of(dev, struct power_supply, dev);
> + struct power_supply *psy = to_power_supply(dev);
> dev_dbg(dev, "%s\n", __func__);
> kfree(psy);
> }
> diff --git a/include/linux/power_supply.h b/include/linux/power_supply.h
> index 79e90b3..f0139b4 100644
> --- a/include/linux/power_supply.h
> +++ b/include/linux/power_supply.h
> @@ -371,6 +371,8 @@ devm_power_supply_register_no_ws(struct device *parent,
> extern void power_supply_unregister(struct power_supply *psy);
> extern int power_supply_powers(struct power_supply *psy, struct device *dev);
>
> +#define to_power_supply(device) container_of(device, struct power_supply, dev)
> +
> extern void *power_supply_get_drvdata(struct power_supply *psy);
> /* For APM emulation, think legacy userspace. */
> extern struct class *power_supply_class;
> --
> 2.7.4
>
--
With Best Regards,
Andy Shevchenko
|
|
From: Ognjen G. <smc...@gm...> - 2018-02-07 14:58:39
|
This patch adds the to_power_supply macro to upcast
a device to a power_supply struct.
This is needed because the same piece of code using
container_of is used in various other places, so we
abstract away such low-level operations via a macro.
Suggested-by: Andy Shevchenko <and...@li...>
Reviewed-by: Andy Shevchenko <and...@gm...>
Signed-off-by: Ognjen Galic <smc...@gm...>
---
Notes:
v9:
* Split the pm changes from the thinkpad_acpi patch
into its own patch
v10:
* No changes in this patch in v10
v11:
* Fix changelog formatting
v12:
* Fix build issues in ds2781 and ds2780 battery driver
v13:
* No changes in this patch in v13
drivers/power/supply/ds2780_battery.c | 5 -----
drivers/power/supply/ds2781_battery.c | 5 -----
drivers/power/supply/power_supply_core.c | 2 +-
include/linux/power_supply.h | 2 ++
4 files changed, 3 insertions(+), 11 deletions(-)
diff --git a/drivers/power/supply/ds2780_battery.c b/drivers/power/supply/ds2780_battery.c
index e5d81b493..370e91093 100644
--- a/drivers/power/supply/ds2780_battery.c
+++ b/drivers/power/supply/ds2780_battery.c
@@ -56,11 +56,6 @@ to_ds2780_device_info(struct power_supply *psy)
return power_supply_get_drvdata(psy);
}
-static inline struct power_supply *to_power_supply(struct device *dev)
-{
- return dev_get_drvdata(dev);
-}
-
static inline int ds2780_battery_io(struct ds2780_device_info *dev_info,
char *buf, int addr, size_t count, int io)
{
diff --git a/drivers/power/supply/ds2781_battery.c b/drivers/power/supply/ds2781_battery.c
index efe83ef86..d1b5a19aa 100644
--- a/drivers/power/supply/ds2781_battery.c
+++ b/drivers/power/supply/ds2781_battery.c
@@ -54,11 +54,6 @@ to_ds2781_device_info(struct power_supply *psy)
return power_supply_get_drvdata(psy);
}
-static inline struct power_supply *to_power_supply(struct device *dev)
-{
- return dev_get_drvdata(dev);
-}
-
static inline int ds2781_battery_io(struct ds2781_device_info *dev_info,
char *buf, int addr, size_t count, int io)
{
diff --git a/drivers/power/supply/power_supply_core.c b/drivers/power/supply/power_supply_core.c
index 82f998ab5..feac7b066 100644
--- a/drivers/power/supply/power_supply_core.c
+++ b/drivers/power/supply/power_supply_core.c
@@ -668,7 +668,7 @@ EXPORT_SYMBOL_GPL(power_supply_powers);
static void power_supply_dev_release(struct device *dev)
{
- struct power_supply *psy = container_of(dev, struct power_supply, dev);
+ struct power_supply *psy = to_power_supply(dev);
dev_dbg(dev, "%s\n", __func__);
kfree(psy);
}
diff --git a/include/linux/power_supply.h b/include/linux/power_supply.h
index 79e90b3d3..f0139b460 100644
--- a/include/linux/power_supply.h
+++ b/include/linux/power_supply.h
@@ -371,6 +371,8 @@ devm_power_supply_register_no_ws(struct device *parent,
extern void power_supply_unregister(struct power_supply *psy);
extern int power_supply_powers(struct power_supply *psy, struct device *dev);
+#define to_power_supply(device) container_of(device, struct power_supply, dev)
+
extern void *power_supply_get_drvdata(struct power_supply *psy);
/* For APM emulation, think legacy userspace. */
extern struct class *power_supply_class;
--
2.14.1
|
|
From: Sebastian R. <sr...@ke...> - 2018-02-08 21:57:16
Attachments:
signature.asc
|
Hi,
On Wed, Feb 07, 2018 at 03:58:27PM +0100, Ognjen Galic wrote:
> This patch adds the to_power_supply macro to upcast
> a device to a power_supply struct.
>
> This is needed because the same piece of code using
> container_of is used in various other places, so we
> abstract away such low-level operations via a macro.
>
> Suggested-by: Andy Shevchenko <and...@li...>
> Reviewed-by: Andy Shevchenko <and...@gm...>
> Signed-off-by: Ognjen Galic <smc...@gm...>
Reviewed-by: Sebastian Reichel <seb...@co...>
I suggest I provide an immutable branch for this one,
so that it can be used by the acpi subsystem for the
4.17 cycle.
-- Sebastian
> ---
>
> Notes:
> v9:
> * Split the pm changes from the thinkpad_acpi patch
> into its own patch
>
> v10:
> * No changes in this patch in v10
>
> v11:
> * Fix changelog formatting
>
> v12:
> * Fix build issues in ds2781 and ds2780 battery driver
>
> v13:
> * No changes in this patch in v13
>
> drivers/power/supply/ds2780_battery.c | 5 -----
> drivers/power/supply/ds2781_battery.c | 5 -----
> drivers/power/supply/power_supply_core.c | 2 +-
> include/linux/power_supply.h | 2 ++
> 4 files changed, 3 insertions(+), 11 deletions(-)
>
> diff --git a/drivers/power/supply/ds2780_battery.c b/drivers/power/supply/ds2780_battery.c
> index e5d81b493..370e91093 100644
> --- a/drivers/power/supply/ds2780_battery.c
> +++ b/drivers/power/supply/ds2780_battery.c
> @@ -56,11 +56,6 @@ to_ds2780_device_info(struct power_supply *psy)
> return power_supply_get_drvdata(psy);
> }
>
> -static inline struct power_supply *to_power_supply(struct device *dev)
> -{
> - return dev_get_drvdata(dev);
> -}
> -
> static inline int ds2780_battery_io(struct ds2780_device_info *dev_info,
> char *buf, int addr, size_t count, int io)
> {
> diff --git a/drivers/power/supply/ds2781_battery.c b/drivers/power/supply/ds2781_battery.c
> index efe83ef86..d1b5a19aa 100644
> --- a/drivers/power/supply/ds2781_battery.c
> +++ b/drivers/power/supply/ds2781_battery.c
> @@ -54,11 +54,6 @@ to_ds2781_device_info(struct power_supply *psy)
> return power_supply_get_drvdata(psy);
> }
>
> -static inline struct power_supply *to_power_supply(struct device *dev)
> -{
> - return dev_get_drvdata(dev);
> -}
> -
> static inline int ds2781_battery_io(struct ds2781_device_info *dev_info,
> char *buf, int addr, size_t count, int io)
> {
> diff --git a/drivers/power/supply/power_supply_core.c b/drivers/power/supply/power_supply_core.c
> index 82f998ab5..feac7b066 100644
> --- a/drivers/power/supply/power_supply_core.c
> +++ b/drivers/power/supply/power_supply_core.c
> @@ -668,7 +668,7 @@ EXPORT_SYMBOL_GPL(power_supply_powers);
>
> static void power_supply_dev_release(struct device *dev)
> {
> - struct power_supply *psy = container_of(dev, struct power_supply, dev);
> + struct power_supply *psy = to_power_supply(dev);
> dev_dbg(dev, "%s\n", __func__);
> kfree(psy);
> }
> diff --git a/include/linux/power_supply.h b/include/linux/power_supply.h
> index 79e90b3d3..f0139b460 100644
> --- a/include/linux/power_supply.h
> +++ b/include/linux/power_supply.h
> @@ -371,6 +371,8 @@ devm_power_supply_register_no_ws(struct device *parent,
> extern void power_supply_unregister(struct power_supply *psy);
> extern int power_supply_powers(struct power_supply *psy, struct device *dev);
>
> +#define to_power_supply(device) container_of(device, struct power_supply, dev)
> +
> extern void *power_supply_get_drvdata(struct power_supply *psy);
> /* For APM emulation, think legacy userspace. */
> extern struct class *power_supply_class;
> --
> 2.14.1
>
|
