diff options
| author | Len Brown <len.brown@intel.com> | 2006-12-16 01:04:27 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2006-12-16 01:04:27 -0500 |
| commit | cece901481bafbf14de8cbd3a89ae869ea881055 (patch) | |
| tree | f9e240443643008c8feeaf55919105dc63ab8c72 /drivers/acpi/fan.c | |
| parent | cfee47f99bc14a6d7c6b0be2284db2cef310a815 (diff) | |
| parent | 50dd096973f1d95aa03c6a6d9e148d706b62b68e (diff) | |
Pull style into test branch
Conflicts:
drivers/acpi/button.c
drivers/acpi/ec.c
drivers/acpi/osl.c
drivers/acpi/sbs.c
Diffstat (limited to 'drivers/acpi/fan.c')
| -rw-r--r-- | drivers/acpi/fan.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/acpi/fan.c b/drivers/acpi/fan.c index 045c89477e59..c413e69fea8e 100644 --- a/drivers/acpi/fan.c +++ b/drivers/acpi/fan.c | |||
| @@ -99,8 +99,8 @@ acpi_fan_write_state(struct file *file, const char __user * buffer, | |||
| 99 | size_t count, loff_t * ppos) | 99 | size_t count, loff_t * ppos) |
| 100 | { | 100 | { |
| 101 | int result = 0; | 101 | int result = 0; |
| 102 | struct seq_file *m = (struct seq_file *)file->private_data; | 102 | struct seq_file *m = file->private_data; |
| 103 | struct acpi_fan *fan = (struct acpi_fan *)m->private; | 103 | struct acpi_fan *fan = m->private; |
| 104 | char state_string[12] = { '\0' }; | 104 | char state_string[12] = { '\0' }; |
| 105 | 105 | ||
| 106 | 106 | ||
| @@ -229,7 +229,7 @@ static int acpi_fan_remove(struct acpi_device *device, int type) | |||
| 229 | if (!device || !acpi_driver_data(device)) | 229 | if (!device || !acpi_driver_data(device)) |
| 230 | return -EINVAL; | 230 | return -EINVAL; |
| 231 | 231 | ||
| 232 | fan = (struct acpi_fan *)acpi_driver_data(device); | 232 | fan = acpi_driver_data(device); |
| 233 | 233 | ||
| 234 | acpi_fan_remove_fs(device); | 234 | acpi_fan_remove_fs(device); |
| 235 | 235 | ||