[PATCH 2/5] power: convert pda_power to the new API

[Andres Salomon <dilinger@queued.net>]

Signed-off-by: Andres Salomon <dilinger@debian.org>
---
 drivers/power/pda_power.c |   40 ++++++++++++++++------------------------
 1 files changed, 16 insertions(+), 24 deletions(-)

diff --git a/drivers/power/pda_power.c b/drivers/power/pda_power.c
index c058f28..4012a2f 100644
--- a/drivers/power/pda_power.c
+++ b/drivers/power/pda_power.c
@@ -33,27 +33,23 @@ static struct resource *ac_irq, *usb_irq;
 static struct timer_list charger_timer;
 static struct timer_list supply_timer;
 
-static int pda_power_get_property(struct power_supply *psy,
-				  enum power_supply_property psp,
-				  union power_supply_propval *val)
+static ssize_t pda_power_online(struct device *dev,
+		struct device_attribute *attr, char *buf)
 {
-	switch (psp) {
-	case POWER_SUPPLY_PROP_ONLINE:
-		if (psy->type == POWER_SUPPLY_TYPE_MAINS)
-			val->intval = pdata->is_ac_online ?
-				      pdata->is_ac_online() : 0;
-		else
-			val->intval = pdata->is_usb_online ?
-				      pdata->is_usb_online() : 0;
-		break;
-	default:
-		return -EINVAL;
-	}
-	return 0;
+	struct power_supply *psy = dev_get_drvdata(dev);
+	int ret;
+
+	if (psy->type == POWER_SUPPLY_TYPE_MAINS)
+		ret = pdata->is_ac_online ? pdata->is_ac_online() : 0;
+	else
+		ret = pdata->is_usb_online ? pdata->is_usb_online() : 0;
+
+	return sprintf(buf, "%d\n", !!ret);
 }
 
-static enum power_supply_property pda_power_props[] = {
-	POWER_SUPPLY_PROP_ONLINE,
+static struct device_attribute pda_power_props[] = {
+	POWER_SUPPLY_ONLINE(pda_power_online),
+	POWER_SUPPLY_END
 };
 
 static char *pda_power_supplied_to[] = {
@@ -67,18 +63,14 @@ static struct power_supply pda_power_supplies[] = {
 		.type = POWER_SUPPLY_TYPE_MAINS,
 		.supplied_to = pda_power_supplied_to,
 		.num_supplicants = ARRAY_SIZE(pda_power_supplied_to),
-		.properties = pda_power_props,
-		.num_properties = ARRAY_SIZE(pda_power_props),
-		.get_property = pda_power_get_property,
+		.props = (struct device_attribute **) &pda_power_props,
 	},
 	{
 		.name = "usb",
 		.type = POWER_SUPPLY_TYPE_USB,
 		.supplied_to = pda_power_supplied_to,
 		.num_supplicants = ARRAY_SIZE(pda_power_supplied_to),
-		.properties = pda_power_props,
-		.num_properties = ARRAY_SIZE(pda_power_props),
-		.get_property = pda_power_get_property,
+		.props = (struct device_attribute **) &pda_power_props,
 	},
 };
 
-- 
1.5.3.5

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/