diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-11-15 15:22:51 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-11-15 15:22:51 -0800 |
| commit | ec7de6567ffdc8bdcf816365ef56bc0771afb63d (patch) | |
| tree | 2cc51323547be730d8ca8778304de4345d27e5d8 /include | |
| parent | e061167151b3caad080349aaa6eed594d0c745c4 (diff) | |
| parent | cdaf3e15385d3232b52287e50692506f8fd01a09 (diff) | |
| download | linux-stable-ec7de6567ffdc8bdcf816365ef56bc0771afb63d.tar.gz linux-stable-ec7de6567ffdc8bdcf816365ef56bc0771afb63d.tar.bz2 linux-stable-ec7de6567ffdc8bdcf816365ef56bc0771afb63d.zip | |
Merge tag 'for-v3.18-rc' of git://git.infradead.org/battery-2.6
Pull power supply updates from Sebastian Reichel:
"Power supply and reset changes for the v3.18-rc:
- misc. charger-manager fixes
- year 2038 fix in ab8500_fg
- fix error handling of bq2415x_charger"
* tag 'for-v3.18-rc' of git://git.infradead.org/battery-2.6:
power: charger-manager: Fix accessing invalidated power supply after charger unbind
power: charger-manager: Fix accessing invalidated power supply after fuel gauge unbind
power: charger-manager: Avoid recursive thermal get_temp call
power_supply: Add no_thermal property to prevent recursive get_temp calls
power: bq2415x_charger: Fix memory leak on DTS parsing error
power: bq2415x_charger: Properly handle ENODEV from power_supply_get_by_phandle
power: ab8500_fg.c: use 64-bit time types
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/power/charger-manager.h | 3 | ||||
| -rw-r--r-- | include/linux/power_supply.h | 6 |
2 files changed, 6 insertions, 3 deletions
diff --git a/include/linux/power/charger-manager.h b/include/linux/power/charger-manager.h index 07e7945a1ff2..e97fc656a058 100644 --- a/include/linux/power/charger-manager.h +++ b/include/linux/power/charger-manager.h @@ -253,9 +253,6 @@ struct charger_manager { struct device *dev; struct charger_desc *desc; - struct power_supply *fuel_gauge; - struct power_supply **charger_stat; - #ifdef CONFIG_THERMAL struct thermal_zone_device *tzd_batt; #endif diff --git a/include/linux/power_supply.h b/include/linux/power_supply.h index 3ed049673022..096dbced02ac 100644 --- a/include/linux/power_supply.h +++ b/include/linux/power_supply.h @@ -200,6 +200,12 @@ struct power_supply { void (*external_power_changed)(struct power_supply *psy); void (*set_charged)(struct power_supply *psy); + /* + * Set if thermal zone should not be created for this power supply. + * For example for virtual supplies forwarding calls to actual + * sensors or other supplies. + */ + bool no_thermal; /* For APM emulation, think legacy userspace. */ int use_for_apm; |