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 <andriy.shevchenko@xxxxxxxxxxxxxxx>
> Reviewed-by: Andy Shevchenko <andy.shevchenko@xxxxxxxxx>
> Signed-off-by: Ognjen Galic <smclt30p@xxxxxxxxx>
Reviewed-by: Sebastian Reichel <sebastian.reichel@xxxxxxxxxxxxxxx>
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
>
Attachment:
signature.asc
Description: PGP signature
