Commit f3161f36 authored Oct 23, 2008 by Linus Torvalds

pcc-acpi: fix compile with new stricter ACPI types



This was another merge problem that wasn't a data conflict, but due to
independent changes in two branches that just didn't work together.

The pcc-acpi staging driver used

	acpi_driver_data(device) = hotkey;

to set driver data, but the ACPI merge made that invalid in commit
db89b4f0 ("ACPI: catch calls of
acpi_driver_data on pointer of wrong type"), and now you're supposed to
just do.

	device->driver_data = hotkey;

instead.

Fix it up.

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent 12e1ec9f

drivers/staging/pcc-acpi/pcc-acpi.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1011,7 +1011,7 @@ static int __devinit acpi_pcc_hotkey_add(struct acpi_device *device)
		hotkey->device = device;
		hotkey->handle = device->handle;
		hotkey->num_sifr = num_sifr;
		acpi_driver_data(device) = hotkey;
		device->driver_data = hotkey;
		strcpy(acpi_device_name(device), ACPI_PCC_DEVICE_NAME);
		strcpy(acpi_device_class(device), ACPI_PCC_CLASS);