power: supply: olpc_battery: fix the power supply name

The framework is unhappy about them, because it uses the names in sysfs
attributes:

  power_supply olpc-ac: hwmon: 'olpc-ac' is not a valid name attribute, please fix
  power_supply olpc-battery: hwmon: 'olpc-battery' is not a valid name attribute, please fix

See also commit 648cd48c9e56 ("hwmon: Do not accept invalid name
attributes") and commit 74d3b6419772 ("hwmon: Relax name attribute
validation for new APIs").

Signed-off-by: Lubomir Rintel <lkundrak@v3.sk>
Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>

diff --git a/arch/x86/platform/olpc/olpc-xo1-sci.c b/arch/x86/platform/olpc/olpc-xo1-sci.c
index 933dd4fe3a974424b54b55971bbfad4ce1d3e43c..f03a6883dcc6de65ccd48138b9d30fb63f319146 100644 (file)
--- a/arch/x86/platform/olpc/olpc-xo1-sci.c
+++ b/arch/x86/platform/olpc/olpc-xo1-sci.c
@@ -52,7 +52,7 @@ static const char * const lid_wake_mode_names[] = {
 
 static void battery_status_changed(void)
 {
-       struct power_supply *psy = power_supply_get_by_name("olpc-battery");
+       struct power_supply *psy = power_supply_get_by_name("olpc_battery");
 
        if (psy) {
                power_supply_changed(psy);
@@ -62,7 +62,7 @@ static void battery_status_changed(void)
 
 static void ac_status_changed(void)
 {
-       struct power_supply *psy = power_supply_get_by_name("olpc-ac");
+       struct power_supply *psy = power_supply_get_by_name("olpc_ac");
 
        if (psy) {
                power_supply_changed(psy);

diff --git a/arch/x86/platform/olpc/olpc-xo15-sci.c b/arch/x86/platform/olpc/olpc-xo15-sci.c
index 089413cd944e7e85f6e472cac856e61110010771..85f4638764d69b87d310702cd3453518f1bc547e 100644 (file)
--- a/arch/x86/platform/olpc/olpc-xo15-sci.c
+++ b/arch/x86/platform/olpc/olpc-xo15-sci.c
@@ -75,7 +75,7 @@ static struct kobj_attribute lid_wake_on_close_attr =
 
 static void battery_status_changed(void)
 {
-       struct power_supply *psy = power_supply_get_by_name("olpc-battery");
+       struct power_supply *psy = power_supply_get_by_name("olpc_battery");
 
        if (psy) {
                power_supply_changed(psy);
@@ -85,7 +85,7 @@ static void battery_status_changed(void)
 
 static void ac_status_changed(void)
 {
-       struct power_supply *psy = power_supply_get_by_name("olpc-ac");
+       struct power_supply *psy = power_supply_get_by_name("olpc_ac");
 
        if (psy) {
                power_supply_changed(psy);

diff --git a/drivers/platform/olpc/olpc-xo175-ec.c b/drivers/platform/olpc/olpc-xo175-ec.c
index 83ed1fbf73cfddaf6aaee0a28b9e843c5ac6f1f1..5e1d14e35f20b19a154e028a5d5ca52166e2c066 100644 (file)
--- a/drivers/platform/olpc/olpc-xo175-ec.c
+++ b/drivers/platform/olpc/olpc-xo175-ec.c
@@ -410,7 +410,7 @@ static void olpc_xo175_ec_complete(void *arg)
                dev_dbg(dev, "got event %.2x\n", byte);
                switch (byte) {
                case EVENT_AC_CHANGE:
-                       psy = power_supply_get_by_name("olpc-ac");
+                       psy = power_supply_get_by_name("olpc_ac");
                        if (psy) {
                                power_supply_changed(psy);
                                power_supply_put(psy);
@@ -420,7 +420,7 @@ static void olpc_xo175_ec_complete(void *arg)
                case EVENT_BATTERY_CRITICAL:
                case EVENT_BATTERY_SOC_CHANGE:
                case EVENT_BATTERY_ERROR:
-                       psy = power_supply_get_by_name("olpc-battery");
+                       psy = power_supply_get_by_name("olpc_battery");
                        if (psy) {
                                power_supply_changed(psy);
                                power_supply_put(psy);

diff --git a/drivers/power/supply/olpc_battery.c b/drivers/power/supply/olpc_battery.c
index ad0e9e0edb3f844126163c53558fab66f657cd45..e0476ec06601d259cfcbeff59032eddd72da00f7 100644 (file)
--- a/drivers/power/supply/olpc_battery.c
+++ b/drivers/power/supply/olpc_battery.c
@@ -88,7 +88,7 @@ static enum power_supply_property olpc_ac_props[] = {
 };
 
 static const struct power_supply_desc olpc_ac_desc = {
-       .name = "olpc-ac",
+       .name = "olpc_ac",
        .type = POWER_SUPPLY_TYPE_MAINS,
        .properties = olpc_ac_props,
        .num_properties = ARRAY_SIZE(olpc_ac_props),
@@ -605,7 +605,7 @@ static const struct attribute_group *olpc_bat_sysfs_groups[] = {
  *********************************************************************/
 
 static struct power_supply_desc olpc_bat_desc = {
-       .name = "olpc-battery",
+       .name = "olpc_battery",
        .get_property = olpc_bat_get_property,
        .use_for_apm = 1,
 };