Commit ae364fd9 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

nouveau: ACPI: Use the ACPI_COMPANION() macro directly 



The ACPI_HANDLE() macro is a wrapper arond the ACPI_COMPANION()
macro and the ACPI handle produced by the former comes from the
ACPI device object produced by the latter, so it is way more
straightforward to evaluate the latter directly instead of passing
the handle produced by the former to acpi_bus_get_device().

Modify nouveau_acpi_edid() accordingly (no intentional functional
impact).

Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
Reviewed-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent 3906fe9b

drivers/gpu/drm/nouveau/nouveau_acpi.c

+2 −7
Original line number Diff line number Diff line
@@ -364,7 +364,6 @@ void * 
nouveau_acpi_edid(struct drm_device *dev, struct drm_connector *connector)

{

	struct acpi_device *acpidev;

	acpi_handle handle;

	int type, ret;

	void *edid;
@@ -377,12 +376,8 @@ nouveau_acpi_edid(struct drm_device *dev, struct drm_connector *connector) 
		return NULL;

	}



	handle = ACPI_HANDLE(dev->dev);

	if (!handle)

		return NULL;



	ret = acpi_bus_get_device(handle, &acpidev);

	if (ret)

	acpidev = ACPI_COMPANION(dev->dev);

	if (!acpidev)

		return NULL;



	ret = acpi_video_get_edid(acpidev, type, -1, &edid);