From 74b142e0fe039fcde42030c064763577e11ca004 Mon Sep 17 00:00:00 2001 From: Patrick Mochel Date: Fri, 19 May 2006 16:54:39 -0400 Subject: ACPI: fan: add struct acpi_device to struct acpi_fan. Signed-off-by: Patrick Mochel Signed-off-by: Len Brown --- drivers/acpi/fan.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'drivers/acpi/fan.c') diff --git a/drivers/acpi/fan.c b/drivers/acpi/fan.c index 38acc69b21bc..8abf5ac17f67 100644 --- a/drivers/acpi/fan.c +++ b/drivers/acpi/fan.c @@ -65,6 +65,7 @@ static struct acpi_driver acpi_fan_driver = { struct acpi_fan { acpi_handle handle; + struct acpi_device * device; }; /* -------------------------------------------------------------------------- @@ -192,6 +193,7 @@ static int acpi_fan_add(struct acpi_device *device) memset(fan, 0, sizeof(struct acpi_fan)); fan->handle = device->handle; + fan->device = device; strcpy(acpi_device_name(device), "Fan"); strcpy(acpi_device_class(device), ACPI_FAN_CLASS); acpi_driver_data(device) = fan; -- cgit v1.2.3 From dc8c2b2744f8563aa5feb07488e4cc207a70ac70 Mon Sep 17 00:00:00 2001 From: Patrick Mochel Date: Fri, 19 May 2006 16:54:42 -0400 Subject: ACPI: fan: Use acpi_device's handle instead of driver's Signed-off-by: Patrick Mochel Signed-off-by: Len Brown --- drivers/acpi/fan.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'drivers/acpi/fan.c') diff --git a/drivers/acpi/fan.c b/drivers/acpi/fan.c index 8abf5ac17f67..a56acdb37296 100644 --- a/drivers/acpi/fan.c +++ b/drivers/acpi/fan.c @@ -81,7 +81,7 @@ static int acpi_fan_read_state(struct seq_file *seq, void *offset) if (fan) { - if (acpi_bus_get_power(fan->handle, &state)) + if (acpi_bus_get_power(fan->device->handle, &state)) seq_printf(seq, "status: ERROR\n"); else seq_printf(seq, "status: %s\n", @@ -113,7 +113,7 @@ acpi_fan_write_state(struct file *file, const char __user * buffer, state_string[count] = '\0'; - result = acpi_bus_set_power(fan->handle, + result = acpi_bus_set_power(fan->device->handle, simple_strtoul(state_string, NULL, 0)); if (result) return result; @@ -198,7 +198,7 @@ static int acpi_fan_add(struct acpi_device *device) strcpy(acpi_device_class(device), ACPI_FAN_CLASS); acpi_driver_data(device) = fan; - result = acpi_bus_get_power(fan->handle, &state); + result = acpi_bus_get_power(device->handle, &state); if (result) { printk(KERN_ERR PREFIX "Reading power state\n"); goto end; -- cgit v1.2.3 From 579c896cc91434e4feb938f780eba580c93fa0da Mon Sep 17 00:00:00 2001 From: Patrick Mochel Date: Fri, 19 May 2006 16:54:50 -0400 Subject: ACPI: fan: Remove unneeded acpi_handle from driver. Signed-off-by: Patrick Mochel Signed-off-by: Len Brown --- drivers/acpi/fan.c | 2 -- 1 file changed, 2 deletions(-) (limited to 'drivers/acpi/fan.c') diff --git a/drivers/acpi/fan.c b/drivers/acpi/fan.c index a56acdb37296..daed2460924d 100644 --- a/drivers/acpi/fan.c +++ b/drivers/acpi/fan.c @@ -64,7 +64,6 @@ static struct acpi_driver acpi_fan_driver = { }; struct acpi_fan { - acpi_handle handle; struct acpi_device * device; }; @@ -192,7 +191,6 @@ static int acpi_fan_add(struct acpi_device *device) return -ENOMEM; memset(fan, 0, sizeof(struct acpi_fan)); - fan->handle = device->handle; fan->device = device; strcpy(acpi_device_name(device), "Fan"); strcpy(acpi_device_class(device), ACPI_FAN_CLASS); -- cgit v1.2.3