diff options
| author | Krzysztof Kozlowski <k.kozlowski@samsung.com> | 2015-07-30 16:00:57 +0900 |
|---|---|---|
| committer | Seung-Woo Kim <sw0312.kim@samsung.com> | 2016-12-14 13:46:56 +0900 |
| commit | e79660745ef9590f4c8cf38c571a9cbb19baa767 (patch) | |
| tree | deed433bfe326053f1eccb110369caba659c57f4 /drivers/power | |
| parent | 02c9f39a60d942db247eacd8d167a1819da91a1c (diff) | |
power_supply: charger-manager: Adjust to new API
Port the driver to new power supply API introduced in v4.1.
Fixes errors:
drivers/power/charger-manager.c: In function ‘update_battery_state’:
drivers/power/charger-manager.c:547:37: warning: initialization from incompatible pointer type [enabled by default]
struct power_supply *charger_psy = &cm->charger_psy;
^
drivers/power/charger-manager.c:553:19: error: ‘struct power_supply’ has no member named ‘get_property’
ret = charger_psy->get_property(charger_psy,
drivers/power/charger-manager.c: In function ‘show_polling_ms’:
drivers/power/charger-manager.c:1125:22: error: request for member ‘dev’ in something not a structure or union
if (cm->charger_psy.dev == dev)
^
drivers/power/charger-manager.c: In function ‘charger_manager_register_sysfs’:
drivers/power/charger-manager.c:1199:42: error: request for member ‘dev’ in something not a structure or union
ret = device_create_file(cm->charger_psy.dev, &dev_attr_polling_ms);
Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
Diffstat (limited to 'drivers/power')
| -rw-r--r-- | drivers/power/charger-manager.c | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/drivers/power/charger-manager.c b/drivers/power/charger-manager.c index 5ba678c37c90..0ca83d6b4c56 100644 --- a/drivers/power/charger-manager.c +++ b/drivers/power/charger-manager.c @@ -544,29 +544,26 @@ charging_ok: */ static bool update_battery_state(struct charger_manager *cm) { - struct power_supply *charger_psy = &cm->charger_psy; + struct power_supply *charger_psy = cm->charger_psy; union power_supply_propval val; int ret; bool updated = false; - /* FIXME: use wrapper */ - ret = charger_psy->get_property(charger_psy, + ret = power_supply_get_property(charger_psy, POWER_SUPPLY_PROP_CAPACITY, &val); if (!ret && cm->battery_soc != val.intval) { cm->battery_soc = val.intval; updated = true; } - /* FIXME: use wrapper */ - ret = charger_psy->get_property(charger_psy, + ret = power_supply_get_property(charger_psy, POWER_SUPPLY_PROP_VOLTAGE_NOW, &val); if (!ret && cm->battery_voltage != val.intval) { cm->battery_voltage = val.intval; updated = true; } - /* FIXME: use wrapper */ - ret = charger_psy->get_property(charger_psy, + ret = power_supply_get_property(charger_psy, POWER_SUPPLY_PROP_TEMP, &val); if (!ret && cm->battery_temperature != val.intval) { cm->battery_temperature = val.intval; @@ -1122,10 +1119,10 @@ static ssize_t show_polling_ms(struct device *dev, ssize_t len; list_for_each_entry(cm, &cm_list, entry) - if (cm->charger_psy.dev == dev) + if (&cm->charger_psy->dev == dev) break; - if (cm->charger_psy.dev != dev) + if (&cm->charger_psy->dev != dev) return -EINVAL; len = sprintf(buf, "%d\n", cm->desc->polling_interval_ms); @@ -1149,10 +1146,10 @@ static ssize_t store_polling_ms(struct device *dev, return -EINVAL; list_for_each_entry(cm, &cm_list, entry) - if (cm->charger_psy.dev == dev) + if (&cm->charger_psy->dev == dev) break; - if (cm->charger_psy.dev != dev) + if (&cm->charger_psy->dev != dev) return -ENODEV; cm->desc->polling_interval_ms = polling_ms; @@ -1196,7 +1193,7 @@ static int charger_manager_register_sysfs(struct charger_manager *cm) int i; /* Create polling_ms sysfs node */ - ret = device_create_file(cm->charger_psy.dev, &dev_attr_polling_ms); + ret = device_create_file(&cm->charger_psy->dev, &dev_attr_polling_ms); if (ret) pr_err("Failed to create poling_ms sysfs node (%d)\n", ret); |