diff options
-rw-r--r-- | drivers/power/ds2760_battery.c | 4 | ||||
-rw-r--r-- | drivers/power/power_supply_core.c | 6 | ||||
-rw-r--r-- | drivers/power/power_supply_leds.c | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/drivers/power/ds2760_battery.c b/drivers/power/ds2760_battery.c index bdb9b7285b3d..71be36f18709 100644 --- a/drivers/power/ds2760_battery.c +++ b/drivers/power/ds2760_battery.c | |||
@@ -262,7 +262,7 @@ static void ds2760_battery_work(struct work_struct *work) | |||
262 | struct ds2760_device_info, monitor_work.work); | 262 | struct ds2760_device_info, monitor_work.work); |
263 | const int interval = HZ * 60; | 263 | const int interval = HZ * 60; |
264 | 264 | ||
265 | dev_dbg(di->dev, "%s\n", __FUNCTION__); | 265 | dev_dbg(di->dev, "%s\n", __func__); |
266 | 266 | ||
267 | ds2760_battery_update_status(di); | 267 | ds2760_battery_update_status(di); |
268 | queue_delayed_work(di->monitor_wqueue, &di->monitor_work, interval); | 268 | queue_delayed_work(di->monitor_wqueue, &di->monitor_work, interval); |
@@ -275,7 +275,7 @@ static void ds2760_battery_external_power_changed(struct power_supply *psy) | |||
275 | { | 275 | { |
276 | struct ds2760_device_info *di = to_ds2760_device_info(psy); | 276 | struct ds2760_device_info *di = to_ds2760_device_info(psy); |
277 | 277 | ||
278 | dev_dbg(di->dev, "%s\n", __FUNCTION__); | 278 | dev_dbg(di->dev, "%s\n", __func__); |
279 | 279 | ||
280 | cancel_delayed_work(&di->monitor_work); | 280 | cancel_delayed_work(&di->monitor_work); |
281 | queue_delayed_work(di->monitor_wqueue, &di->monitor_work, HZ/10); | 281 | queue_delayed_work(di->monitor_wqueue, &di->monitor_work, HZ/10); |
diff --git a/drivers/power/power_supply_core.c b/drivers/power/power_supply_core.c index 03d6a38464ef..138dd76ee347 100644 --- a/drivers/power/power_supply_core.c +++ b/drivers/power/power_supply_core.c | |||
@@ -39,7 +39,7 @@ static void power_supply_changed_work(struct work_struct *work) | |||
39 | struct power_supply *psy = container_of(work, struct power_supply, | 39 | struct power_supply *psy = container_of(work, struct power_supply, |
40 | changed_work); | 40 | changed_work); |
41 | 41 | ||
42 | dev_dbg(psy->dev, "%s\n", __FUNCTION__); | 42 | dev_dbg(psy->dev, "%s\n", __func__); |
43 | 43 | ||
44 | class_for_each_device(power_supply_class, psy, | 44 | class_for_each_device(power_supply_class, psy, |
45 | __power_supply_changed_work); | 45 | __power_supply_changed_work); |
@@ -51,7 +51,7 @@ static void power_supply_changed_work(struct work_struct *work) | |||
51 | 51 | ||
52 | void power_supply_changed(struct power_supply *psy) | 52 | void power_supply_changed(struct power_supply *psy) |
53 | { | 53 | { |
54 | dev_dbg(psy->dev, "%s\n", __FUNCTION__); | 54 | dev_dbg(psy->dev, "%s\n", __func__); |
55 | 55 | ||
56 | schedule_work(&psy->changed_work); | 56 | schedule_work(&psy->changed_work); |
57 | } | 57 | } |
@@ -82,7 +82,7 @@ int power_supply_am_i_supplied(struct power_supply *psy) | |||
82 | error = class_for_each_device(power_supply_class, psy, | 82 | error = class_for_each_device(power_supply_class, psy, |
83 | __power_supply_am_i_supplied); | 83 | __power_supply_am_i_supplied); |
84 | 84 | ||
85 | dev_dbg(psy->dev, "%s %d\n", __FUNCTION__, error); | 85 | dev_dbg(psy->dev, "%s %d\n", __func__, error); |
86 | 86 | ||
87 | return error; | 87 | return error; |
88 | } | 88 | } |
diff --git a/drivers/power/power_supply_leds.c b/drivers/power/power_supply_leds.c index fa3034f85c38..2dece40c544f 100644 --- a/drivers/power/power_supply_leds.c +++ b/drivers/power/power_supply_leds.c | |||
@@ -24,7 +24,7 @@ static void power_supply_update_bat_leds(struct power_supply *psy) | |||
24 | if (psy->get_property(psy, POWER_SUPPLY_PROP_STATUS, &status)) | 24 | if (psy->get_property(psy, POWER_SUPPLY_PROP_STATUS, &status)) |
25 | return; | 25 | return; |
26 | 26 | ||
27 | dev_dbg(psy->dev, "%s %d\n", __FUNCTION__, status.intval); | 27 | dev_dbg(psy->dev, "%s %d\n", __func__, status.intval); |
28 | 28 | ||
29 | switch (status.intval) { | 29 | switch (status.intval) { |
30 | case POWER_SUPPLY_STATUS_FULL: | 30 | case POWER_SUPPLY_STATUS_FULL: |
@@ -101,7 +101,7 @@ static void power_supply_update_gen_leds(struct power_supply *psy) | |||
101 | if (psy->get_property(psy, POWER_SUPPLY_PROP_ONLINE, &online)) | 101 | if (psy->get_property(psy, POWER_SUPPLY_PROP_ONLINE, &online)) |
102 | return; | 102 | return; |
103 | 103 | ||
104 | dev_dbg(psy->dev, "%s %d\n", __FUNCTION__, online.intval); | 104 | dev_dbg(psy->dev, "%s %d\n", __func__, online.intval); |
105 | 105 | ||
106 | if (online.intval) | 106 | if (online.intval) |
107 | led_trigger_event(psy->online_trig, LED_FULL); | 107 | led_trigger_event(psy->online_trig, LED_FULL); |