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

Commit 54bb3a94 authored by Jeff Garzik's avatar Jeff Garzik
Browse files

[libata] Use new PCI_VDEVICE() macro to dramatically shorten ID lists 



Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent 3b9f6cb8

drivers/ata/ahci.c

+30 −60
Original line number Diff line number Diff line
@@ -299,76 +299,46 @@ static const struct ata_port_info ahci_port_info[] = { 


static const struct pci_device_id ahci_pci_tbl[] = {

	/* Intel */

	{ PCI_VENDOR_ID_INTEL, 0x2652, PCI_ANY_ID, PCI_ANY_ID, 0, 0,

	  board_ahci }, /* ICH6 */

	{ PCI_VENDOR_ID_INTEL, 0x2653, PCI_ANY_ID, PCI_ANY_ID, 0, 0,

	  board_ahci }, /* ICH6M */

	{ PCI_VENDOR_ID_INTEL, 0x27c1, PCI_ANY_ID, PCI_ANY_ID, 0, 0,

	  board_ahci }, /* ICH7 */

	{ PCI_VENDOR_ID_INTEL, 0x27c5, PCI_ANY_ID, PCI_ANY_ID, 0, 0,

	  board_ahci }, /* ICH7M */

	{ PCI_VENDOR_ID_INTEL, 0x27c3, PCI_ANY_ID, PCI_ANY_ID, 0, 0,

	  board_ahci }, /* ICH7R */

	{ PCI_VENDOR_ID_AL, 0x5288, PCI_ANY_ID, PCI_ANY_ID, 0, 0,

	  board_ahci }, /* ULi M5288 */

	{ PCI_VENDOR_ID_INTEL, 0x2681, PCI_ANY_ID, PCI_ANY_ID, 0, 0,

	  board_ahci }, /* ESB2 */

	{ PCI_VENDOR_ID_INTEL, 0x2682, PCI_ANY_ID, PCI_ANY_ID, 0, 0,

	  board_ahci }, /* ESB2 */

	{ PCI_VENDOR_ID_INTEL, 0x2683, PCI_ANY_ID, PCI_ANY_ID, 0, 0,

	  board_ahci }, /* ESB2 */

	{ PCI_VENDOR_ID_INTEL, 0x27c6, PCI_ANY_ID, PCI_ANY_ID, 0, 0,

	  board_ahci }, /* ICH7-M DH */

	{ PCI_VENDOR_ID_INTEL, 0x2821, PCI_ANY_ID, PCI_ANY_ID, 0, 0,

	  board_ahci }, /* ICH8 */

	{ PCI_VENDOR_ID_INTEL, 0x2822, PCI_ANY_ID, PCI_ANY_ID, 0, 0,

	  board_ahci }, /* ICH8 */

	{ PCI_VENDOR_ID_INTEL, 0x2824, PCI_ANY_ID, PCI_ANY_ID, 0, 0,

	  board_ahci }, /* ICH8 */

	{ PCI_VENDOR_ID_INTEL, 0x2829, PCI_ANY_ID, PCI_ANY_ID, 0, 0,

	  board_ahci }, /* ICH8M */

	{ PCI_VENDOR_ID_INTEL, 0x282a, PCI_ANY_ID, PCI_ANY_ID, 0, 0,

	  board_ahci }, /* ICH8M */

	{ PCI_VDEVICE(INTEL, 0x2652), board_ahci }, /* ICH6 */

	{ PCI_VDEVICE(INTEL, 0x2653), board_ahci }, /* ICH6M */

	{ PCI_VDEVICE(INTEL, 0x27c1), board_ahci }, /* ICH7 */

	{ PCI_VDEVICE(INTEL, 0x27c5), board_ahci }, /* ICH7M */

	{ PCI_VDEVICE(INTEL, 0x27c3), board_ahci }, /* ICH7R */

	{ PCI_VDEVICE(AL, 0x5288), board_ahci }, /* ULi M5288 */

	{ PCI_VDEVICE(INTEL, 0x2681), board_ahci }, /* ESB2 */

	{ PCI_VDEVICE(INTEL, 0x2682), board_ahci }, /* ESB2 */

	{ PCI_VDEVICE(INTEL, 0x2683), board_ahci }, /* ESB2 */

	{ PCI_VDEVICE(INTEL, 0x27c6), board_ahci }, /* ICH7-M DH */

	{ PCI_VDEVICE(INTEL, 0x2821), board_ahci }, /* ICH8 */

	{ PCI_VDEVICE(INTEL, 0x2822), board_ahci }, /* ICH8 */

	{ PCI_VDEVICE(INTEL, 0x2824), board_ahci }, /* ICH8 */

	{ PCI_VDEVICE(INTEL, 0x2829), board_ahci }, /* ICH8M */

	{ PCI_VDEVICE(INTEL, 0x282a), board_ahci }, /* ICH8M */



	/* JMicron */

	{ 0x197b, 0x2360, PCI_ANY_ID, PCI_ANY_ID, 0, 0,

	  board_ahci }, /* JMicron JMB360 */

	{ 0x197b, 0x2361, PCI_ANY_ID, PCI_ANY_ID, 0, 0,

	  board_ahci }, /* JMicron JMB361 */

	{ 0x197b, 0x2363, PCI_ANY_ID, PCI_ANY_ID, 0, 0,

	  board_ahci }, /* JMicron JMB363 */

	{ 0x197b, 0x2365, PCI_ANY_ID, PCI_ANY_ID, 0, 0,

	  board_ahci }, /* JMicron JMB365 */

	{ 0x197b, 0x2366, PCI_ANY_ID, PCI_ANY_ID, 0, 0,

	  board_ahci }, /* JMicron JMB366 */

	{ PCI_VDEVICE(JMICRON, 0x2360), board_ahci }, /* JMicron JMB360 */

	{ PCI_VDEVICE(JMICRON, 0x2361), board_ahci }, /* JMicron JMB361 */

	{ PCI_VDEVICE(JMICRON, 0x2363), board_ahci }, /* JMicron JMB363 */

	{ PCI_VDEVICE(JMICRON, 0x2365), board_ahci }, /* JMicron JMB365 */

	{ PCI_VDEVICE(JMICRON, 0x2366), board_ahci }, /* JMicron JMB366 */



	/* ATI */

	{ PCI_VENDOR_ID_ATI, 0x4380, PCI_ANY_ID, PCI_ANY_ID, 0, 0,

	  board_ahci }, /* ATI SB600 non-raid */

	{ PCI_VENDOR_ID_ATI, 0x4381, PCI_ANY_ID, PCI_ANY_ID, 0, 0,

	  board_ahci }, /* ATI SB600 raid */

	{ PCI_VDEVICE(ATI, 0x4380), board_ahci }, /* ATI SB600 non-raid */

	{ PCI_VDEVICE(ATI, 0x4381), board_ahci }, /* ATI SB600 raid */



	/* VIA */

	{ PCI_VENDOR_ID_VIA, 0x3349, PCI_ANY_ID, PCI_ANY_ID, 0, 0,

	  board_ahci_vt8251 }, /* VIA VT8251 */

	{ PCI_VDEVICE(VIA, 0x3349), board_ahci_vt8251 }, /* VIA VT8251 */



	/* NVIDIA */

	{ PCI_VENDOR_ID_NVIDIA, 0x044c, PCI_ANY_ID, PCI_ANY_ID, 0, 0,

	  board_ahci },		/* MCP65 */

	{ PCI_VENDOR_ID_NVIDIA, 0x044d, PCI_ANY_ID, PCI_ANY_ID, 0, 0,

	  board_ahci },		/* MCP65 */

	{ PCI_VENDOR_ID_NVIDIA, 0x044e, PCI_ANY_ID, PCI_ANY_ID, 0, 0,

	  board_ahci },		/* MCP65 */

	{ PCI_VENDOR_ID_NVIDIA, 0x044f, PCI_ANY_ID, PCI_ANY_ID, 0, 0,

	  board_ahci },		/* MCP65 */

	{ PCI_VDEVICE(NVIDIA, 0x044c), board_ahci },		/* MCP65 */

	{ PCI_VDEVICE(NVIDIA, 0x044d), board_ahci },		/* MCP65 */

	{ PCI_VDEVICE(NVIDIA, 0x044e), board_ahci },		/* MCP65 */

	{ PCI_VDEVICE(NVIDIA, 0x044f), board_ahci },		/* MCP65 */



	/* SiS */

	{ PCI_VENDOR_ID_SI, 0x1184, PCI_ANY_ID, PCI_ANY_ID, 0, 0,

	  board_ahci }, /* SiS 966 */

	{ PCI_VENDOR_ID_SI, 0x1185, PCI_ANY_ID, PCI_ANY_ID, 0, 0,

	  board_ahci }, /* SiS 966 */

	{ PCI_VENDOR_ID_SI, 0x0186, PCI_ANY_ID, PCI_ANY_ID, 0, 0,

	  board_ahci }, /* SiS 968 */

	{ PCI_VDEVICE(SI, 0x1184), board_ahci }, /* SiS 966 */

	{ PCI_VDEVICE(SI, 0x1185), board_ahci }, /* SiS 966 */

	{ PCI_VDEVICE(SI, 0x0186), board_ahci }, /* SiS 968 */



	{ }	/* terminate list */

};

drivers/ata/pdc_adma.c

+1 −2
Original line number Diff line number Diff line
@@ -192,8 +192,7 @@ static struct ata_port_info adma_port_info[] = { 
};



static const struct pci_device_id adma_ata_pci_tbl[] = {

	{ PCI_VENDOR_ID_PDC, 0x1841, PCI_ANY_ID, PCI_ANY_ID, 0, 0,

	  board_1841_idx },

	{ PCI_VDEVICE(PDC, 0x1841), board_1841_idx },



	{ }	/* terminate list */

};

drivers/ata/sata_nv.c

+18 −32
Original line number Diff line number Diff line
@@ -106,38 +106,24 @@ enum nv_host_type 
};



static const struct pci_device_id nv_pci_tbl[] = {

	{ PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE2S_SATA,

		PCI_ANY_ID, PCI_ANY_ID, 0, 0, NFORCE2 },

	{ PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE3S_SATA,

		PCI_ANY_ID, PCI_ANY_ID, 0, 0, NFORCE3 },

	{ PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE3S_SATA2,

		PCI_ANY_ID, PCI_ANY_ID, 0, 0, NFORCE3 },

	{ PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_CK804_SATA,

		PCI_ANY_ID, PCI_ANY_ID, 0, 0, CK804 },

	{ PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_CK804_SATA2,

		PCI_ANY_ID, PCI_ANY_ID, 0, 0, CK804 },

	{ PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP04_SATA,

		PCI_ANY_ID, PCI_ANY_ID, 0, 0, CK804 },

	{ PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP04_SATA2,

		PCI_ANY_ID, PCI_ANY_ID, 0, 0, CK804 },

	{ PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP51_SATA,

		PCI_ANY_ID, PCI_ANY_ID, 0, 0, GENERIC },

	{ PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP51_SATA2,

		PCI_ANY_ID, PCI_ANY_ID, 0, 0, GENERIC },

	{ PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP55_SATA,

		PCI_ANY_ID, PCI_ANY_ID, 0, 0, GENERIC },

	{ PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP55_SATA2,

		PCI_ANY_ID, PCI_ANY_ID, 0, 0, GENERIC },

	{ PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP61_SATA,

		PCI_ANY_ID, PCI_ANY_ID, 0, 0, GENERIC },

	{ PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP61_SATA2,

		PCI_ANY_ID, PCI_ANY_ID, 0, 0, GENERIC },

	{ PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP61_SATA3,

		PCI_ANY_ID, PCI_ANY_ID, 0, 0, GENERIC },

	{ PCI_VENDOR_ID_NVIDIA, 0x045c, PCI_ANY_ID, PCI_ANY_ID, 0, 0, GENERIC },

	{ PCI_VENDOR_ID_NVIDIA, 0x045d, PCI_ANY_ID, PCI_ANY_ID, 0, 0, GENERIC },

	{ PCI_VENDOR_ID_NVIDIA, 0x045e, PCI_ANY_ID, PCI_ANY_ID, 0, 0, GENERIC },

	{ PCI_VENDOR_ID_NVIDIA, 0x045f, PCI_ANY_ID, PCI_ANY_ID, 0, 0, GENERIC },

	{ PCI_VDEVICE(NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE2S_SATA), NFORCE2 },

	{ PCI_VDEVICE(NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE3S_SATA), NFORCE3 },

	{ PCI_VDEVICE(NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE3S_SATA2), NFORCE3 },

	{ PCI_VDEVICE(NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_CK804_SATA), CK804 },

	{ PCI_VDEVICE(NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_CK804_SATA2), CK804 },

	{ PCI_VDEVICE(NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP04_SATA), CK804 },

	{ PCI_VDEVICE(NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP04_SATA2), CK804 },

	{ PCI_VDEVICE(NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP51_SATA), GENERIC },

	{ PCI_VDEVICE(NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP51_SATA2), GENERIC },

	{ PCI_VDEVICE(NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP55_SATA), GENERIC },

	{ PCI_VDEVICE(NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP55_SATA2), GENERIC },

	{ PCI_VDEVICE(NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP61_SATA), GENERIC },

	{ PCI_VDEVICE(NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP61_SATA2), GENERIC },

	{ PCI_VDEVICE(NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP61_SATA3), GENERIC },

	{ PCI_VDEVICE(NVIDIA, 0x045c), GENERIC },

	{ PCI_VDEVICE(NVIDIA, 0x045d), GENERIC },

	{ PCI_VDEVICE(NVIDIA, 0x045e), GENERIC },

	{ PCI_VDEVICE(NVIDIA, 0x045f), GENERIC },

	{ PCI_VENDOR_ID_NVIDIA, PCI_ANY_ID,

		PCI_ANY_ID, PCI_ANY_ID,

		PCI_CLASS_STORAGE_IDE<<8, 0xffff00, GENERIC },

drivers/ata/sata_promise.c

+19 −36
Original line number Diff line number Diff line
@@ -234,48 +234,31 @@ static const struct ata_port_info pdc_port_info[] = { 
};



static const struct pci_device_id pdc_ata_pci_tbl[] = {

	{ PCI_VENDOR_ID_PROMISE, 0x3371, PCI_ANY_ID, PCI_ANY_ID, 0, 0,

	  board_2037x },

	{ PCI_VENDOR_ID_PROMISE, 0x3570, PCI_ANY_ID, PCI_ANY_ID, 0, 0,

	  board_2037x },

	{ PCI_VENDOR_ID_PROMISE, 0x3571, PCI_ANY_ID, PCI_ANY_ID, 0, 0,

	  board_2037x },

	{ PCI_VENDOR_ID_PROMISE, 0x3373, PCI_ANY_ID, PCI_ANY_ID, 0, 0,

	  board_2037x },

	{ PCI_VENDOR_ID_PROMISE, 0x3375, PCI_ANY_ID, PCI_ANY_ID, 0, 0,

	  board_2037x },

	{ PCI_VENDOR_ID_PROMISE, 0x3376, PCI_ANY_ID, PCI_ANY_ID, 0, 0,

	  board_2037x },

	{ PCI_VENDOR_ID_PROMISE, 0x3574, PCI_ANY_ID, PCI_ANY_ID, 0, 0,

	  board_2057x },

	{ PCI_VENDOR_ID_PROMISE, 0x3d75, PCI_ANY_ID, PCI_ANY_ID, 0, 0,

	  board_2057x },

	{ PCI_VENDOR_ID_PROMISE, 0x3d73, PCI_ANY_ID, PCI_ANY_ID, 0, 0,

	  board_2037x },



	{ PCI_VENDOR_ID_PROMISE, 0x3318, PCI_ANY_ID, PCI_ANY_ID, 0, 0,

	  board_20319 },

	{ PCI_VENDOR_ID_PROMISE, 0x3319, PCI_ANY_ID, PCI_ANY_ID, 0, 0,

	  board_20319 },

	{ PCI_VENDOR_ID_PROMISE, 0x3515, PCI_ANY_ID, PCI_ANY_ID, 0, 0,

	  board_20319 },

	{ PCI_VENDOR_ID_PROMISE, 0x3519, PCI_ANY_ID, PCI_ANY_ID, 0, 0,

	  board_20319 },

	{ PCI_VENDOR_ID_PROMISE, 0x3d17, PCI_ANY_ID, PCI_ANY_ID, 0, 0,

	  board_20319 },

	{ PCI_VENDOR_ID_PROMISE, 0x3d18, PCI_ANY_ID, PCI_ANY_ID, 0, 0,

	  board_40518 },



	{ PCI_VENDOR_ID_PROMISE, 0x6629, PCI_ANY_ID, PCI_ANY_ID, 0, 0,

	  board_20619 },

	{ PCI_VDEVICE(PROMISE, 0x3371), board_2037x },

	{ PCI_VDEVICE(PROMISE, 0x3570), board_2037x },

	{ PCI_VDEVICE(PROMISE, 0x3571), board_2037x },

	{ PCI_VDEVICE(PROMISE, 0x3373), board_2037x },

	{ PCI_VDEVICE(PROMISE, 0x3375), board_2037x },

	{ PCI_VDEVICE(PROMISE, 0x3376), board_2037x },

	{ PCI_VDEVICE(PROMISE, 0x3574), board_2057x },

	{ PCI_VDEVICE(PROMISE, 0x3d75), board_2057x },

	{ PCI_VDEVICE(PROMISE, 0x3d73), board_2037x },



	{ PCI_VDEVICE(PROMISE, 0x3318), board_20319 },

	{ PCI_VDEVICE(PROMISE, 0x3319), board_20319 },

	{ PCI_VDEVICE(PROMISE, 0x3515), board_20319 },

	{ PCI_VDEVICE(PROMISE, 0x3519), board_20319 },

	{ PCI_VDEVICE(PROMISE, 0x3d17), board_20319 },

	{ PCI_VDEVICE(PROMISE, 0x3d18), board_40518 },



	{ PCI_VDEVICE(PROMISE, 0x6629), board_20619 },



/* TODO: remove all associated board_20771 code, as it completely

 * duplicates board_2037x code, unless reason for separation can be

 * divined.

 */

#if 0

	{ PCI_VENDOR_ID_PROMISE, 0x3570, PCI_ANY_ID, PCI_ANY_ID, 0, 0,

	  board_20771 },

	{ PCI_VDEVICE(PROMISE, 0x3570), board_20771 },

#endif



	{ }	/* terminate list */

drivers/ata/sata_sil.c

+8 −7
Original line number Diff line number Diff line
@@ -123,13 +123,14 @@ static void sil_thaw(struct ata_port *ap); 




static const struct pci_device_id sil_pci_tbl[] = {

	{ 0x1095, 0x3112, PCI_ANY_ID, PCI_ANY_ID, 0, 0, sil_3112 },

	{ 0x1095, 0x0240, PCI_ANY_ID, PCI_ANY_ID, 0, 0, sil_3112 },

	{ 0x1095, 0x3512, PCI_ANY_ID, PCI_ANY_ID, 0, 0, sil_3512 },

	{ 0x1095, 0x3114, PCI_ANY_ID, PCI_ANY_ID, 0, 0, sil_3114 },

	{ 0x1002, 0x436e, PCI_ANY_ID, PCI_ANY_ID, 0, 0, sil_3112 },

	{ 0x1002, 0x4379, PCI_ANY_ID, PCI_ANY_ID, 0, 0, sil_3112_no_sata_irq },

	{ 0x1002, 0x437a, PCI_ANY_ID, PCI_ANY_ID, 0, 0, sil_3112_no_sata_irq },

	{ PCI_VDEVICE(CMD, 0x3112), sil_3112 },

	{ PCI_VDEVICE(CMD, 0x0240), sil_3112 },

	{ PCI_VDEVICE(CMD, 0x3512), sil_3512 },

	{ PCI_VDEVICE(CMD, 0x3114), sil_3114 },

	{ PCI_VDEVICE(ATI, 0x436e), sil_3112 },

	{ PCI_VDEVICE(ATI, 0x4379), sil_3112_no_sata_irq },

	{ PCI_VDEVICE(ATI, 0x437a), sil_3112_no_sata_irq },



	{ }	/* terminate list */

};