diff options
author | Thomas Renninger <trenn@suse.de> | 2008-04-16 14:52:02 -0400 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2008-04-29 10:51:45 -0400 |
commit | 66fb9d120e91050093b8ce4c1daa2e440660152b (patch) | |
tree | 17d55a98abe36c649e2cd3885a89d7a1749d0b15 | |
parent | c46e5658a0b81891532705bd65592afe091a5967 (diff) |
ACPI: Cleanup: Remove unneeded, multiple local dummy variables
Signed-off-by: Thomas Renninger <trenn@suse.de>
Signed-off-by: Len Brown <len.brown@intel.com>
-rw-r--r-- | drivers/acpi/scan.c | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c index e6ce262b5d44..6b1999b1cd34 100644 --- a/drivers/acpi/scan.c +++ b/drivers/acpi/scan.c | |||
@@ -882,10 +882,7 @@ static void acpi_device_get_busid(struct acpi_device *device, | |||
882 | static int | 882 | static int |
883 | acpi_video_bus_match(struct acpi_device *device) | 883 | acpi_video_bus_match(struct acpi_device *device) |
884 | { | 884 | { |
885 | acpi_handle h_dummy1; | 885 | acpi_handle h_dummy; |
886 | acpi_handle h_dummy2; | ||
887 | acpi_handle h_dummy3; | ||
888 | |||
889 | 886 | ||
890 | if (!device) | 887 | if (!device) |
891 | return -EINVAL; | 888 | return -EINVAL; |
@@ -895,18 +892,18 @@ acpi_video_bus_match(struct acpi_device *device) | |||
895 | */ | 892 | */ |
896 | 893 | ||
897 | /* Does this device able to support video switching ? */ | 894 | /* Does this device able to support video switching ? */ |
898 | if (ACPI_SUCCESS(acpi_get_handle(device->handle, "_DOD", &h_dummy1)) && | 895 | if (ACPI_SUCCESS(acpi_get_handle(device->handle, "_DOD", &h_dummy)) && |
899 | ACPI_SUCCESS(acpi_get_handle(device->handle, "_DOS", &h_dummy2))) | 896 | ACPI_SUCCESS(acpi_get_handle(device->handle, "_DOS", &h_dummy))) |
900 | return 0; | 897 | return 0; |
901 | 898 | ||
902 | /* Does this device able to retrieve a video ROM ? */ | 899 | /* Does this device able to retrieve a video ROM ? */ |
903 | if (ACPI_SUCCESS(acpi_get_handle(device->handle, "_ROM", &h_dummy1))) | 900 | if (ACPI_SUCCESS(acpi_get_handle(device->handle, "_ROM", &h_dummy))) |
904 | return 0; | 901 | return 0; |
905 | 902 | ||
906 | /* Does this device able to configure which video head to be POSTed ? */ | 903 | /* Does this device able to configure which video head to be POSTed ? */ |
907 | if (ACPI_SUCCESS(acpi_get_handle(device->handle, "_VPO", &h_dummy1)) && | 904 | if (ACPI_SUCCESS(acpi_get_handle(device->handle, "_VPO", &h_dummy)) && |
908 | ACPI_SUCCESS(acpi_get_handle(device->handle, "_GPD", &h_dummy2)) && | 905 | ACPI_SUCCESS(acpi_get_handle(device->handle, "_GPD", &h_dummy)) && |
909 | ACPI_SUCCESS(acpi_get_handle(device->handle, "_SPD", &h_dummy3))) | 906 | ACPI_SUCCESS(acpi_get_handle(device->handle, "_SPD", &h_dummy))) |
910 | return 0; | 907 | return 0; |
911 | 908 | ||
912 | return -ENODEV; | 909 | return -ENODEV; |