Commit 2d2744fc authored by Jeff Garzik's avatar Jeff Garzik
Browse files

[libata] PCI ID table cleanup in various drivers 



* Use PCI_VDEVICE() macro
* const-ify pci_device_id table
* standardize list terminator as "{ }"
* convert spaces to tab in pci_driver struct (Alan-ism)
* various minor whitespace cleanups

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

drivers/ata/pata_ali.c

+5 −4
Original line number Diff line number Diff line
@@ -644,10 +644,11 @@ static int ali_init_one(struct pci_dev *pdev, const struct pci_device_id *id) 
	return ata_pci_init_one(pdev, port_info, 2);

}



static struct pci_device_id ali[] = {

	{ PCI_DEVICE(PCI_VENDOR_ID_AL, PCI_DEVICE_ID_AL_M5228), },

	{ PCI_DEVICE(PCI_VENDOR_ID_AL, PCI_DEVICE_ID_AL_M5229), },

	{ 0, },

static const struct pci_device_id ali[] = {

	{ PCI_VDEVICE(AL, PCI_DEVICE_ID_AL_M5228), },

	{ PCI_VDEVICE(AL, PCI_DEVICE_ID_AL_M5229), },



	{ },

};



static struct pci_driver ali_pci_driver = {

drivers/ata/pata_amd.c

+19 −19
Original line number Diff line number Diff line
@@ -662,23 +662,24 @@ static int amd_init_one(struct pci_dev *pdev, const struct pci_device_id *id) 
}



static const struct pci_device_id amd[] = {

	{ PCI_VENDOR_ID_AMD,	PCI_DEVICE_ID_AMD_COBRA_7401,		PCI_ANY_ID, PCI_ANY_ID, 0, 0,  0 },

	{ PCI_VENDOR_ID_AMD,	PCI_DEVICE_ID_AMD_VIPER_7409,		PCI_ANY_ID, PCI_ANY_ID, 0, 0,  1 },

	{ PCI_VENDOR_ID_AMD,	PCI_DEVICE_ID_AMD_VIPER_7411,		PCI_ANY_ID, PCI_ANY_ID, 0, 0,  3 },

	{ PCI_VENDOR_ID_AMD,	PCI_DEVICE_ID_AMD_OPUS_7441,		PCI_ANY_ID, PCI_ANY_ID, 0, 0,  4 },

	{ PCI_VENDOR_ID_AMD,	PCI_DEVICE_ID_AMD_8111_IDE,		PCI_ANY_ID, PCI_ANY_ID, 0, 0,  5 },

	{ PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_IDE,	PCI_ANY_ID, PCI_ANY_ID, 0, 0,  7 },

	{ PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE2_IDE,	PCI_ANY_ID, PCI_ANY_ID, 0, 0,  8 },

	{ PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE2S_IDE,	PCI_ANY_ID, PCI_ANY_ID, 0, 0,  8 },

	{ PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE3_IDE,	PCI_ANY_ID, PCI_ANY_ID, 0, 0,  8 },

	{ PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE3S_IDE,	PCI_ANY_ID, PCI_ANY_ID, 0, 0, 8 },

	{ PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_CK804_IDE,	PCI_ANY_ID, PCI_ANY_ID, 0, 0, 8 },

	{ PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP04_IDE,	PCI_ANY_ID, PCI_ANY_ID, 0, 0, 8 },

	{ PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP51_IDE,	PCI_ANY_ID, PCI_ANY_ID, 0, 0, 8 },

	{ PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP55_IDE,	PCI_ANY_ID, PCI_ANY_ID, 0, 0, 8 },

	{ PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP61_IDE,	PCI_ANY_ID, PCI_ANY_ID, 0, 0, 8 },

	{ PCI_VENDOR_ID_AMD,	PCI_DEVICE_ID_AMD_CS5536_IDE,		PCI_ANY_ID, PCI_ANY_ID, 0, 0, 9 },

	{ 0, },

	{ PCI_VDEVICE(AMD,	PCI_DEVICE_ID_AMD_COBRA_7401),		0 },

	{ PCI_VDEVICE(AMD,	PCI_DEVICE_ID_AMD_VIPER_7409),		1 },

	{ PCI_VDEVICE(AMD,	PCI_DEVICE_ID_AMD_VIPER_7411),		3 },

	{ PCI_VDEVICE(AMD,	PCI_DEVICE_ID_AMD_OPUS_7441),		4 },

	{ PCI_VDEVICE(AMD,	PCI_DEVICE_ID_AMD_8111_IDE),		5 },

	{ PCI_VDEVICE(NVIDIA,	PCI_DEVICE_ID_NVIDIA_NFORCE_IDE),	7 },

	{ PCI_VDEVICE(NVIDIA,	PCI_DEVICE_ID_NVIDIA_NFORCE2_IDE),	8 },

	{ PCI_VDEVICE(NVIDIA,	PCI_DEVICE_ID_NVIDIA_NFORCE2S_IDE),	8 },

	{ PCI_VDEVICE(NVIDIA,	PCI_DEVICE_ID_NVIDIA_NFORCE3_IDE),	8 },

	{ PCI_VDEVICE(NVIDIA,	PCI_DEVICE_ID_NVIDIA_NFORCE3S_IDE),	8 },

	{ PCI_VDEVICE(NVIDIA,	PCI_DEVICE_ID_NVIDIA_NFORCE_CK804_IDE),	8 },

	{ PCI_VDEVICE(NVIDIA,	PCI_DEVICE_ID_NVIDIA_NFORCE_MCP04_IDE),	8 },

	{ PCI_VDEVICE(NVIDIA,	PCI_DEVICE_ID_NVIDIA_NFORCE_MCP51_IDE),	8 },

	{ PCI_VDEVICE(NVIDIA,	PCI_DEVICE_ID_NVIDIA_NFORCE_MCP55_IDE),	8 },

	{ PCI_VDEVICE(NVIDIA,	PCI_DEVICE_ID_NVIDIA_NFORCE_MCP61_IDE),	8 },

	{ PCI_VDEVICE(AMD,	PCI_DEVICE_ID_AMD_CS5536_IDE),		9 },



	{ },

};



static struct pci_driver amd_pci_driver = {
@@ -698,7 +699,6 @@ static void __exit amd_exit(void) 
	pci_unregister_driver(&amd_pci_driver);

}





MODULE_AUTHOR("Alan Cox");

MODULE_DESCRIPTION("low-level driver for AMD PATA IDE");

MODULE_LICENSE("GPL");

drivers/ata/pata_artop.c

+6 −6
Original line number Diff line number Diff line
@@ -475,11 +475,12 @@ static int artop_init_one (struct pci_dev *pdev, const struct pci_device_id *id) 
}



static const struct pci_device_id artop_pci_tbl[] = {

	{ 0x1191, 0x0005, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},

	{ 0x1191, 0x0006, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 1},

	{ 0x1191, 0x0007, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 1},

	{ 0x1191, 0x0008, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 2},

	{ 0x1191, 0x0009, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 2},

	{ PCI_VDEVICE(ARTOP, 0x0005), 0 },

	{ PCI_VDEVICE(ARTOP, 0x0006), 1 },

	{ PCI_VDEVICE(ARTOP, 0x0007), 1 },

	{ PCI_VDEVICE(ARTOP, 0x0008), 2 },

	{ PCI_VDEVICE(ARTOP, 0x0009), 2 },



	{ }	/* terminate list */

};
@@ -500,7 +501,6 @@ static void __exit artop_exit(void) 
	pci_unregister_driver(&artop_pci_driver);

}





module_init(artop_init);

module_exit(artop_exit);

drivers/ata/pata_atiixp.c

+7 −7
Original line number Diff line number Diff line
@@ -267,12 +267,13 @@ static int atiixp_init_one(struct pci_dev *dev, const struct pci_device_id *id) 
	return ata_pci_init_one(dev, port_info, 2);

}



static struct pci_device_id atiixp[] = {

	{ PCI_DEVICE(PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_IXP200_IDE), },

	{ PCI_DEVICE(PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_IXP300_IDE), },

	{ PCI_DEVICE(PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_IXP400_IDE), },

	{ PCI_DEVICE(PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_IXP600_IDE), },

	{ 0, },

static const struct pci_device_id atiixp[] = {

	{ PCI_VDEVICE(ATI, PCI_DEVICE_ID_ATI_IXP200_IDE), },

	{ PCI_VDEVICE(ATI, PCI_DEVICE_ID_ATI_IXP300_IDE), },

	{ PCI_VDEVICE(ATI, PCI_DEVICE_ID_ATI_IXP400_IDE), },

	{ PCI_VDEVICE(ATI, PCI_DEVICE_ID_ATI_IXP600_IDE), },



	{ },

};



static struct pci_driver atiixp_pci_driver = {
@@ -293,7 +294,6 @@ static void __exit atiixp_exit(void) 
	pci_unregister_driver(&atiixp_pci_driver);

}





MODULE_AUTHOR("Alan Cox");

MODULE_DESCRIPTION("low-level driver for ATI IXP200/300/400");

MODULE_LICENSE("GPL");

drivers/ata/pata_cmd64x.c

+8 −9
Original line number Diff line number Diff line
@@ -468,12 +468,13 @@ static int cmd64x_init_one(struct pci_dev *pdev, const struct pci_device_id *id) 
	return ata_pci_init_one(pdev, port_info, 2);

}



static struct pci_device_id cmd64x[] = {

	{ PCI_VENDOR_ID_CMD, PCI_DEVICE_ID_CMD_643, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},

	{ PCI_VENDOR_ID_CMD, PCI_DEVICE_ID_CMD_646, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 1},

	{ PCI_VENDOR_ID_CMD, PCI_DEVICE_ID_CMD_648, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 4},

	{ PCI_VENDOR_ID_CMD, PCI_DEVICE_ID_CMD_649, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 5},

	{ 0, },

static const struct pci_device_id cmd64x[] = {

	{ PCI_VDEVICE(CMD, PCI_DEVICE_ID_CMD_643), 0 },

	{ PCI_VDEVICE(CMD, PCI_DEVICE_ID_CMD_646), 1 },

	{ PCI_VDEVICE(CMD, PCI_DEVICE_ID_CMD_648), 4 },

	{ PCI_VDEVICE(CMD, PCI_DEVICE_ID_CMD_649), 5 },



	{ },

};



static struct pci_driver cmd64x_pci_driver = {
@@ -488,13 +489,11 @@ static int __init cmd64x_init(void) 
	return pci_register_driver(&cmd64x_pci_driver);

}





static void __exit cmd64x_exit(void)

{

	pci_unregister_driver(&cmd64x_pci_driver);

}





MODULE_AUTHOR("Alan Cox");

MODULE_DESCRIPTION("low-level driver for CMD64x series PATA controllers");

MODULE_LICENSE("GPL");

CRA Git | Maintained and supported by SUSTech CRA and CCSE