diff options
author | Len Brown <len.brown@intel.com> | 2007-10-29 17:30:48 -0400 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2007-10-29 17:30:48 -0400 |
commit | b2451e4399d7233cd0008823872f51112d18f8d0 (patch) | |
tree | 2673680709e9fb19064fcc3f485ad88f75a4763d /drivers | |
parent | 14f7d720bb6cc60be8931ea1a0f547dc1e475b88 (diff) | |
parent | b023b43a83d231d1f3d36ac9e3ce4831b5ec2e7b (diff) |
Pull fujitsu into release branch
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/misc/fujitsu-laptop.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/misc/fujitsu-laptop.c b/drivers/misc/fujitsu-laptop.c index d366a6cc1fd9..c8d62c268b11 100644 --- a/drivers/misc/fujitsu-laptop.c +++ b/drivers/misc/fujitsu-laptop.c | |||
@@ -122,9 +122,6 @@ static int get_lcd_level(void) | |||
122 | else | 122 | else |
123 | fujitsu->brightness_changed = 0; | 123 | fujitsu->brightness_changed = 0; |
124 | 124 | ||
125 | if (status < 0) | ||
126 | return status; | ||
127 | |||
128 | return fujitsu->brightness_level; | 125 | return fujitsu->brightness_level; |
129 | } | 126 | } |
130 | 127 | ||
@@ -198,7 +195,7 @@ static struct platform_driver fujitsupf_driver = { | |||
198 | 195 | ||
199 | /* ACPI device */ | 196 | /* ACPI device */ |
200 | 197 | ||
201 | int acpi_fujitsu_add(struct acpi_device *device) | 198 | static int acpi_fujitsu_add(struct acpi_device *device) |
202 | { | 199 | { |
203 | int result = 0; | 200 | int result = 0; |
204 | int state = 0; | 201 | int state = 0; |
@@ -229,7 +226,7 @@ int acpi_fujitsu_add(struct acpi_device *device) | |||
229 | return result; | 226 | return result; |
230 | } | 227 | } |
231 | 228 | ||
232 | int acpi_fujitsu_remove(struct acpi_device *device, int type) | 229 | static int acpi_fujitsu_remove(struct acpi_device *device, int type) |
233 | { | 230 | { |
234 | ACPI_FUNCTION_TRACE("acpi_fujitsu_remove"); | 231 | ACPI_FUNCTION_TRACE("acpi_fujitsu_remove"); |
235 | 232 | ||