power: supply: charger-manager: Swap private uevent for power_supply_changed

Whenever the battery status is changed, charger manager triggers a uevent
through a private interface. Modify it to use power_supply_changed()
since it belongs to the power supply subsystem.

Signed-off-by: Jonghwa Lee <jonghwa3.lee@samsung.com>
Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
Signed-off-by: Jonathan Bakker <xc-racer2@live.ca>
Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>

diff --git a/drivers/power/supply/charger-manager.c b/drivers/power/supply/charger-manager.c
index 2ef53dc1f2fb7584320f9583f4abd0b281ebfa69..1adaeefd90a4d18935f157aefcaf7393c74e47d9 100644 (file)
--- a/drivers/power/supply/charger-manager.c
+++ b/drivers/power/supply/charger-manager.c
@@ -33,18 +33,6 @@
 #define CM_DEFAULT_RECHARGE_TEMP_DIFF  50
 #define CM_DEFAULT_CHARGE_TEMP_MAX     500
 
-static const char * const default_event_names[] = {
-       [CM_EVENT_UNKNOWN] = "Unknown",
-       [CM_EVENT_BATT_FULL] = "Battery Full",
-       [CM_EVENT_BATT_IN] = "Battery Inserted",
-       [CM_EVENT_BATT_OUT] = "Battery Pulled Out",
-       [CM_EVENT_BATT_OVERHEAT] = "Battery Overheat",
-       [CM_EVENT_BATT_COLD] = "Battery Cold",
-       [CM_EVENT_EXT_PWR_IN_OUT] = "External Power Attach/Detach",
-       [CM_EVENT_CHG_START_STOP] = "Charging Start/Stop",
-       [CM_EVENT_OTHERS] = "Other battery events"
-};
-
 /*
  * Regard CM_JIFFIES_SMALL jiffies is small enough to ignore for
  * delayed works so that we can run delayed works with CM_JIFFIES_SMALL
@@ -61,8 +49,6 @@ static const char * const default_event_names[] = {
  */
 #define CM_RTC_SMALL           (2)
 
-#define UEVENT_BUF_SIZE                32
-
 static LIST_HEAD(cm_list);
 static DEFINE_MUTEX(cm_list_mtx);
 
@@ -446,61 +432,6 @@ static int try_charger_restart(struct charger_manager *cm)
        return try_charger_enable(cm, true);
 }
 
-/**
- * uevent_notify - Let users know something has changed.
- * @cm: the Charger Manager representing the battery.
- * @event: the event string.
- *
- * If @event is null, it implies that uevent_notify is called
- * by resume function. When called in the resume function, cm_suspended
- * should be already reset to false in order to let uevent_notify
- * notify the recent event during the suspend to users. While
- * suspended, uevent_notify does not notify users, but tracks
- * events so that uevent_notify can notify users later after resumed.
- */
-static void uevent_notify(struct charger_manager *cm, const char *event)
-{
-       static char env_str[UEVENT_BUF_SIZE + 1] = "";
-       static char env_str_save[UEVENT_BUF_SIZE + 1] = "";
-
-       if (cm_suspended) {
-               /* Nothing in suspended-event buffer */
-               if (env_str_save[0] == 0) {
-                       if (!strncmp(env_str, event, UEVENT_BUF_SIZE))
-                               return; /* status not changed */
-                       strncpy(env_str_save, event, UEVENT_BUF_SIZE);
-                       return;
-               }
-
-               if (!strncmp(env_str_save, event, UEVENT_BUF_SIZE))
-                       return; /* Duplicated. */
-               strncpy(env_str_save, event, UEVENT_BUF_SIZE);
-               return;
-       }
-
-       if (event == NULL) {
-               /* No messages pending */
-               if (!env_str_save[0])
-                       return;
-
-               strncpy(env_str, env_str_save, UEVENT_BUF_SIZE);
-               kobject_uevent(&cm->dev->kobj, KOBJ_CHANGE);
-               env_str_save[0] = 0;
-
-               return;
-       }
-
-       /* status not changed */
-       if (!strncmp(env_str, event, UEVENT_BUF_SIZE))
-               return;
-
-       /* save the status and notify the update */
-       strncpy(env_str, event, UEVENT_BUF_SIZE);
-       kobject_uevent(&cm->dev->kobj, KOBJ_CHANGE);
-
-       dev_info(cm->dev, "%s\n", event);
-}
-
 /**
  * fullbatt_vchk - Check voltage drop some times after "FULL" event.
  * @work: the work_struct appointing the function
@@ -538,7 +469,7 @@ static void fullbatt_vchk(struct work_struct *work)
 
        if (diff > desc->fullbatt_vchkdrop_uV) {
                try_charger_restart(cm);
-               uevent_notify(cm, "Recharging");
+               power_supply_changed(cm->charger_psy);
        }
 }
 
@@ -569,7 +500,7 @@ static int check_charging_duration(struct charger_manager *cm)
                if (duration > desc->charging_max_duration_ms) {
                        dev_info(cm->dev, "Charging duration exceed %ums\n",
                                 desc->charging_max_duration_ms);
-                       uevent_notify(cm, "Discharging");
+                       power_supply_changed(cm->charger_psy);
                        try_charger_enable(cm, false);
                        ret = true;
                }
@@ -580,7 +511,7 @@ static int check_charging_duration(struct charger_manager *cm)
                                is_ext_pwr_online(cm)) {
                        dev_info(cm->dev, "Discharging duration exceed %ums\n",
                                 desc->discharging_max_duration_ms);
-                       uevent_notify(cm, "Recharging");
+                       power_supply_changed(cm->charger_psy);
                        try_charger_enable(cm, true);
                        ret = true;
                }
@@ -688,7 +619,7 @@ static bool _cm_monitor(struct charger_manager *cm)
        if (temp_alrt) {
                cm->emergency_stop = temp_alrt;
                if (!try_charger_enable(cm, false))
-                       uevent_notify(cm, default_event_names[temp_alrt]);
+                       power_supply_changed(cm->charger_psy);
 
        /*
         * Check whole charging duration and discharging duration
@@ -713,7 +644,7 @@ static bool _cm_monitor(struct charger_manager *cm)
        } else if (!cm->emergency_stop && is_full_charged(cm) &&
                        cm->charger_enabled) {
                dev_info(cm->dev, "EVENT_HANDLE: Battery Fully Charged\n");
-               uevent_notify(cm, default_event_names[CM_EVENT_BATT_FULL]);
+               power_supply_changed(cm->charger_psy);
 
                try_charger_enable(cm, false);
 
@@ -722,7 +653,7 @@ static bool _cm_monitor(struct charger_manager *cm)
                cm->emergency_stop = 0;
                if (is_ext_pwr_online(cm)) {
                        if (!try_charger_enable(cm, true))
-                               uevent_notify(cm, "CHARGING");
+                               power_supply_changed(cm->charger_psy);
                }
        }
 
@@ -843,7 +774,7 @@ static void fullbatt_handler(struct charger_manager *cm)
 
 out:
        dev_info(cm->dev, "EVENT_HANDLE: Battery Fully Charged\n");
-       uevent_notify(cm, default_event_names[CM_EVENT_BATT_FULL]);
+       power_supply_changed(cm->charger_psy);
 }
 
 /**
@@ -857,9 +788,9 @@ static void battout_handler(struct charger_manager *cm)
 
        if (!is_batt_present(cm)) {
                dev_emerg(cm->dev, "Battery Pulled Out!\n");
-               uevent_notify(cm, default_event_names[CM_EVENT_BATT_OUT]);
+               power_supply_changed(cm->charger_psy);
        } else {
-               uevent_notify(cm, "Battery Reinserted?");
+               power_supply_changed(cm->charger_psy);
        }
 }
 
@@ -876,7 +807,7 @@ static void misc_event_handler(struct charger_manager *cm,
 
        if (is_polling_required(cm) && cm->desc->polling_interval_ms)
                schedule_work(&setup_polling);
-       uevent_notify(cm, default_event_names[type]);
+       power_supply_changed(cm->charger_psy);
 }
 
 static int charger_get_property(struct power_supply *psy,
@@ -2048,7 +1979,7 @@ void cm_notify_event(struct power_supply *psy, enum cm_event_types type,
                break;
        case CM_EVENT_UNKNOWN:
        case CM_EVENT_OTHERS:
-               uevent_notify(cm, msg ? msg : default_event_names[type]);
+               power_supply_changed(cm->charger_psy);
                break;
        default:
                dev_err(cm->dev, "%s: type not specified\n", __func__);