x86/amd_nb, char/amd64-agp: Use amd_nb_num() accessor (19d33357) · Commits · 戴 / test

arch/x86/include/asm/amd_nb.h

+0 −1

Original line number	Diff line number	Diff line
		@@ -12,7 +12,6 @@ struct amd_nb_bus_dev_range {
		u8 dev_limit;
		};

		extern const struct pci_device_id amd_nb_misc_ids[];
		extern const struct amd_nb_bus_dev_range amd_nb_bus_dev_ranges[];

		extern bool early_is_amd_nb(u32 value);

+1 −3

Original line number	Diff line number	Diff line
		@@ -36,10 +36,9 @@ static const struct pci_device_id amd_root_ids[] = {
		{}
		};


		#define PCI_DEVICE_ID_AMD_CNB17H_F4 0x1704

		const struct pci_device_id amd_nb_misc_ids[] = {
		static const struct pci_device_id amd_nb_misc_ids[] = {
		{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_K8_NB_MISC) },
		{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_10H_NB_MISC) },
		{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_15H_NB_F3) },
		@@ -56,7 +55,6 @@ const struct pci_device_id amd_nb_misc_ids[] = {
		{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_19H_DF_F3) },
		{}
		};
		EXPORT_SYMBOL_GPL(amd_nb_misc_ids);

		static const struct pci_device_id amd_nb_link_ids[] = {
		{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_15H_NB_F4) },

+1 −1

Original line number	Diff line number	Diff line
		@@ -775,7 +775,7 @@ int __init agp_amd64_init(void)
		}

		/* First check that we have at least one AMD64 NB */
		if (!pci_dev_present(amd_nb_misc_ids)) {
		if (!amd_nb_num()) {
		pci_unregister_driver(&agp_amd64_pci_driver);
		return -ENODEV;
		}