staging/wlags49_h2: Convert pci_table entries to PCI_DEVICE (if PCI_ANY_ID is used) (5fef30b2) · Commits · 戴 / test

This patch converts pci_table entries to use the PCI_DEVICE macro, if .subvendor and .subdevice are set to PCI_ANY_ID, and thus improves readablity. Since CH_Agere_Systems_Mini_PCI_V1 is defined as 0 in hermes_pci_versions and neither the enum nor the value is used anywhere else, we can drop the assignment of .driver_data as it is initialized as 0 by default. Signed-off-by:

Peter Huewe <peterhuewe@gmx.de> Signed-off-by:

Greg Kroah-Hartman <gregkh@suse.de>

drivers/staging/wlags49_h2/wl_pci.c

+3 −10

Original line number	Diff line number	Diff line
		@@ -112,17 +112,10 @@ extern dbg_info_t *DbgInfo;
		#endif // DBG

		/* define the PCI device Table Cardname and id tables */
		enum hermes_pci_versions {
		CH_Agere_Systems_Mini_PCI_V1 = 0,
		};

		static struct pci_device_id wl_pci_tbl[] __devinitdata = {
		{ PCI_VENDOR_ID_WL_LKM, PCI_DEVICE_ID_WL_LKM_0,
		PCI_ANY_ID, PCI_ANY_ID, 0, 0, CH_Agere_Systems_Mini_PCI_V1 },
		{ PCI_VENDOR_ID_WL_LKM, PCI_DEVICE_ID_WL_LKM_1,
		PCI_ANY_ID, PCI_ANY_ID, 0, 0, CH_Agere_Systems_Mini_PCI_V1 },
		{ PCI_VENDOR_ID_WL_LKM, PCI_DEVICE_ID_WL_LKM_2,
		PCI_ANY_ID, PCI_ANY_ID, 0, 0, CH_Agere_Systems_Mini_PCI_V1 },
		{ PCI_DEVICE(PCI_VENDOR_ID_WL_LKM, PCI_DEVICE_ID_WL_LKM_0), },
		{ PCI_DEVICE(PCI_VENDOR_ID_WL_LKM, PCI_DEVICE_ID_WL_LKM_1), },
		{ PCI_DEVICE(PCI_VENDOR_ID_WL_LKM, PCI_DEVICE_ID_WL_LKM_2), },

		{ } /* Terminating entry */
		};

Admin message