Subject: Re: linux-next: acpi tree build failure

From: Stephen Rothwell <[email-masked]>
Date: Tue, 3 Mar 2009 12:47:17 +1100

Hi Len,

On Tue, 24 Feb 2009 15:37:42 +1100 Stephen Rothwell <[email-masked]> wrote:
>
> Today's linux-next build (x86_64 allmodconfig) failed like this:
> 
> drivers/acpi/thermal.c: In function 'thermal_notify':
> drivers/acpi/thermal.c:768: error: 'struct device' has no member named 'bus_id'
> 
> Caused by commit b1569e99c795bf83b4ddf41c4f1c42761ab7f75e ("ACPI: move
> thermal trip handling to generic thermal layer") interacting with commit
> d4a078fca590911cdf87a8eaffee1b6e643c2558 ("driver core: get rid of struct
> device's bus_id string array").
> 
> I have dropped the acpi tree for today.

Since this hasn't bee fixed yet, I have applied the following patch as a
merge fixup.  Please apply it (or something like it) to the acpi tree.

-- 
Cheers,
Stephen Rothwell                    [email-masked]
http://www.canb.auug.org.au/~sfr/

From: Stephen Rothwell <[email-masked]>
Date: Tue, 3 Mar 2009 12:41:46 +1100
Subject: [PATCH] acpi: update thermal for bus_id removal

Signed-off-by: Stephen Rothwell <[email-masked]>
---
 drivers/acpi/thermal.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/drivers/acpi/thermal.c b/drivers/acpi/thermal.c
index 0ec48d2..6b95997 100644
--- a/drivers/acpi/thermal.c
+++ b/drivers/acpi/thermal.c
@@ -41,6 +41,7 @@
 #include <linux/kmod.h>
 #include <linux/seq_file.h>
 #include <linux/reboot.h>
+#include <linux/device.h>
 #include <asm/uaccess.h>
 #include <linux/thermal.h>
 #include <acpi/acpi_bus.h>
@@ -765,7 +766,7 @@ static int thermal_notify(struct thermal_zone_device *thermal, int trip,
 
 	acpi_bus_generate_proc_event(tz->device, type, 1);
 	acpi_bus_generate_netlink_event(tz->device->pnp.device_class,
-					tz->device->dev.bus_id, type, 1);
+					dev_name(&tz->device->dev), type, 1);
 
 	if (trip_type == THERMAL_TRIP_CRITICAL && nocrt)
 		return 1;
-- 
1.6.1.3