Skip to contentSkip to conversation

Modular IDE drivers

PATCH In review Hannes Reinecke 2 participants 3 messages Mar 18, 2004

lore
Share & tools
lore

Hannes Reinecke

author
#0 lore raw

PATCH 1/1 Modular IDE drivers

Hi all,

the attached patch is required to have modular IDE drivers announce themselves properly in modules.pcimap. Two drivers are missing (triflex.c and cmd640.c) since they haven't been converted to new-style PCI drivers.

Any reason _not_ to apply this patch?

Please keep me cc'ed as I'm not subscribed.

Cheers,

Hannes

Signature · 4 lines
Dr. Hannes Reinecke			[email protected]
SuSE Linux AG				S390 & zSeries
Maxfeldstraße 5				+49 911 74053 688
90409 Nürnberg				http://www.suse.de
drivers/ide/pci/aec62xx.c renamed from drivers/ide/pci/aec62xx.c.orig +1 -0
@@ -539,6 +539,7 @@
 	{ PCI_VENDOR_ID_ARTOP, PCI_DEVICE_ID_ARTOP_ATP865R,  PCI_ANY_ID, PCI_ANY_ID, 0, 0, 4 },
 	{ 0, },
 };
+MODULE_DEVICE_TABLE(pci, aec62xx_pci_tbl);
 
 static struct pci_driver driver = {
 	.name		= "AEC62xx IDE",
drivers/ide/pci/alim15x3.c renamed from drivers/ide/pci/alim15x3.c.orig +1 -0
@@ -880,6 +880,7 @@
 	{ PCI_VENDOR_ID_AL, PCI_DEVICE_ID_AL_M5229, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
 	{ 0, },
 };
+MODULE_DEVICE_TABLE(pci, alim15x3_pci_tbl);
 
 static struct pci_driver driver = {
 	.name		= "ALI15x3 IDE",
drivers/ide/pci/amd74xx.c renamed from drivers/ide/pci/amd74xx.c.orig +3 -1
@@ -467,7 +467,8 @@
 	{ PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE3S_SATA2,	PCI_ANY_ID, PCI_ANY_ID, 0, 0, 12 },
 	{ 0, },
 };
+MODULE_DEVICE_TABLE(pci, amd74xx_pci_tbl);
 
 static struct pci_driver driver = {
 	.name		= "AMD IDE",
--- linux-2.6.4/drivers/ide/pci/cmd64x.c.orig	2004-03-17 09:31:06.361302309 +0100
+++ linux-2.6.4/drivers/ide/pci/cmd64x.c	2004-03-17 09:31:20.982428681 +0100

@@ -760,6 +760,7 @@
 	{ PCI_VENDOR_ID_CMD, PCI_DEVICE_ID_CMD_649, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 3},
 	{ 0, },
 };
+MODULE_DEVICE_TABLE(pci, cmd64x_pci_tbl);
 
 static struct pci_driver driver = {
 	.name		= "CMD64x IDE",
drivers/ide/pci/cy82c693.c renamed from drivers/ide/pci/cy82c693.c.orig +1 -0
@@ -441,6 +441,7 @@
 	{ PCI_VENDOR_ID_CONTAQ, PCI_DEVICE_ID_CONTAQ_82C693, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
 	{ 0, },
 };
+MODULE_DEVICE_TABLE(pci, cy82c693_pci_tbl);
 
 static struct pci_driver driver = {
 	.name		= "Cypress IDE",
drivers/ide/pci/generic.c renamed from drivers/ide/pci/generic.c.orig +1 -0
@@ -134,6 +134,7 @@
 	{ PCI_VENDOR_ID_VIA,	PCI_DEVICE_ID_VIA_8237_SATA,	   PCI_ANY_ID, PCI_ANY_ID, 0, 0, 9},
 	{ 0, },
 };
+MODULE_DEVICE_TABLE(pci, generic_pci_tbl);
 
 static struct pci_driver driver = {
 	.name		= "PCI IDE",
drivers/ide/pci/hpt34x.c renamed from drivers/ide/pci/hpt34x.c.orig +1 -0
@@ -336,6 +336,7 @@
 	{ PCI_VENDOR_ID_TTI, PCI_DEVICE_ID_TTI_HPT343, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
 	{ 0, },
 };
+MODULE_DEVICE_TABLE(pci, hpt34x_pci_tbl);
 
 static struct pci_driver driver = {
 	.name		= "HPT34x IDE",
drivers/ide/pci/hpt366.c renamed from drivers/ide/pci/hpt366.c.orig +1 -0
@@ -1228,6 +1228,7 @@
 	{ PCI_VENDOR_ID_TTI, PCI_DEVICE_ID_TTI_HPT374, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 4},
 	{ 0, },
 };
+MODULE_DEVICE_TABLE(pci, hpt366_pci_tbl);
 
 static struct pci_driver driver = {
 	.name		= "HPT366 IDE",
drivers/ide/pci/it8172.c renamed from drivers/ide/pci/it8172.c.orig +1 -0
@@ -300,6 +300,7 @@
 	{ PCI_VENDOR_ID_ITE, PCI_DEVICE_ID_ITE_IT8172G, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
 	{ 0, },
 };
+MODULE_DEVICE_TABLE(pci, it8172_pci_tbl);
 
 static struct pci_driver driver = {
 	.name		= "IT8172IDE",
drivers/ide/pci/ns87415.c renamed from drivers/ide/pci/ns87415.c.orig +1 -0
@@ -230,6 +230,7 @@
 	{ PCI_VENDOR_ID_NS, PCI_DEVICE_ID_NS_87415, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
 	{ 0, },
 };
+MODULE_DEVICE_TABLE(pci, ns87415_pci_tbl);
 
 static struct pci_driver driver = {
 	.name		= "NS87415IDE",
drivers/ide/pci/opti621.c renamed from drivers/ide/pci/opti621.c.orig +1 -0
@@ -367,6 +367,7 @@
 	{ PCI_VENDOR_ID_OPTI, PCI_DEVICE_ID_OPTI_82C825, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 1},
 	{ 0, },
 };
+MODULE_DEVICE_TABLE(pci, opti621_pci_tbl);
 
 static struct pci_driver driver = {
 	.name		= "Opti621 IDE",
drivers/ide/pci/pdc202xx_new.c renamed from drivers/ide/pci/pdc202xx_new.c.orig +1 -0
@@ -534,6 +534,7 @@
 	{ PCI_VENDOR_ID_PROMISE, PCI_DEVICE_ID_PROMISE_20277, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 6},
 	{ 0, },
 };
+MODULE_DEVICE_TABLE(pci, pdc202new_pci_tbl);
 
 static struct pci_driver driver = {
 	.name		= "Promise IDE",
drivers/ide/pci/pdc202xx_old.c renamed from drivers/ide/pci/pdc202xx_old.c.orig +1 -0
@@ -902,6 +902,7 @@
 	{ PCI_VENDOR_ID_PROMISE, PCI_DEVICE_ID_PROMISE_20267, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 4},
 	{ 0, },
 };
+MODULE_DEVICE_TABLE(pci, pdc202xx_pci_tbl);
 
 static struct pci_driver driver = {
 	.name		= "Promise Old IDE",
drivers/ide/pci/piix.c renamed from drivers/ide/pci/piix.c.orig +1 -0
@@ -807,6 +807,7 @@
 	{ PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH6_2, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 20},
 	{ 0, },
 };
+MODULE_DEVICE_TABLE(pci, piix_pci_tbl);
 
 static struct pci_driver driver = {
 	.name		= "PIIX IDE",
drivers/ide/pci/rz1000.c renamed from drivers/ide/pci/rz1000.c.orig +1 -0
@@ -68,6 +68,7 @@
 	{ PCI_VENDOR_ID_PCTECH, PCI_DEVICE_ID_PCTECH_RZ1001, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 1},
 	{ 0, },
 };
+MODULE_DEVICE_TABLE(pci, rz1000_pci_tbl);
 
 static struct pci_driver driver = {
 	.name		= "RZ1000 IDE",
drivers/ide/pci/sc1200.c renamed from drivers/ide/pci/sc1200.c.orig +1 -0
@@ -558,6 +558,7 @@
 	{ PCI_VENDOR_ID_NS, PCI_DEVICE_ID_NS_SCx200_IDE, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
 	{ 0, },
 };
+MODULE_DEVICE_TABLE(pci, sc1200_pci_tbl);
 
 static struct pci_driver driver = {
 	.name		= "SC1200 IDE",
drivers/ide/pci/serverworks.c renamed from drivers/ide/pci/serverworks.c.orig +2 -0
@@ -809,6 +809,8 @@
 	{ PCI_VENDOR_ID_SERVERWORKS, PCI_DEVICE_ID_SERVERWORKS_CSB6IDE2, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 3},
 	{ 0, },
 };
+MODULE_DEVICE_TABLE(pci, svwks_pci_tbl);
+
 
 static struct pci_driver driver = {
 	.name		= "Serverworks IDE",
drivers/ide/pci/sgiioc4.c renamed from drivers/ide/pci/sgiioc4.c.orig +1 -0
@@ -790,6 +790,7 @@
 	 PCI_ANY_ID, 0x0b4000, 0xFFFFFF, 0},
 	{0}
 };
+MODULE_DEVICE_TABLE(pci, sgiioc4_pci_tbl);
 
 static struct pci_driver driver = {
 	.name = "SGI-IOC4 IDE",
drivers/ide/pci/siimage.c renamed from drivers/ide/pci/siimage.c.orig +1 -0
@@ -1196,6 +1196,7 @@
 	{ PCI_VENDOR_ID_CMD, PCI_DEVICE_ID_SII_1210SA, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 2},
 	{ 0, },
 };
+MODULE_DEVICE_TABLE(pci, siimage_pci_tbl);
 
 static struct pci_driver driver = {
 	.name		= "SiI IDE",
drivers/ide/pci/sis5513.c renamed from drivers/ide/pci/sis5513.c.orig +1 -0
@@ -957,6 +957,7 @@
 	{ PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_5513, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
 	{ 0, },
 };
+MODULE_DEVICE_TABLE(pci, sis5513_pci_tbl);
 
 static struct pci_driver driver = {
 	.name		= "SIS IDE",
drivers/ide/pci/sl82c105.c renamed from drivers/ide/pci/sl82c105.c.orig +1 -0
@@ -494,6 +494,7 @@
 	{ PCI_VENDOR_ID_WINBOND, PCI_DEVICE_ID_WINBOND_82C105, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
 	{ 0, },
 };
+MODULE_DEVICE_TABLE(pci, sl82c105_pci_tbl);
 
 static struct pci_driver driver = {
 	.name		= "W82C105 IDE",
drivers/ide/pci/slc90e66.c renamed from drivers/ide/pci/slc90e66.c.orig +1 -0
@@ -377,6 +377,7 @@
 	{ PCI_VENDOR_ID_EFAR, PCI_DEVICE_ID_EFAR_SLC90E66_1, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
 	{ 0, },
 };
+MODULE_DEVICE_TABLE(pci, slc90e66_pci_tbl);
 
 static struct pci_driver driver = {
 	.name		= "SLC90e66 IDE",
drivers/ide/pci/trm290.c renamed from drivers/ide/pci/trm290.c.orig +1 -0
@@ -408,6 +408,7 @@
 	{ PCI_VENDOR_ID_TEKRAM, PCI_DEVICE_ID_TEKRAM_DC290, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
 	{ 0, },
 };
+MODULE_DEVICE_TABLE(pci, trm290_pci_tbl);
 
 static struct pci_driver driver = {
 	.name		= "TRM290 IDE",
drivers/ide/pci/via82cxxx.c renamed from drivers/ide/pci/via82cxxx.c.orig +1 -0
@@ -621,6 +621,7 @@
 	{ PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_82C586_1, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 1},
 	{ 0, },
 };
+MODULE_DEVICE_TABLE(pci, via_pci_tbl);
 
 static struct pci_driver driver = {
 	.name 		= "VIA IDE",
#1 lore raw
Quoted 1 line · Hannes Reinecke

Hi all,

Hi,

Quoted 4 lines

the attached patch is required to have modular IDE drivers announce themselves properly in modules.pcimap. Two drivers are missing (triflex.c and cmd640.c) since they haven't been converted to new-style PCI drivers.

triflex.c driver is converted but pci_device_id table is in triflex.h.

cmd640.c may be hard to convert due to fact that this chipset doesn't support config write cycles (more details in cmd640.c).

You missed cs5520.c, cs5530.c and freshly added atiixp.c. Anyway I corrected the patch and pushed it to Linus, thanks!

Regards,
Bartlomiej

Quoted 7 lines

Any reason _not_ to apply this patch?

Please keep me cc'ed as I'm not subscribed.

Cheers,

Hannes

#2 lore raw
Quoted 3 lines

cmd640.c may be hard to convert due to fact that this chipset doesn't support config write cycles (more details in cmd640.c).

Just in case anybody wonders wtf I was thinking about... 'dword' word is missing here.