Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 66fb9d12 authored by Thomas Renninger's avatar Thomas Renninger Committed by Len Brown
Browse files

ACPI: Cleanup: Remove unneeded, multiple local dummy variables 



Signed-off-by: default avatarThomas Renninger <trenn@suse.de>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent c46e5658

drivers/acpi/scan.c

+7 −10
Original line number Diff line number Diff line
@@ -882,10 +882,7 @@ static void acpi_device_get_busid(struct acpi_device *device, 
static int

acpi_video_bus_match(struct acpi_device *device)

{

	acpi_handle h_dummy1;

	acpi_handle h_dummy2;

	acpi_handle h_dummy3;



	acpi_handle h_dummy;



	if (!device)

		return -EINVAL;
@@ -895,18 +892,18 @@ acpi_video_bus_match(struct acpi_device *device) 
	 */



	/* Does this device able to support video switching ? */

	if (ACPI_SUCCESS(acpi_get_handle(device->handle, "_DOD", &h_dummy1)) &&

	    ACPI_SUCCESS(acpi_get_handle(device->handle, "_DOS", &h_dummy2)))

	if (ACPI_SUCCESS(acpi_get_handle(device->handle, "_DOD", &h_dummy)) &&

	    ACPI_SUCCESS(acpi_get_handle(device->handle, "_DOS", &h_dummy)))

		return 0;



	/* Does this device able to retrieve a video ROM ? */

	if (ACPI_SUCCESS(acpi_get_handle(device->handle, "_ROM", &h_dummy1)))

	if (ACPI_SUCCESS(acpi_get_handle(device->handle, "_ROM", &h_dummy)))

		return 0;



	/* Does this device able to configure which video head to be POSTed ? */

	if (ACPI_SUCCESS(acpi_get_handle(device->handle, "_VPO", &h_dummy1)) &&

	    ACPI_SUCCESS(acpi_get_handle(device->handle, "_GPD", &h_dummy2)) &&

	    ACPI_SUCCESS(acpi_get_handle(device->handle, "_SPD", &h_dummy3)))

	if (ACPI_SUCCESS(acpi_get_handle(device->handle, "_VPO", &h_dummy)) &&

	    ACPI_SUCCESS(acpi_get_handle(device->handle, "_GPD", &h_dummy)) &&

	    ACPI_SUCCESS(acpi_get_handle(device->handle, "_SPD", &h_dummy)))

		return 0;



	return -ENODEV;