Skip to content

Commit 66142af

Browse files
committed
[drivers][power] remove the redundant function "power_supply_dev_name"
1 parent 754c040 commit 66142af

1 file changed

Lines changed: 5 additions & 14 deletions

File tree

components/drivers/power/supply/supply-daemon.c

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,6 @@ static rt_uint8_t raw_pm_sleep_mode = PM_RUN_MODE_MAX;
2222
static rt_uint8_t last_pm_sleep_mode;
2323
#endif
2424

25-
rt_inline const char *power_supply_dev_name(struct rt_device *dev)
26-
{
27-
#ifdef RT_USING_DM
28-
return rt_dm_dev_get_name(dev);
29-
#else
30-
return dev ? dev->parent.name : "<no-dev>";
31-
#endif
32-
}
33-
3425
static rt_err_t daemon_power_supply_notify(struct rt_power_supply_notifier *notifier,
3526
struct rt_power_supply *psy)
3627
{
@@ -76,11 +67,11 @@ static rt_err_t daemon_power_supply_notify(struct rt_power_supply_notifier *noti
7667
{
7768
if (full_power)
7869
{
79-
LOG_I("%s: Power is full", power_supply_dev_name(psy->dev));
70+
LOG_I("%s: Power is full", rt_power_supply_name(psy));
8071
}
8172
else
8273
{
83-
LOG_I("%s: Power is sufficient", power_supply_dev_name(psy->dev));
74+
LOG_I("%s: Power is sufficient", rt_power_supply_name(psy));
8475
}
8576
}
8677
}
@@ -119,12 +110,12 @@ static rt_err_t daemon_power_supply_notify(struct rt_power_supply_notifier *noti
119110
if (!rt_power_supply_get_property(psy, RT_POWER_SUPPLY_PROP_SCOPE, &propval) &&
120111
propval.intval == RT_POWER_SUPPLY_SCOPE_SYSTEM)
121112
{
122-
LOG_E("%s: Power is critical, poweroff now", power_supply_dev_name(psy->dev));
113+
LOG_E("%s: Power is critical, poweroff now", rt_power_supply_name(psy));
123114
rt_hw_cpu_shutdown();
124115
}
125116
} while (0);
126117

127-
LOG_E("%s: Power is critical", power_supply_dev_name(psy->dev));
118+
LOG_E("%s: Power is critical", rt_power_supply_name(psy));
128119
}
129120
else if (propval.intval <= 10)
130121
{
@@ -146,7 +137,7 @@ static rt_err_t daemon_power_supply_notify(struct rt_power_supply_notifier *noti
146137
pm_sleep_mode = PM_SLEEP_MODE_LIGHT;
147138
rt_pm_run_enter(PM_RUN_MODE_NORMAL_SPEED);
148139
#endif
149-
LOG_W("%s: Power is low", power_supply_dev_name(psy->dev));
140+
LOG_W("%s: Power is low", rt_power_supply_name(psy));
150141
}
151142

152143
#ifdef RT_USING_PM

0 commit comments

Comments
 (0)