Commit 553b84bf authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branch 'pci/enumeration' 

- Add and use pci_get_base_class() to search for all PCI_BASE_CLASS_DISPLAY
  devices (Sui Jingfeng)

- Fix a vmd check for multi-function devices (Ilpo Järvinen)

- Add PCI_HEADER_TYPE_MFD and use it to replace literals (Ilpo Järvinen)

- Use acpi_evaluate_dsm_typed() instead of open-coding it (Andy Shevchenko)

- Keep .remove() and .probe() callbacks (previously marked __init) in case
  they're used via sysfs (Uwe Kleine-König)

* pci/enumeration:
  PCI: keystone: Don't discard .probe() callback
  PCI: keystone: Don't discard .remove() callback
  PCI: kirin: Don't discard .remove() callback
  PCI: exynos: Don't discard .remove() callback
  PCI/ACPI: Use acpi_evaluate_dsm_typed()
  PCI: Use PCI_HEADER_TYPE_* instead of literals
  PCI: Add PCI_HEADER_TYPE_MFD definition
  PCI: vmd: Correct PCI Header Type Register's multi-function check
  drm/radeon: Use pci_get_base_class() to reduce duplicated code
  drm/amdgpu: Use pci_get_base_class() to reduce duplicated code
  drm/nouveau: Use pci_get_base_class() to reduce duplicated code
  ALSA: hda: Use pci_get_base_class() to reduce duplicated code
  PCI: Add pci_get_base_class() helper
parents 4eccbed8 7994db90

drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c

+4 −7
Original line number Diff line number Diff line
@@ -1389,14 +1389,11 @@ void amdgpu_acpi_detect(void) 
	struct pci_dev *pdev = NULL;

	int ret;



	while ((pdev = pci_get_class(PCI_CLASS_DISPLAY_VGA << 8, pdev)) != NULL) {

		if (!atif->handle)

			amdgpu_atif_pci_probe_handle(pdev);

		if (!atcs->handle)

			amdgpu_atcs_pci_probe_handle(pdev);

	}

	while ((pdev = pci_get_base_class(PCI_BASE_CLASS_DISPLAY, pdev))) {

		if ((pdev->class != PCI_CLASS_DISPLAY_VGA << 8) &&

		    (pdev->class != PCI_CLASS_DISPLAY_OTHER << 8))

			continue;



	while ((pdev = pci_get_class(PCI_CLASS_DISPLAY_OTHER << 8, pdev)) != NULL) {

		if (!atif->handle)

			amdgpu_atif_pci_probe_handle(pdev);

		if (!atcs->handle)

drivers/gpu/drm/amd/amdgpu/amdgpu_bios.c

+5 −15
Original line number Diff line number Diff line
@@ -287,20 +287,11 @@ static bool amdgpu_atrm_get_bios(struct amdgpu_device *adev) 
	if (adev->flags & AMD_IS_APU)

		return false;



	while ((pdev = pci_get_class(PCI_CLASS_DISPLAY_VGA << 8, pdev)) != NULL) {

		dhandle = ACPI_HANDLE(&pdev->dev);

		if (!dhandle)

	while ((pdev = pci_get_base_class(PCI_BASE_CLASS_DISPLAY, pdev))) {

		if ((pdev->class != PCI_CLASS_DISPLAY_VGA << 8) &&

		    (pdev->class != PCI_CLASS_DISPLAY_OTHER << 8))

			continue;



		status = acpi_get_handle(dhandle, "ATRM", &atrm_handle);

		if (ACPI_SUCCESS(status)) {

			found = true;

			break;

		}

	}



	if (!found) {

		while ((pdev = pci_get_class(PCI_CLASS_DISPLAY_OTHER << 8, pdev)) != NULL) {

		dhandle = ACPI_HANDLE(&pdev->dev);

		if (!dhandle)

			continue;
@@ -311,7 +302,6 @@ static bool amdgpu_atrm_get_bios(struct amdgpu_device *adev) 
			break;

		}

	}

	}



	if (!found)

		return false;

drivers/gpu/drm/nouveau/nouveau_acpi.c

+4 −7
Original line number Diff line number Diff line
@@ -284,14 +284,11 @@ static bool nouveau_dsm_detect(void) 
		printk("MXM: GUID detected in BIOS\n");



	/* now do DSM detection */

	while ((pdev = pci_get_class(PCI_CLASS_DISPLAY_VGA << 8, pdev)) != NULL) {

		vga_count++;



		nouveau_dsm_pci_probe(pdev, &dhandle, &has_mux, &has_optimus,

				      &has_optimus_flags, &has_power_resources);

	}

	while ((pdev = pci_get_base_class(PCI_BASE_CLASS_DISPLAY, pdev))) {

		if ((pdev->class != PCI_CLASS_DISPLAY_VGA << 8) &&

		    (pdev->class != PCI_CLASS_DISPLAY_3D << 8))

			continue;



	while ((pdev = pci_get_class(PCI_CLASS_DISPLAY_3D << 8, pdev)) != NULL) {

		vga_count++;



		nouveau_dsm_pci_probe(pdev, &dhandle, &has_mux, &has_optimus,

drivers/gpu/drm/radeon/radeon_bios.c

+5 −15
Original line number Diff line number Diff line
@@ -199,20 +199,11 @@ static bool radeon_atrm_get_bios(struct radeon_device *rdev) 
	if (rdev->flags & RADEON_IS_IGP)

		return false;



	while ((pdev = pci_get_class(PCI_CLASS_DISPLAY_VGA << 8, pdev)) != NULL) {

		dhandle = ACPI_HANDLE(&pdev->dev);

		if (!dhandle)

	while ((pdev = pci_get_base_class(PCI_BASE_CLASS_DISPLAY, pdev))) {

		if ((pdev->class != PCI_CLASS_DISPLAY_VGA << 8) &&

		    (pdev->class != PCI_CLASS_DISPLAY_OTHER << 8))

			continue;



		status = acpi_get_handle(dhandle, "ATRM", &atrm_handle);

		if (ACPI_SUCCESS(status)) {

			found = true;

			break;

		}

	}



	if (!found) {

		while ((pdev = pci_get_class(PCI_CLASS_DISPLAY_OTHER << 8, pdev)) != NULL) {

		dhandle = ACPI_HANDLE(&pdev->dev);

		if (!dhandle)

			continue;
@@ -223,7 +214,6 @@ static bool radeon_atrm_get_bios(struct radeon_device *rdev) 
			break;

		}

	}

	}



	if (!found)

		return false;

drivers/pci/controller/dwc/pci-exynos.c

+2 −2
Original line number Diff line number Diff line
@@ -375,7 +375,7 @@ static int exynos_pcie_probe(struct platform_device *pdev) 
	return ret;

}



static int __exit exynos_pcie_remove(struct platform_device *pdev)

static int exynos_pcie_remove(struct platform_device *pdev)

{

	struct exynos_pcie *ep = platform_get_drvdata(pdev);
@@ -431,7 +431,7 @@ static const struct of_device_id exynos_pcie_of_match[] = { 


static struct platform_driver exynos_pcie_driver = {

	.probe		= exynos_pcie_probe,

	.remove		= __exit_p(exynos_pcie_remove),

	.remove		= exynos_pcie_remove,

	.driver = {

		.name	= "exynos-pcie",

		.of_match_table = exynos_pcie_of_match,