diff options
| author | Ilpo Järvinen <ilpo.jarvinen@linux.intel.com> | 2025-07-21 16:37:27 +0300 |
|---|---|---|
| committer | Ilpo Järvinen <ilpo.jarvinen@linux.intel.com> | 2025-07-21 16:37:27 +0300 |
| commit | b5f20799f164053a0fbf7c61b3c99f8cf9cf0656 (patch) | |
| tree | 6aaa08ee1e8ef13313bb5785b1a0343b7576f69e /include/linux | |
| parent | 6e38b9fcbfa3053e1b5d2806a7233078d712bd34 (diff) | |
| parent | e2967b50b709970547b5cdfa1b42526835327f36 (diff) | |
| download | linux-b5f20799f164053a0fbf7c61b3c99f8cf9cf0656.tar.xz | |
Merge branch 'fixes' into 'for-next'
Merge the fixes branch into the for-next branch to resolve Makefile
conflict and include the power supply accessor work that is required
by the upcoming Uniwill driver.
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/power_supply.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/include/linux/power_supply.h b/include/linux/power_supply.h index 7803edaa8ff8..0cca01b5607b 100644 --- a/include/linux/power_supply.h +++ b/include/linux/power_supply.h @@ -888,15 +888,23 @@ static inline int power_supply_is_system_supplied(void) { return -ENOSYS; } extern int power_supply_get_property(struct power_supply *psy, enum power_supply_property psp, union power_supply_propval *val); +int power_supply_get_property_direct(struct power_supply *psy, enum power_supply_property psp, + union power_supply_propval *val); #if IS_ENABLED(CONFIG_POWER_SUPPLY) extern int power_supply_set_property(struct power_supply *psy, enum power_supply_property psp, const union power_supply_propval *val); +int power_supply_set_property_direct(struct power_supply *psy, enum power_supply_property psp, + const union power_supply_propval *val); #else static inline int power_supply_set_property(struct power_supply *psy, enum power_supply_property psp, const union power_supply_propval *val) { return 0; } +static inline int power_supply_set_property_direct(struct power_supply *psy, + enum power_supply_property psp, + const union power_supply_propval *val) +{ return 0; } #endif extern void power_supply_external_power_changed(struct power_supply *psy); |