power: drop support for old API

index 09013e8..f5bf67b 100644
@@ -57,8 +57,8 @@ void power_supply_changed(struct power_supply *psy)
 
 int power_supply_am_i_supplied(struct power_supply *psy)
 {
-	union power_supply_propval ret = {0,};
 	struct device *dev;
+	int ret;
 
 	down(&power_supply_class->sem);
 	list_for_each_entry(dev, &power_supply_class->devices, node) {

@@ -67,19 +67,12 @@ int power_supply_am_i_supplied(struct power_supply *psy)
 
 		for (i = 0; i < epsy->num_supplicants; i++) {
 			if (!strcmp(epsy->supplied_to[i], psy->name)) {
-				if (epsy->num_properties) {
-				if (epsy->get_property(epsy,
-					  POWER_SUPPLY_PROP_ONLINE, &ret))
-					continue;
-				} else {
-					/* new API */
 				struct device_attribute *attr;
 				attr = power_supply_find_attr(epsy, "online");
 				if (!attr || power_supply_attr_run(epsy, attr,
-						str_to_int, &ret.intval))
+						str_to_int, &ret))
 					continue;
-				}
-				if (ret.intval)
+				if (ret)
 					goto out;
 			}
 		}

@@ -87,9 +80,9 @@ int power_supply_am_i_supplied(struct power_supply *psy)
 out:
 	up(&power_supply_class->sem);
 
-	dev_dbg(psy->dev, "%s %d\n", __FUNCTION__, ret.intval);
+	dev_dbg(psy->dev, "%s %d\n", __FUNCTION__, ret);
 
-	return ret.intval;
+	return ret;
 }
 
 int power_supply_register(struct device *parent, struct power_supply *psy)

index 45539b7..b71c583 100644
@@ -16,23 +16,16 @@
 
 static void power_supply_update_bat_leds(struct power_supply *psy)
 {
-	union power_supply_propval status;
 	struct device_attribute *attr;
+	int status;
 
-	if (psy->num_properties) {
-	if (psy->get_property(psy, POWER_SUPPLY_PROP_STATUS, &status))
-		return;
-	} else {
-		/* new API */
 	attr = power_supply_find_attr(psy, "status");
-	if (!attr || power_supply_attr_run(psy, attr, str_to_int,
-			&status.intval))
+	if (!attr || power_supply_attr_run(psy, attr, str_to_int, &status))
 		return;
-	}
 
-	dev_dbg(psy->dev, "%s %d\n", __FUNCTION__, status.intval);
+	dev_dbg(psy->dev, "%s %d\n", __FUNCTION__, status);
 
-	switch (status.intval) {
+	switch (status) {
 	case POWER_SUPPLY_STATUS_FULL:
 		led_trigger_event(psy->charging_full_trig, LED_FULL);
 		led_trigger_event(psy->charging_trig, LED_OFF);

@@ -110,23 +103,16 @@ static void power_supply_remove_bat_triggers(struct power_supply *psy)
 
 static void power_supply_update_gen_leds(struct power_supply *psy)
 {
-	union power_supply_propval online;
 	struct device_attribute *attr;
+	int online;
 
-	if (psy->num_properties) {
-	if (psy->get_property(psy, POWER_SUPPLY_PROP_ONLINE, &online))
-		return;
-	} else {
-		/* new API */
 	attr = power_supply_find_attr(psy, "online");
-	if (!attr || power_supply_attr_run(psy, attr, str_to_int,
-			&online.intval))
+	if (!attr || power_supply_attr_run(psy, attr, str_to_int, &online))
 		return;
-	}
 
-	dev_dbg(psy->dev, "%s %d\n", __FUNCTION__, online.intval);
+	dev_dbg(psy->dev, "%s %d\n", __FUNCTION__, online);
 
-	if (online.intval)
+	if (online)
 		led_trigger_event(psy->online_trig, LED_FULL);
 	else
 		led_trigger_event(psy->online_trig, LED_OFF);

203 lines not on this page · raw message

67 lines not on this page · raw message