Skip to content

Commit a759de6

Browse files
Youngjin Jangrafaeljw
Youngjin Jang
authored and
rafaeljw
committed
PM: sleep: Add device name to suspend_report_result()
Currently, suspend_report_result() prints only function information. If any driver uses a common PM function, nobody knows who exactly called the failing function. A device pinter is needed to recognize the failing device. For example: PM: dpm_run_callback(): pnp_bus_suspend+0x0/0x10 returns 0 PM: dpm_run_callback(): pci_pm_suspend+0x0/0x150 returns 0 become after the change: serial 00:05: PM: dpm_run_callback(): pnp_bus_suspend+0x0/0x10 returns 0 pci 0000:00:01.3: PM: dpm_run_callback(): pci_pm_suspend+0x0/0x150 returns 0 Signed-off-by: Youngjin Jang <yj84.jang@samsung.com> [ rjw: Changelog edits ] Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
1 parent 7a64ca1 commit a759de6

File tree

5 files changed

+19
-19
lines changed

5 files changed

+19
-19
lines changed

‎drivers/base/power/main.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -485,7 +485,7 @@ static int dpm_run_callback(pm_callback_t cb, struct device *dev,
485485
trace_device_pm_callback_start(dev, info, state.event);
486486
error = cb(dev);
487487
trace_device_pm_callback_end(dev, error);
488-
suspend_report_result(cb, error);
488+
suspend_report_result(dev, cb, error);
489489

490490
initcall_debug_report(dev, calltime, cb, error);
491491

@@ -1568,7 +1568,7 @@ static int legacy_suspend(struct device *dev, pm_message_t state,
15681568
trace_device_pm_callback_start(dev, info, state.event);
15691569
error = cb(dev, state);
15701570
trace_device_pm_callback_end(dev, error);
1571-
suspend_report_result(cb, error);
1571+
suspend_report_result(dev, cb, error);
15721572

15731573
initcall_debug_report(dev, calltime, cb, error);
15741574

@@ -1855,7 +1855,7 @@ static int device_prepare(struct device *dev, pm_message_t state)
18551855
device_unlock(dev);
18561856

18571857
if (ret < 0) {
1858-
suspend_report_result(callback, ret);
1858+
suspend_report_result(dev, callback, ret);
18591859
pm_runtime_put(dev);
18601860
return ret;
18611861
}
@@ -1960,10 +1960,10 @@ int dpm_suspend_start(pm_message_t state)
19601960
}
19611961
EXPORT_SYMBOL_GPL(dpm_suspend_start);
19621962

1963-
void __suspend_report_result(const char *function, void *fn, int ret)
1963+
void __suspend_report_result(const char *function, struct device *dev, void *fn, int ret)
19641964
{
19651965
if (ret)
1966-
pr_err("%s(): %pS returns %d\n", function, fn, ret);
1966+
dev_err(dev, "%s(): %pS returns %d\n", function, fn, ret);
19671967
}
19681968
EXPORT_SYMBOL_GPL(__suspend_report_result);
19691969

‎drivers/pci/pci-driver.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -596,7 +596,7 @@ static int pci_legacy_suspend(struct device *dev, pm_message_t state)
596596
int error;
597597

598598
error = drv->suspend(pci_dev, state);
599-
suspend_report_result(drv->suspend, error);
599+
suspend_report_result(dev, drv->suspend, error);
600600
if (error)
601601
return error;
602602

@@ -775,7 +775,7 @@ static int pci_pm_suspend(struct device *dev)
775775
int error;
776776

777777
error = pm->suspend(dev);
778-
suspend_report_result(pm->suspend, error);
778+
suspend_report_result(dev, pm->suspend, error);
779779
if (error)
780780
return error;
781781

@@ -821,7 +821,7 @@ static int pci_pm_suspend_noirq(struct device *dev)
821821
int error;
822822

823823
error = pm->suspend_noirq(dev);
824-
suspend_report_result(pm->suspend_noirq, error);
824+
suspend_report_result(dev, pm->suspend_noirq, error);
825825
if (error)
826826
return error;
827827

@@ -1010,7 +1010,7 @@ static int pci_pm_freeze(struct device *dev)
10101010
int error;
10111011

10121012
error = pm->freeze(dev);
1013-
suspend_report_result(pm->freeze, error);
1013+
suspend_report_result(dev, pm->freeze, error);
10141014
if (error)
10151015
return error;
10161016
}
@@ -1030,7 +1030,7 @@ static int pci_pm_freeze_noirq(struct device *dev)
10301030
int error;
10311031

10321032
error = pm->freeze_noirq(dev);
1033-
suspend_report_result(pm->freeze_noirq, error);
1033+
suspend_report_result(dev, pm->freeze_noirq, error);
10341034
if (error)
10351035
return error;
10361036
}
@@ -1116,7 +1116,7 @@ static int pci_pm_poweroff(struct device *dev)
11161116
int error;
11171117

11181118
error = pm->poweroff(dev);
1119-
suspend_report_result(pm->poweroff, error);
1119+
suspend_report_result(dev, pm->poweroff, error);
11201120
if (error)
11211121
return error;
11221122
}
@@ -1154,7 +1154,7 @@ static int pci_pm_poweroff_noirq(struct device *dev)
11541154
int error;
11551155

11561156
error = pm->poweroff_noirq(dev);
1157-
suspend_report_result(pm->poweroff_noirq, error);
1157+
suspend_report_result(dev, pm->poweroff_noirq, error);
11581158
if (error)
11591159
return error;
11601160
}

‎drivers/pnp/driver.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ static int __pnp_bus_suspend(struct device *dev, pm_message_t state)
171171

172172
if (pnp_drv->driver.pm && pnp_drv->driver.pm->suspend) {
173173
error = pnp_drv->driver.pm->suspend(dev);
174-
suspend_report_result(pnp_drv->driver.pm->suspend, error);
174+
suspend_report_result(dev, pnp_drv->driver.pm->suspend, error);
175175
if (error)
176176
return error;
177177
}

‎drivers/usb/core/hcd-pci.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -446,7 +446,7 @@ static int suspend_common(struct device *dev, bool do_wakeup)
446446
HCD_WAKEUP_PENDING(hcd->shared_hcd))
447447
return -EBUSY;
448448
retval = hcd->driver->pci_suspend(hcd, do_wakeup);
449-
suspend_report_result(hcd->driver->pci_suspend, retval);
449+
suspend_report_result(dev, hcd->driver->pci_suspend, retval);
450450

451451
/* Check again in case wakeup raced with pci_suspend */
452452
if ((retval == 0 && do_wakeup && HCD_WAKEUP_PENDING(hcd)) ||
@@ -556,7 +556,7 @@ static int hcd_pci_suspend_noirq(struct device *dev)
556556
dev_dbg(dev, "--> PCI %s\n",
557557
pci_power_name(pci_dev->current_state));
558558
} else {
559-
suspend_report_result(pci_prepare_to_sleep, retval);
559+
suspend_report_result(dev, pci_prepare_to_sleep, retval);
560560
return retval;
561561
}
562562

‎include/linux/pm.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -770,11 +770,11 @@ extern int dpm_suspend_late(pm_message_t state);
770770
extern int dpm_suspend(pm_message_t state);
771771
extern int dpm_prepare(pm_message_t state);
772772

773-
extern void __suspend_report_result(const char *function, void *fn, int ret);
773+
extern void __suspend_report_result(const char *function, struct device *dev, void *fn, int ret);
774774

775-
#define suspend_report_result(fn, ret) \
775+
#define suspend_report_result(dev, fn, ret) \
776776
do { \
777-
__suspend_report_result(__func__, fn, ret); \
777+
__suspend_report_result(__func__, dev, fn, ret); \
778778
} while (0)
779779

780780
extern int device_pm_wait_for_dev(struct device *sub, struct device *dev);
@@ -814,7 +814,7 @@ static inline int dpm_suspend_start(pm_message_t state)
814814
return 0;
815815
}
816816

817-
#define suspend_report_result(fn, ret) do {} while (0)
817+
#define suspend_report_result(dev, fn, ret) do {} while (0)
818818

819819
static inline int device_pm_wait_for_dev(struct device *a, struct device *b)
820820
{

0 commit comments

Comments
 (0)