| Message ID | 20171231141757.GA4674@thinkpad (mailing list archive) |
|---|---|
| State | Superseded, archived |
| Headers | show |
On Sun, Dec 31, 2017 at 4:17 PM, Ognjen Galic <smclt30p@gmail.com> wrote: > This patch fixes a issue introduced by patch: > pm: add to_power_supply macro to the API > > In that patch a new macro has been defined in the > power_supply.h header with the same name as the private > function name in the ds278* battery modules that does the > same thing, thus clashing and producing build errors. > > This patch removes that private implementation. Must be folded into patch 2.
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) {
This patch fixes a issue introduced by patch: pm: add to_power_supply macro to the API In that patch a new macro has been defined in the power_supply.h header with the same name as the private function name in the ds278* battery modules that does the same thing, thus clashing and producing build errors. This patch removes that private implementation. Signed-off-by: Ognjen Galic <smclt30p@gmail.com> v11: * Fix build error pointed out by the Intel automated kernel build daemon/bot --- drivers/power/supply/ds2780_battery.c | 5 ----- drivers/power/supply/ds2781_battery.c | 5 ----- 2 files changed, 10 deletions(-)