ACPI: struct device - replace bus_id with dev_name(), dev_set_name()

[sfrench/cifs-2.6.git] / drivers / acpi / sleep / proc.c

diff --git a/drivers/acpi/sleep/proc.c b/drivers/acpi/sleep/proc.c
index 631ee2ee2ca0028193ab5d52dee2acc0d15579f2..64e591ba86f24fffd6251f9b65288e1b965da94b 100644 (file)
--- a/drivers/acpi/sleep/proc.c
+++ b/drivers/acpi/sleep/proc.c
@@ -366,8 +366,8 @@ acpi_system_wakeup_device_seq_show(struct seq_file *seq, void *offset)
                           dev->wakeup.state.enabled ? "enabled" : "disabled");
                if (ldev)
                        seq_printf(seq, "%s:%s",
-                                  ldev->bus ? ldev->bus->name : "no-bus",
-                                  ldev->bus_id);
+                                  dev_name(ldev) ? ldev->bus->name : "no-bus",
+                                  dev_name(ldev));
                seq_printf(seq, "\n");
                put_device(ldev);