Skip to content

Commit

Permalink
power: replace remaining __FUNCTION__ occurrences
Browse files Browse the repository at this point in the history
__FUNCTION__ is gcc-specific, use __func__

Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
Cc: Greg KH <greg@kroah.com>
Cc: "Rafael J. Wysocki" <rjw@sisk.pl>
Cc: Len Brown <lenb@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  • Loading branch information
Harvey Harrison authored and Linus Torvalds committed Apr 29, 2008
1 parent 551883a commit 0cddc0a
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions drivers/power/ds2760_battery.c
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,7 @@ static void ds2760_battery_work(struct work_struct *work)
struct ds2760_device_info, monitor_work.work);
const int interval = HZ * 60;

dev_dbg(di->dev, "%s\n", __FUNCTION__);
dev_dbg(di->dev, "%s\n", __func__);

ds2760_battery_update_status(di);
queue_delayed_work(di->monitor_wqueue, &di->monitor_work, interval);
Expand All @@ -275,7 +275,7 @@ static void ds2760_battery_external_power_changed(struct power_supply *psy)
{
struct ds2760_device_info *di = to_ds2760_device_info(psy);

dev_dbg(di->dev, "%s\n", __FUNCTION__);
dev_dbg(di->dev, "%s\n", __func__);

cancel_delayed_work(&di->monitor_work);
queue_delayed_work(di->monitor_wqueue, &di->monitor_work, HZ/10);
Expand Down
6 changes: 3 additions & 3 deletions drivers/power/power_supply_core.c
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ static void power_supply_changed_work(struct work_struct *work)
struct power_supply *psy = container_of(work, struct power_supply,
changed_work);

dev_dbg(psy->dev, "%s\n", __FUNCTION__);
dev_dbg(psy->dev, "%s\n", __func__);

class_for_each_device(power_supply_class, psy,
__power_supply_changed_work);
Expand All @@ -51,7 +51,7 @@ static void power_supply_changed_work(struct work_struct *work)

void power_supply_changed(struct power_supply *psy)
{
dev_dbg(psy->dev, "%s\n", __FUNCTION__);
dev_dbg(psy->dev, "%s\n", __func__);

schedule_work(&psy->changed_work);
}
Expand Down Expand Up @@ -82,7 +82,7 @@ int power_supply_am_i_supplied(struct power_supply *psy)
error = class_for_each_device(power_supply_class, psy,
__power_supply_am_i_supplied);

dev_dbg(psy->dev, "%s %d\n", __FUNCTION__, error);
dev_dbg(psy->dev, "%s %d\n", __func__, error);

return error;
}
Expand Down
4 changes: 2 additions & 2 deletions drivers/power/power_supply_leds.c
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ static void power_supply_update_bat_leds(struct power_supply *psy)
if (psy->get_property(psy, POWER_SUPPLY_PROP_STATUS, &status))
return;

dev_dbg(psy->dev, "%s %d\n", __FUNCTION__, status.intval);
dev_dbg(psy->dev, "%s %d\n", __func__, status.intval);

switch (status.intval) {
case POWER_SUPPLY_STATUS_FULL:
Expand Down Expand Up @@ -101,7 +101,7 @@ static void power_supply_update_gen_leds(struct power_supply *psy)
if (psy->get_property(psy, POWER_SUPPLY_PROP_ONLINE, &online))
return;

dev_dbg(psy->dev, "%s %d\n", __FUNCTION__, online.intval);
dev_dbg(psy->dev, "%s %d\n", __func__, online.intval);

if (online.intval)
led_trigger_event(psy->online_trig, LED_FULL);
Expand Down

0 comments on commit 0cddc0a

Please sign in to comment.