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

Commit 1e4cffe7 authored by Alexander Chiang's avatar Alexander Chiang Committed by Len Brown
Browse files

ACPI: video: convert to acpi_get_pci_dev 



Now that acpi_get_pci_dev is available, let's use it instead of
acpi_get_physical_pci_device()

Cc: Thomas Renninger <trenn@suse.de>
Signed-off-by: default avatarAlex Chiang <achiang@hp.com>
Acked-by: default avatarBjorn Helgaas <bjorn.helgaas@hp.com>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent 80ffdedf

drivers/acpi/video.c

+3 −3
Original line number Diff line number Diff line
@@ -1054,15 +1054,15 @@ static void acpi_video_bus_find_cap(struct acpi_video_bus *video) 
static int acpi_video_bus_check(struct acpi_video_bus *video)

{

	acpi_status status = -ENOENT;

	struct device *dev;

	struct pci_dev *dev;



	if (!video)

		return -EINVAL;



	dev = acpi_get_physical_pci_device(video->device->handle);

	dev = acpi_get_pci_dev(video->device->handle);

	if (!dev)

		return -ENODEV;

	put_device(dev);

	pci_dev_put(dev);



	/* Since there is no HID, CID and so on for VGA driver, we have

	 * to check well known required nodes.

drivers/acpi/video_detect.c

+5 −4
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ 
 * assinged

 *

 * After PCI devices are glued with ACPI devices

 * acpi_get_physical_pci_device() can be called to identify ACPI graphics

 * acpi_get_pci_dev() can be called to identify ACPI graphics

 * devices for which a real graphics card is plugged in

 *

 * Now acpi_video_get_capabilities() can be called to check which
@@ -36,6 +36,7 @@ 


#include <linux/acpi.h>

#include <linux/dmi.h>

#include <linux/pci.h>



ACPI_MODULE_NAME("video");

#define _COMPONENT		ACPI_VIDEO_COMPONENT
@@ -109,7 +110,7 @@ static acpi_status 
find_video(acpi_handle handle, u32 lvl, void *context, void **rv)

{

	long *cap = context;

	struct device *dev;

	struct pci_dev *dev;

	struct acpi_device *acpi_dev;



	const struct acpi_device_id video_ids[] = {
@@ -120,10 +121,10 @@ find_video(acpi_handle handle, u32 lvl, void *context, void **rv) 
		return AE_OK;



	if (!acpi_match_device_ids(acpi_dev, video_ids)) {

		dev = acpi_get_physical_pci_device(handle);

		dev = acpi_get_pci_dev(handle);

		if (!dev)

			return AE_OK;

		put_device(dev);

		pci_dev_put(dev);

		*cap |= acpi_is_video_device(acpi_dev);

	}

	return AE_OK;