On Wed, 13 Oct 2021 at 03:58, Rafael J. Wysocki <rjw@xxxxxxxxxxxxx> wrote:
>
> From: Rafael J. Wysocki <rafael@xxxxxxxxxx>
>
> 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: Rafael J. Wysocki <rafael@xxxxxxxxxx>
Reviewed-by: Ben Skeggs <bskeggs@xxxxxxxxxx>
> ---
> drivers/gpu/drm/nouveau/nouveau_acpi.c | 9 ++-------
> 1 file changed, 2 insertions(+), 7 deletions(-)
>
> Index: linux-pm/drivers/gpu/drm/nouveau/nouveau_acpi.c
> ===================================================================
> --- linux-pm.orig/drivers/gpu/drm/nouveau/nouveau_acpi.c
> +++ linux-pm/drivers/gpu/drm/nouveau/nouveau_acpi.c
> @@ -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
> 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);
>
>
>
