Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f6f5c45e authored by Stephen Rothwell's avatar Stephen Rothwell Committed by Len Brown
Browse files

ACPI: update thermal for bus_id removal 



> 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 b1569e99 ("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").
>

Signed-off-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent b1569e99

drivers/acpi/thermal.c

+2 −1
Original line number Diff line number Diff line
@@ -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;