diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2021-12-03 19:37:10 +0300 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2021-12-17 20:45:51 +0300 |
| commit | 99ece713773bfa17fdb4ee2a1fb3b7bee82e4b1a (patch) | |
| tree | dc5fc7a0bdbd65678c60cc8f1125191587e4e2e8 /drivers/acpi/video_detect.c | |
| parent | e3c963c498871e0d4b2eceb32e2b989493838ccc (diff) | |
| download | linux-99ece713773bfa17fdb4ee2a1fb3b7bee82e4b1a.tar.xz | |
ACPI: Use acpi_fetch_acpi_dev() instead of acpi_bus_get_device()
Modify the ACPI code to use acpi_fetch_acpi_dev() instead of
acpi_bus_get_device() where applicable.
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Reviewed-by: Mika Westerberg <mika.westerberg@linux.intel.com>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Diffstat (limited to 'drivers/acpi/video_detect.c')
| -rw-r--r-- | drivers/acpi/video_detect.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/acpi/video_detect.c b/drivers/acpi/video_detect.c index 068e393ea0c6..4f64713e9917 100644 --- a/drivers/acpi/video_detect.c +++ b/drivers/acpi/video_detect.c @@ -59,18 +59,16 @@ static void acpi_video_parse_cmdline(void) static acpi_status find_video(acpi_handle handle, u32 lvl, void *context, void **rv) { + struct acpi_device *acpi_dev = acpi_fetch_acpi_dev(handle); long *cap = context; struct pci_dev *dev; - struct acpi_device *acpi_dev; static const struct acpi_device_id video_ids[] = { {ACPI_VIDEO_HID, 0}, {"", 0}, }; - if (acpi_bus_get_device(handle, &acpi_dev)) - return AE_OK; - if (!acpi_match_device_ids(acpi_dev, video_ids)) { + if (acpi_dev && !acpi_match_device_ids(acpi_dev, video_ids)) { dev = acpi_get_pci_dev(handle); if (!dev) return AE_OK; |