Jelajahi Sumber

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
db89b4f0dbab837d0f3de2c3e9427a8d5393afa3 ("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>
Linus Torvalds 16 tahun lalu
induk
melakukan
f3161f36f5
1 mengubah file dengan 1 tambahan dan 1 penghapusan
  1. 1 1
      drivers/staging/pcc-acpi/pcc-acpi.c

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

@@ -1011,7 +1011,7 @@ static int __devinit acpi_pcc_hotkey_add(struct acpi_device *device)
 	hotkey->device   = device;
 	hotkey->device   = device;
 	hotkey->handle   = device->handle;
 	hotkey->handle   = device->handle;
 	hotkey->num_sifr = num_sifr;
 	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_name(device),  ACPI_PCC_DEVICE_NAME);
 	strcpy(acpi_device_class(device), ACPI_PCC_CLASS);
 	strcpy(acpi_device_class(device), ACPI_PCC_CLASS);