aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/power
diff options
context:
space:
mode:
authorKrzysztof Kozlowski <k.kozlowski@samsung.com>2015-03-12 03:44:06 -0400
committerSebastian Reichel <sre@kernel.org>2015-03-13 18:15:49 -0400
commit15077fc1f78488169ee5b87f553d17c1afcb1255 (patch)
tree29d1d071ad87143af547f5672cd6a97989ed5bad /drivers/power
parent465c436b9e957c9db4770090e4c6086d97a6b893 (diff)
power_supply: ab8500: Use power_supply_*() API for accessing function attrs
Replace direct calls to power supply function attributes with wrappers. Wrappers provide safe access in case of unregistering the power supply (e.g. by removing the driver). Replace: - get_property -> power_supply_get_property Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com> Acked-by: Jonghwa Lee <jonghwa3.lee@samsung.com> Acked-by: Pavel Machek <pavel@ucw.cz> Acked-by: Linus Walleij <linus.walleij@linaro.org> Reviewed-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com> Reviewed-by: Sebastian Reichel <sre@kernel.org> Signed-off-by: Sebastian Reichel <sre@kernel.org>
Diffstat (limited to 'drivers/power')
-rw-r--r--drivers/power/ab8500_btemp.c2
-rw-r--r--drivers/power/ab8500_charger.c2
-rw-r--r--drivers/power/ab8500_fg.c2
-rw-r--r--drivers/power/abx500_chargalg.c4
4 files changed, 5 insertions, 5 deletions
diff --git a/drivers/power/ab8500_btemp.c b/drivers/power/ab8500_btemp.c
index d5683f503a4e..4d18464d6400 100644
--- a/drivers/power/ab8500_btemp.c
+++ b/drivers/power/ab8500_btemp.c
@@ -938,7 +938,7 @@ static int ab8500_btemp_get_ext_psy_data(struct device *dev, void *data)
938 enum power_supply_property prop; 938 enum power_supply_property prop;
939 prop = ext->properties[j]; 939 prop = ext->properties[j];
940 940
941 if (ext->get_property(ext, prop, &ret)) 941 if (power_supply_get_property(ext, prop, &ret))
942 continue; 942 continue;
943 943
944 switch (prop) { 944 switch (prop) {
diff --git a/drivers/power/ab8500_charger.c b/drivers/power/ab8500_charger.c
index cee9b9e46825..f9eb7fff1d65 100644
--- a/drivers/power/ab8500_charger.c
+++ b/drivers/power/ab8500_charger.c
@@ -1957,7 +1957,7 @@ static int ab8500_charger_get_ext_psy_data(struct device *dev, void *data)
1957 enum power_supply_property prop; 1957 enum power_supply_property prop;
1958 prop = ext->properties[j]; 1958 prop = ext->properties[j];
1959 1959
1960 if (ext->get_property(ext, prop, &ret)) 1960 if (power_supply_get_property(ext, prop, &ret))
1961 continue; 1961 continue;
1962 1962
1963 switch (prop) { 1963 switch (prop) {
diff --git a/drivers/power/ab8500_fg.c b/drivers/power/ab8500_fg.c
index 73bdb4dc4142..7a2e3ac44cf3 100644
--- a/drivers/power/ab8500_fg.c
+++ b/drivers/power/ab8500_fg.c
@@ -2200,7 +2200,7 @@ static int ab8500_fg_get_ext_psy_data(struct device *dev, void *data)
2200 enum power_supply_property prop; 2200 enum power_supply_property prop;
2201 prop = ext->properties[j]; 2201 prop = ext->properties[j];
2202 2202
2203 if (ext->get_property(ext, prop, &ret)) 2203 if (power_supply_get_property(ext, prop, &ret))
2204 continue; 2204 continue;
2205 2205
2206 switch (prop) { 2206 switch (prop) {
diff --git a/drivers/power/abx500_chargalg.c b/drivers/power/abx500_chargalg.c
index 0da4415cbc10..ac6f4a22f846 100644
--- a/drivers/power/abx500_chargalg.c
+++ b/drivers/power/abx500_chargalg.c
@@ -1001,7 +1001,7 @@ static int abx500_chargalg_get_ext_psy_data(struct device *dev, void *data)
1001 * property because of handling that sysfs entry on its own, this is 1001 * property because of handling that sysfs entry on its own, this is
1002 * the place to get the battery capacity. 1002 * the place to get the battery capacity.
1003 */ 1003 */
1004 if (!ext->get_property(ext, POWER_SUPPLY_PROP_CAPACITY, &ret)) { 1004 if (!power_supply_get_property(ext, POWER_SUPPLY_PROP_CAPACITY, &ret)) {
1005 di->batt_data.percent = ret.intval; 1005 di->batt_data.percent = ret.intval;
1006 capacity_updated = true; 1006 capacity_updated = true;
1007 } 1007 }
@@ -1019,7 +1019,7 @@ static int abx500_chargalg_get_ext_psy_data(struct device *dev, void *data)
1019 ext->type == POWER_SUPPLY_TYPE_USB) 1019 ext->type == POWER_SUPPLY_TYPE_USB)
1020 di->usb_chg = psy_to_ux500_charger(ext); 1020 di->usb_chg = psy_to_ux500_charger(ext);
1021 1021
1022 if (ext->get_property(ext, prop, &ret)) 1022 if (power_supply_get_property(ext, prop, &ret))
1023 continue; 1023 continue;
1024 switch (prop) { 1024 switch (prop) {
1025 case POWER_SUPPLY_PROP_PRESENT: 1025 case POWER_SUPPLY_PROP_PRESENT: