libata updates
Subsystems (3)
PATCH 1/1 libata updates
Final libata batch for 2.6.19. Meant to send this a couple days ago.
Nothing interesting: minor bugfix, some cleanups, improved diagnostics.
Please pull from 'upstream-linus' branch of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev.git upstream-linus
to receive the following updates:
Documentation/DocBook/libata.tmpl | 2 - drivers/ata/ahci.c | 90 ++++++++++++------------------------- drivers/ata/libata-core.c | 12 +++-- drivers/ata/libata-scsi.c | 14 +++++- drivers/ata/libata-sff.c | 44 +++++++++--------- drivers/ata/pata_ali.c | 9 ++-- drivers/ata/pata_amd.c | 38 ++++++++-------- drivers/ata/pata_artop.c | 17 ++++--- drivers/ata/pata_atiixp.c | 14 +++--- drivers/ata/pata_cmd64x.c | 17 +++---- drivers/ata/pata_cs5520.c | 10 ++-- drivers/ata/pata_cs5530.c | 11 ++--- drivers/ata/pata_cs5535.c | 9 ++-- drivers/ata/pata_cypress.c | 13 +++-- drivers/ata/pata_efar.c | 4 +- drivers/ata/pata_hpt366.c | 9 ++-- drivers/ata/pata_hpt37x.c | 19 ++++---- drivers/ata/pata_hpt3x2n.c | 17 +++---- drivers/ata/pata_hpt3x3.c | 9 ++-- drivers/ata/pata_it821x.c | 13 ++--- drivers/ata/pata_jmicron.c | 11 ++--- drivers/ata/pata_mpiix.c | 9 +--- drivers/ata/pata_netcell.c | 3 + drivers/ata/pata_ns87410.c | 9 ++-- drivers/ata/pata_oldpiix.c | 4 +- drivers/ata/pata_opti.c | 10 ++-- drivers/ata/pata_optidma.c | 9 ++-- drivers/ata/pata_pdc2027x.c | 15 +++--- drivers/ata/pata_pdc202xx_old.c | 19 ++++---- drivers/ata/pata_radisys.c | 4 +- drivers/ata/pata_rz1000.c | 12 ++--- drivers/ata/pata_sc1200.c | 11 ++--- drivers/ata/pata_serverworks.c | 17 +++---- drivers/ata/pata_sil680.c | 9 ++-- drivers/ata/pata_sis.c | 6 +- drivers/ata/pata_sl82c105.c | 9 ++-- drivers/ata/pata_triflex.c | 10 ++-- drivers/ata/pata_via.c | 15 +++--- drivers/ata/pdc_adma.c | 3 - drivers/ata/sata_mv.c | 27 ++++++----- drivers/ata/sata_nv.c | 53 ++++++++-------------- drivers/ata/sata_promise.c | 55 ++++++++--------------- drivers/ata/sata_qstor.c | 3 - drivers/ata/sata_sil.c | 15 +++--- drivers/ata/sata_sil24.c | 11 ++--- drivers/ata/sata_sis.c | 8 ++- drivers/ata/sata_svw.c | 15 ++---- drivers/ata/sata_sx4.c | 5 +- drivers/ata/sata_uli.c | 8 ++- drivers/ata/sata_via.c | 6 +- drivers/ata/sata_vsc.c | 6 -- include/linux/libata.h | 9 +++- 52 files changed, 359 insertions(+), 418 deletions(-)
Dave Jones:
Fix reference of uninitialised memory in ata_device_add()
Jeff Garzik:
[libata] Use new PCI_VDEVICE() macro to dramatically shorten ID lists [libata] minor PCI IDE probe fixes and cleanups
[libata] init probe_ent->private_data in a common location [libata] Print out Status register, if a BSY-sleep takes too long [libata] PCI ID table cleanup in various drivers
[libata] DocBook minor updates, fixes
[libata] pata_artop: kill gcc warning
Tejun Heo:
libata: cosmetic changes to constants
libata: turn off NCQ if queue depth is adjusted to 1
Documentation/DocBook/libata.tmpl +1 -1
@@ -14,7 +14,7 @@ </authorgroup> <copyright> - <year>2003-2005</year> + <year>2003-2006</year> <holder>Jeff Garzik</holder> </copyright>
drivers/ata/ahci.c +30 -60
106 lines not on this page · raw message
drivers/ata/libata-core.c +7 -5
@@ -2340,7 +2340,8 @@ unsigned int ata_busy_sleep (struct ata_if (status &ATA_BUSY )ata_port_printk (ap,KERN_WARNING , -"port is slow to respond, please be patient\n" ); +"port is slow to respond, please be patient " +"(Status 0x%x)\n" , status); timeout = timer_start + tmout;while ((status &ATA_BUSY ) && (time_before (jiffies, timeout))) {
@@ -2350,7 +2351,8 @@ unsigned int ata_busy_sleep (struct ata_if (status &ATA_BUSY ) {ata_port_printk (ap,KERN_ERR ,"port failed to respond " -"(%lu secs)\n" , tmout /HZ ); +"(%lu secs, Status 0x%x)\n" , + tmout /HZ , status);return 1 ; }
@@ -5478,11 +5480,10 @@ int ata_device_add(const struct ata_probint irq_line = ent->irq; ap =ata_port_add (ent, host, i); + host->ports[i] = ap;if (!ap) goto err_out; - host->ports[i] = ap; -/* dummy? */ if (ent->dummy_port_mask & (1 << i)) {ata_port_printk (ap,KERN_INFO ,"DUMMY\n" );
@@ -5740,7 +5741,7 @@ void ata_host_remove(struct ata_host *ho/** * ata_scsi_release - SCSI layer callback hook for host unload -* @host: libata host to be unloaded +* @shost: libata host to be unloaded * * Performs all duties necessary to shut down a libata port... * Kill port kthread, disable port, and release resources.
@@ -5786,6 +5787,7 @@ ata_probe_ent_alloc(struct device *dev, probe_ent->mwdma_mask = port->mwdma_mask; probe_ent->udma_mask = port->udma_mask; probe_ent->port_ops = port->port_ops; + probe_ent->private_data = port->private_data;return probe_ent; }
drivers/ata/libata-scsi.c +12 -2
@@ -889,6 +889,7 @@ int ata_scsi_change_queue_depth(struct s {struct ata_port *ap =ata_shost_to_port (sdev->host);struct ata_device *dev; +unsigned long flags;int max_depth;if (queue_depth <1 )
@@ -904,6 +905,14 @@ int ata_scsi_change_queue_depth(struct s queue_depth = max_depth;scsi_adjust_queue_depth (sdev,MSG_SIMPLE_TAG , queue_depth); + +spin_lock_irqsave (ap->lock, flags); +if (queue_depth >1 ) + dev->flags &= ~ATA_DFLAG_NCQ_OFF ; +else + dev->flags |=ATA_DFLAG_NCQ_OFF ; +spin_unlock_irqrestore (ap->lock, flags); +return queue_depth; }
@@ -1293,7 +1302,8 @@ static unsigned int ata_scsi_rw_xlat(str*/ goto nothing_to_do; -if ((dev->flags & (ATA_DFLAG_PIO |ATA_DFLAG_NCQ )) ==ATA_DFLAG_NCQ ) { +if ((dev->flags & (ATA_DFLAG_PIO |ATA_DFLAG_NCQ_OFF | +ATA_DFLAG_NCQ )) ==ATA_DFLAG_NCQ ) {/* yay, NCQ */ if (!lba_48_ok (block, n_block)) goto out_of_range;
@@ -3174,7 +3184,7 @@ void ata_scsi_dev_rescan(void *data)/** * ata_sas_port_alloc - Allocate port for a SAS attached SATA device -* @pdev: PCI device that the scsi device is attached to +* @host: ATA host container for all SAS ports * @port_info: Information from low-level host driver * @shost: SCSI host that the scsi device is attached to *
drivers/ata/libata-sff.c +22 -22
103 lines not on this page · raw message
drivers/ata/pata_ali.c +5 -4
@@ -644,10 +644,11 @@ static int ali_init_one(struct pci_dev *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
@@ -662,27 +662,28 @@ static int amd_init_one(struct pci_dev * }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 = { - .name =DRV_NAME , + .name =DRV_NAME , .id_table = amd, .probe = amd_init_one, .remove = ata_pci_remove_one
@@ -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 +10 -7
@@ -426,7 +426,7 @@ static int artop_init_one (struct pci_de .port_ops = &artop6260_ops, };struct ata_port_info *port_info[2 ]; -struct ata_port_info *info; +struct ata_port_info *info =NULL ;int ports =2 ;if (!printed_version++)
@@ -470,16 +470,20 @@ static int artop_init_one (struct pci_depci_write_config_byte (pdev,0x4a , (reg & ~0x01 ) |0x80 ); } + +BUG_ON (info ==NULL ); + port_info[0 ] = port_info[1 ] = info;return ata_pci_init_one (pdev, port_info, ports); }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 +504,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
@@ -267,12 +267,13 @@ static int atiixp_init_one(struct pci_dereturn 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
@@ -468,16 +468,17 @@ #endifreturn 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 = { - .name =DRV_NAME , + .name =DRV_NAME , .id_table = cmd64x, .probe = cmd64x_init_one, .remove = ata_pci_remove_one
@@ -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" );
drivers/ata/pata_cs5520.c +5 -5
@@ -299,10 +299,11 @@ static void __devexit cs5520_remove_one(/* For now keep DMA off. We can set it for all but A rev CS5510 once the core ATA code can handle it */ -static struct pci_device_id pata_cs5520[] = { - {PCI_DEVICE (PCI_VENDOR_ID_CYRIX ,PCI_DEVICE_ID_CYRIX_5510 ), }, - {PCI_DEVICE (PCI_VENDOR_ID_CYRIX ,PCI_DEVICE_ID_CYRIX_5520 ), }, - {0 , }, +static const struct pci_device_id pata_cs5520[] = { + {PCI_VDEVICE (CYRIX ,PCI_DEVICE_ID_CYRIX_5510 ), }, + {PCI_VDEVICE (CYRIX ,PCI_DEVICE_ID_CYRIX_5520 ), }, + + { }, };static struct pci_driver cs5520_pci_driver = {
@@ -312,7 +313,6 @@ static struct pci_driver cs5520_pci_driv .remove = cs5520_remove_one }; -static int __init cs5520_init (void ) {return pci_register_driver (&cs5520_pci_driver);
drivers/ata/pata_cs5530.c +5 -6
@@ -353,13 +353,14 @@ fail_put:return -ENODEV ; } -static struct pci_device_id cs5530[] = { - {PCI_DEVICE (PCI_VENDOR_ID_CYRIX ,PCI_DEVICE_ID_CYRIX_5530_IDE ), }, - {0 , }, +static const struct pci_device_id cs5530[] = { + {PCI_VDEVICE (CYRIX ,PCI_DEVICE_ID_CYRIX_5530_IDE ), }, + + { }, };static struct pci_driver cs5530_pci_driver = { - .name =DRV_NAME , + .name =DRV_NAME , .id_table = cs5530, .probe = cs5530_init_one, .remove = ata_pci_remove_one
@@ -370,13 +371,11 @@ static int __init cs5530_init(void)return pci_register_driver (&cs5530_pci_driver); } - static void __exit cs5530_exit(void) {pci_unregister_driver (&cs5530_pci_driver); } -MODULE_AUTHOR ("Alan Cox" );MODULE_DESCRIPTION ("low-level driver for the Cyrix/NS/AMD 5530" );MODULE_LICENSE ("GPL" );
drivers/ata/pata_cs5535.c +4 -5
@@ -257,9 +257,10 @@ static int cs5535_init_one(struct pci_dereturn ata_pci_init_one (dev, ports,1 ); } -static struct pci_device_id cs5535[] = { - {PCI_DEVICE (PCI_VENDOR_ID_NS ,0x002D ), }, - {0 , }, +static const struct pci_device_id cs5535[] = { + {PCI_VDEVICE (NS ,0x002D ), }, + + { }, };static struct pci_driver cs5535_pci_driver = {
@@ -274,13 +275,11 @@ static int __init cs5535_init(void)return pci_register_driver (&cs5535_pci_driver); } - static void __exit cs5535_exit(void) {pci_unregister_driver (&cs5535_pci_driver); } -MODULE_AUTHOR ("Alan Cox, Jens Altmann, Wolfgan Zuleger, Alexander Kiausch" );MODULE_DESCRIPTION ("low-level driver for the NS/AMD 5530" );MODULE_LICENSE ("GPL" );
drivers/ata/pata_cypress.c +7 -6
@@ -184,8 +184,8 @@ static int cy82c693_init_one(struct pci_ };static struct ata_port_info *port_info[1 ] = { &info }; -/* Devfn 1 is the ATA primary. The secondary is magic and on devfn2. For the -moment we don't handle the secondary. FIXME */ +/* Devfn 1 is the ATA primary. The secondary is magic and on devfn2. +For the moment we don't handle the secondary. FIXME */ if (PCI_FUNC (pdev->devfn) !=1 )return -ENODEV ;
@@ -193,13 +193,14 @@ static int cy82c693_init_one(struct pci_return ata_pci_init_one (pdev, port_info,1 ); } -static struct pci_device_id cy82c693[] = { - {PCI_VENDOR_ID_CONTAQ ,PCI_DEVICE_ID_CONTAQ_82C693 ,PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 ,0 }, - {0 , }, +static const struct pci_device_id cy82c693[] = { + {PCI_VDEVICE (CONTAQ ,PCI_DEVICE_ID_CONTAQ_82C693 ), }, + + { }, };static struct pci_driver cy82c693_pci_driver = { - .name =DRV_NAME , + .name =DRV_NAME , .id_table = cy82c693, .probe = cy82c693_init_one, .remove = ata_pci_remove_one
drivers/ata/pata_efar.c +2 -2
@@ -305,7 +305,8 @@ static int efar_init_one (struct pci_dev }static const struct pci_device_id efar_pci_tbl[] = { - {0x1055 ,0x9130 ,PCI_ANY_ID ,PCI_ANY_ID , }, + {PCI_VDEVICE (EFAR ,0x9130 ), }, + { }/* terminate list */ };
@@ -326,7 +327,6 @@ static void __exit efar_exit(void)pci_unregister_driver (&efar_pci_driver); } -module_init (efar_init);module_exit (efar_exit);
drivers/ata/pata_hpt366.c +5 -4
@@ -444,13 +444,14 @@ static int hpt36x_init_one(struct pci_dereturn ata_pci_init_one (dev, port_info,2 ); } -static struct pci_device_id hpt36x[] = { - {PCI_DEVICE (PCI_VENDOR_ID_TTI ,PCI_DEVICE_ID_TTI_HPT366 ), }, - {0 , }, +static const struct pci_device_id hpt36x[] = { + {PCI_VDEVICE (TTI ,PCI_DEVICE_ID_TTI_HPT366 ), }, + + { }, };static struct pci_driver hpt36x_pci_driver = { - .name =DRV_NAME , + .name =DRV_NAME , .id_table = hpt36x, .probe = hpt36x_init_one, .remove = ata_pci_remove_one
drivers/ata/pata_hpt37x.c +9 -10
@@ -1219,17 +1219,18 @@ static int hpt37x_init_one(struct pci_dereturn ata_pci_init_one (dev, port_info,2 ); } -static struct pci_device_id hpt37x[] = { - {PCI_DEVICE (PCI_VENDOR_ID_TTI ,PCI_DEVICE_ID_TTI_HPT366 ), }, - {PCI_DEVICE (PCI_VENDOR_ID_TTI ,PCI_DEVICE_ID_TTI_HPT371 ), }, - {PCI_DEVICE (PCI_VENDOR_ID_TTI ,PCI_DEVICE_ID_TTI_HPT372 ), }, - {PCI_DEVICE (PCI_VENDOR_ID_TTI ,PCI_DEVICE_ID_TTI_HPT374 ), }, - {PCI_DEVICE (PCI_VENDOR_ID_TTI ,PCI_DEVICE_ID_TTI_HPT302 ), }, - {0 , }, +static const struct pci_device_id hpt37x[] = { + {PCI_VDEVICE (TTI ,PCI_DEVICE_ID_TTI_HPT366 ), }, + {PCI_VDEVICE (TTI ,PCI_DEVICE_ID_TTI_HPT371 ), }, + {PCI_VDEVICE (TTI ,PCI_DEVICE_ID_TTI_HPT372 ), }, + {PCI_VDEVICE (TTI ,PCI_DEVICE_ID_TTI_HPT374 ), }, + {PCI_VDEVICE (TTI ,PCI_DEVICE_ID_TTI_HPT302 ), }, + + { }, };static struct pci_driver hpt37x_pci_driver = { - .name =DRV_NAME , + .name =DRV_NAME , .id_table = hpt37x, .probe = hpt37x_init_one, .remove = ata_pci_remove_one
@@ -1240,13 +1241,11 @@ static int __init hpt37x_init(void)return pci_register_driver (&hpt37x_pci_driver); } - static void __exit hpt37x_exit(void) {pci_unregister_driver (&hpt37x_pci_driver); } -MODULE_AUTHOR ("Alan Cox" );MODULE_DESCRIPTION ("low-level driver for the Highpoint HPT37x/30x" );MODULE_LICENSE ("GPL" );
drivers/ata/pata_hpt3x2n.c +8 -9
@@ -560,16 +560,17 @@ static int hpt3x2n_init_one(struct pci_dreturn ata_pci_init_one (dev, port_info,2 ); } -static struct pci_device_id hpt3x2n[] = { - {PCI_DEVICE (PCI_VENDOR_ID_TTI ,PCI_DEVICE_ID_TTI_HPT366 ), }, - {PCI_DEVICE (PCI_VENDOR_ID_TTI ,PCI_DEVICE_ID_TTI_HPT372 ), }, - {PCI_DEVICE (PCI_VENDOR_ID_TTI ,PCI_DEVICE_ID_TTI_HPT302 ), }, - {PCI_DEVICE (PCI_VENDOR_ID_TTI ,PCI_DEVICE_ID_TTI_HPT372N ), }, - {0 , }, +static const struct pci_device_id hpt3x2n[] = { + {PCI_VDEVICE (TTI ,PCI_DEVICE_ID_TTI_HPT366 ), }, + {PCI_VDEVICE (TTI ,PCI_DEVICE_ID_TTI_HPT372 ), }, + {PCI_VDEVICE (TTI ,PCI_DEVICE_ID_TTI_HPT302 ), }, + {PCI_VDEVICE (TTI ,PCI_DEVICE_ID_TTI_HPT372N ), }, + + { }, };static struct pci_driver hpt3x2n_pci_driver = { - .name =DRV_NAME , + .name =DRV_NAME , .id_table = hpt3x2n, .probe = hpt3x2n_init_one, .remove = ata_pci_remove_one
@@ -580,13 +581,11 @@ static int __init hpt3x2n_init(void)return pci_register_driver (&hpt3x2n_pci_driver); } - static void __exit hpt3x2n_exit(void) {pci_unregister_driver (&hpt3x2n_pci_driver); } -MODULE_AUTHOR ("Alan Cox" );MODULE_DESCRIPTION ("low-level driver for the Highpoint HPT3x2n/30x" );MODULE_LICENSE ("GPL" );
drivers/ata/pata_hpt3x3.c +5 -4
@@ -192,13 +192,14 @@ static int hpt3x3_init_one(struct pci_dereturn ata_pci_init_one (dev, port_info,2 ); } -static struct pci_device_id hpt3x3[] = { - {PCI_DEVICE (PCI_VENDOR_ID_TTI ,PCI_DEVICE_ID_TTI_HPT343 ), }, - {0 , }, +static const struct pci_device_id hpt3x3[] = { + {PCI_VDEVICE (TTI ,PCI_DEVICE_ID_TTI_HPT343 ), }, + + { }, };static struct pci_driver hpt3x3_pci_driver = { - .name =DRV_NAME , + .name =DRV_NAME , .id_table = hpt3x3, .probe = hpt3x3_init_one, .remove = ata_pci_remove_one
drivers/ata/pata_it821x.c +6 -7
@@ -808,14 +808,15 @@ static int it821x_init_one(struct pci_dereturn ata_pci_init_one (pdev, port_info,2 ); } -static struct pci_device_id it821x[] = { - {PCI_DEVICE (PCI_VENDOR_ID_ITE ,PCI_DEVICE_ID_ITE_8211 ), }, - {PCI_DEVICE (PCI_VENDOR_ID_ITE ,PCI_DEVICE_ID_ITE_8212 ), }, - {0 , }, +static const struct pci_device_id it821x[] = { + {PCI_VDEVICE (ITE ,PCI_DEVICE_ID_ITE_8211 ), }, + {PCI_VDEVICE (ITE ,PCI_DEVICE_ID_ITE_8212 ), }, + + { }, };static struct pci_driver it821x_pci_driver = { - .name =DRV_NAME , + .name =DRV_NAME , .id_table = it821x, .probe = it821x_init_one, .remove = ata_pci_remove_one
@@ -826,13 +827,11 @@ static int __init it821x_init(void)return pci_register_driver (&it821x_pci_driver); } - static void __exit it821x_exit(void) {pci_unregister_driver (&it821x_pci_driver); } -MODULE_AUTHOR ("Alan Cox" );MODULE_DESCRIPTION ("low-level driver for the IT8211/IT8212 IDE RAID controller" );MODULE_LICENSE ("GPL" );
drivers/ata/pata_jmicron.c +6 -5
@@ -229,11 +229,12 @@ static int jmicron_init_one (struct pci_ }static const struct pci_device_id jmicron_pci_tbl[] = { - {PCI_DEVICE (PCI_VENDOR_ID_JMICRON ,PCI_DEVICE_ID_JMICRON_JMB361 ),361 }, - {PCI_DEVICE (PCI_VENDOR_ID_JMICRON ,PCI_DEVICE_ID_JMICRON_JMB363 ),363 }, - {PCI_DEVICE (PCI_VENDOR_ID_JMICRON ,PCI_DEVICE_ID_JMICRON_JMB365 ),365 }, - {PCI_DEVICE (PCI_VENDOR_ID_JMICRON ,PCI_DEVICE_ID_JMICRON_JMB366 ),366 }, - {PCI_DEVICE (PCI_VENDOR_ID_JMICRON ,PCI_DEVICE_ID_JMICRON_JMB368 ),368 }, + {PCI_VDEVICE (JMICRON ,PCI_DEVICE_ID_JMICRON_JMB361 ),361 }, + {PCI_VDEVICE (JMICRON ,PCI_DEVICE_ID_JMICRON_JMB363 ),363 }, + {PCI_VDEVICE (JMICRON ,PCI_DEVICE_ID_JMICRON_JMB365 ),365 }, + {PCI_VDEVICE (JMICRON ,PCI_DEVICE_ID_JMICRON_JMB366 ),366 }, + {PCI_VDEVICE (JMICRON ,PCI_DEVICE_ID_JMICRON_JMB368 ),368 }, + { }/* terminate list */ };
drivers/ata/pata_mpiix.c +3 -6
@@ -274,11 +274,10 @@ static void __devexit mpiix_remove_one(sdev_set_drvdata (dev,NULL ); } - -static const struct pci_device_id mpiix[] = { - {PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_82371MX ), }, - {0 , }, + {PCI_VDEVICE (INTEL ,PCI_DEVICE_ID_INTEL_82371MX ), }, + + { }, };static struct pci_driver mpiix_pci_driver = {
@@ -293,13 +292,11 @@ static int __init mpiix_init(void)return pci_register_driver (&mpiix_pci_driver); } - static void __exit mpiix_exit(void) {pci_unregister_driver (&mpiix_pci_driver); } -MODULE_AUTHOR ("Alan Cox" );MODULE_DESCRIPTION ("low-level driver for Intel MPIIX" );MODULE_LICENSE ("GPL" );
drivers/ata/pata_netcell.c +2 -1
@@ -142,7 +142,8 @@ static int netcell_init_one (struct pci_ }static const struct pci_device_id netcell_pci_tbl[] = { - {PCI_DEVICE (PCI_VENDOR_ID_NETCELL ,PCI_DEVICE_ID_REVOLUTION ), }, + {PCI_VDEVICE (NETCELL ,PCI_DEVICE_ID_REVOLUTION ), }, + { }/* terminate list */ };
drivers/ata/pata_ns87410.c +4 -5
@@ -200,12 +200,13 @@ static int ns87410_init_one(struct pci_d }static const struct pci_device_id ns87410[] = { - {PCI_DEVICE (PCI_VENDOR_ID_NS ,PCI_DEVICE_ID_NS_87410 ), }, - {0 , }, + {PCI_VDEVICE (NS ,PCI_DEVICE_ID_NS_87410 ), }, + + { }, };static struct pci_driver ns87410_pci_driver = { - .name =DRV_NAME , + .name =DRV_NAME , .id_table = ns87410, .probe = ns87410_init_one, .remove = ata_pci_remove_one
@@ -216,13 +217,11 @@ static int __init ns87410_init(void)return pci_register_driver (&ns87410_pci_driver); } - static void __exit ns87410_exit(void) {pci_unregister_driver (&ns87410_pci_driver); } -MODULE_AUTHOR ("Alan Cox" );MODULE_DESCRIPTION ("low-level driver for Nat Semi 87410" );MODULE_LICENSE ("GPL" );
drivers/ata/pata_oldpiix.c +2 -2
@@ -303,7 +303,8 @@ static int oldpiix_init_one (struct pci_ }static const struct pci_device_id oldpiix_pci_tbl[] = { - {PCI_DEVICE (0x8086 ,0x1230 ), }, + {PCI_VDEVICE (INTEL ,0x1230 ), }, + { }/* terminate list */ };
@@ -324,7 +325,6 @@ static void __exit oldpiix_exit(void)pci_unregister_driver (&oldpiix_pci_driver); } -module_init (oldpiix_init);module_exit (oldpiix_exit);
drivers/ata/pata_opti.c +5 -5
@@ -256,13 +256,14 @@ static int opti_init_one(struct pci_dev }static const struct pci_device_id opti[] = { - {PCI_VENDOR_ID_OPTI ,PCI_DEVICE_ID_OPTI_82C621 ,PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 ,0 }, - {PCI_VENDOR_ID_OPTI ,PCI_DEVICE_ID_OPTI_82C825 ,PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 ,1 }, - {0 , }, + {PCI_VDEVICE (OPTI ,PCI_DEVICE_ID_OPTI_82C621 ),0 }, + {PCI_VDEVICE (OPTI ,PCI_DEVICE_ID_OPTI_82C825 ),1 }, + + { }, };static struct pci_driver opti_pci_driver = { - .name =DRV_NAME , + .name =DRV_NAME , .id_table = opti, .probe = opti_init_one, .remove = ata_pci_remove_one
@@ -273,7 +274,6 @@ static int __init opti_init(void)return pci_register_driver (&opti_pci_driver); } - static void __exit opti_exit(void) {pci_unregister_driver (&opti_pci_driver);
drivers/ata/pata_optidma.c +4 -5
@@ -512,12 +512,13 @@ static int optidma_init_one(struct pci_d }static const struct pci_device_id optidma[] = { - {PCI_DEVICE (0x1045 ,0xD568 ), },/* Opti 82C700 */ - {0 , }, + {PCI_VDEVICE (OPTI ,0xD568 ), },/* Opti 82C700 */ + + { }, };static struct pci_driver optidma_pci_driver = { - .name =DRV_NAME , + .name =DRV_NAME , .id_table = optidma, .probe = optidma_init_one, .remove = ata_pci_remove_one
@@ -528,13 +529,11 @@ static int __init optidma_init(void)return pci_register_driver (&optidma_pci_driver); } - static void __exit optidma_exit(void) {pci_unregister_driver (&optidma_pci_driver); } -MODULE_AUTHOR ("Alan Cox" );MODULE_DESCRIPTION ("low-level driver for Opti Firestar/Firestar Plus" );MODULE_LICENSE ("GPL" );
drivers/ata/pata_pdc2027x.c +8 -7
@@ -108,13 +108,14 @@ static struct pdc2027x_udma_timing { };static const struct pci_device_id pdc2027x_pci_tbl[] = { - {PCI_VENDOR_ID_PROMISE ,PCI_DEVICE_ID_PROMISE_20268 ,PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 ,PDC_UDMA_100 }, - {PCI_VENDOR_ID_PROMISE ,PCI_DEVICE_ID_PROMISE_20269 ,PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 ,PDC_UDMA_133 }, - {PCI_VENDOR_ID_PROMISE ,PCI_DEVICE_ID_PROMISE_20270 ,PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 ,PDC_UDMA_100 }, - {PCI_VENDOR_ID_PROMISE ,PCI_DEVICE_ID_PROMISE_20271 ,PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 ,PDC_UDMA_133 }, - {PCI_VENDOR_ID_PROMISE ,PCI_DEVICE_ID_PROMISE_20275 ,PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 ,PDC_UDMA_133 }, - {PCI_VENDOR_ID_PROMISE ,PCI_DEVICE_ID_PROMISE_20276 ,PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 ,PDC_UDMA_133 }, - {PCI_VENDOR_ID_PROMISE ,PCI_DEVICE_ID_PROMISE_20277 ,PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 ,PDC_UDMA_133 }, + {PCI_VDEVICE (PROMISE ,PCI_DEVICE_ID_PROMISE_20268 ),PDC_UDMA_100 }, + {PCI_VDEVICE (PROMISE ,PCI_DEVICE_ID_PROMISE_20269 ),PDC_UDMA_133 }, + {PCI_VDEVICE (PROMISE ,PCI_DEVICE_ID_PROMISE_20270 ),PDC_UDMA_100 }, + {PCI_VDEVICE (PROMISE ,PCI_DEVICE_ID_PROMISE_20271 ),PDC_UDMA_133 }, + {PCI_VDEVICE (PROMISE ,PCI_DEVICE_ID_PROMISE_20275 ),PDC_UDMA_133 }, + {PCI_VDEVICE (PROMISE ,PCI_DEVICE_ID_PROMISE_20276 ),PDC_UDMA_133 }, + {PCI_VDEVICE (PROMISE ,PCI_DEVICE_ID_PROMISE_20277 ),PDC_UDMA_133 }, + { }/* terminate list */ };
drivers/ata/pata_pdc202xx_old.c +9 -10
@@ -385,17 +385,18 @@ static int pdc_init_one(struct pci_dev *return ata_pci_init_one (dev, port_info,2 ); } -static struct pci_device_id pdc[] = { - {PCI_DEVICE (PCI_VENDOR_ID_PROMISE ,PCI_DEVICE_ID_PROMISE_20246 ),0 }, - {PCI_DEVICE (PCI_VENDOR_ID_PROMISE ,PCI_DEVICE_ID_PROMISE_20262 ),1 }, - {PCI_DEVICE (PCI_VENDOR_ID_PROMISE ,PCI_DEVICE_ID_PROMISE_20263 ),1 }, - {PCI_DEVICE (PCI_VENDOR_ID_PROMISE ,PCI_DEVICE_ID_PROMISE_20265 ),2 }, - {PCI_DEVICE (PCI_VENDOR_ID_PROMISE ,PCI_DEVICE_ID_PROMISE_20267 ),2 }, - {0 , }, +static const struct pci_device_id pdc[] = { + {PCI_VDEVICE (PROMISE ,PCI_DEVICE_ID_PROMISE_20246 ),0 }, + {PCI_VDEVICE (PROMISE ,PCI_DEVICE_ID_PROMISE_20262 ),1 }, + {PCI_VDEVICE (PROMISE ,PCI_DEVICE_ID_PROMISE_20263 ),1 }, + {PCI_VDEVICE (PROMISE ,PCI_DEVICE_ID_PROMISE_20265 ),2 }, + {PCI_VDEVICE (PROMISE ,PCI_DEVICE_ID_PROMISE_20267 ),2 }, + + { }, };static struct pci_driver pdc_pci_driver = { - .name =DRV_NAME , + .name =DRV_NAME , .id_table = pdc, .probe = pdc_init_one, .remove = ata_pci_remove_one
@@ -406,13 +407,11 @@ static int __init pdc_init(void)return pci_register_driver (&pdc_pci_driver); } - static void __exit pdc_exit(void) {pci_unregister_driver (&pdc_pci_driver); } -MODULE_AUTHOR ("Alan Cox" );MODULE_DESCRIPTION ("low-level driver for Promise 2024x and 20262-20267" );MODULE_LICENSE ("GPL" );
drivers/ata/pata_radisys.c +2 -2
@@ -300,7 +300,8 @@ static int radisys_init_one (struct pci_ }static const struct pci_device_id radisys_pci_tbl[] = { - {0x1331 ,0x8201 ,PCI_ANY_ID ,PCI_ANY_ID , }, + {PCI_VDEVICE (RADISYS ,0x8201 ), }, + { }/* terminate list */ };
@@ -321,7 +322,6 @@ static void __exit radisys_exit(void)pci_unregister_driver (&radisys_pci_driver); } -module_init (radisys_init);module_exit (radisys_exit);
drivers/ata/pata_rz1000.c +6 -6
@@ -170,20 +170,20 @@ fail:return -ENODEV ; } -static struct pci_device_id pata_rz1000[] = { - {PCI_DEVICE (PCI_VENDOR_ID_PCTECH ,PCI_DEVICE_ID_PCTECH_RZ1000 ), }, - {PCI_DEVICE (PCI_VENDOR_ID_PCTECH ,PCI_DEVICE_ID_PCTECH_RZ1001 ), }, - {0 , }, +static const struct pci_device_id pata_rz1000[] = { + {PCI_VDEVICE (PCTECH ,PCI_DEVICE_ID_PCTECH_RZ1000 ), }, + {PCI_VDEVICE (PCTECH ,PCI_DEVICE_ID_PCTECH_RZ1001 ), }, + + { }, };static struct pci_driver rz1000_pci_driver = { - .name =DRV_NAME , + .name =DRV_NAME , .id_table = pata_rz1000, .probe = rz1000_init_one, .remove = ata_pci_remove_one }; -static int __init rz1000_init (void ) {return pci_register_driver (&rz1000_pci_driver);
drivers/ata/pata_sc1200.c +5 -6
@@ -253,13 +253,14 @@ static int sc1200_init_one(struct pci_dereturn ata_pci_init_one (dev, port_info,1 ); } -static struct pci_device_id sc1200[] = { - {PCI_DEVICE (PCI_VENDOR_ID_NS , PCI_DEVICE_ID_NS_SCx200_IDE), }, - {0 , }, +static const struct pci_device_id sc1200[] = { + {PCI_VDEVICE (NS , PCI_DEVICE_ID_NS_SCx200_IDE), }, + + { }, };static struct pci_driver sc1200_pci_driver = { - .name =DRV_NAME , + .name =DRV_NAME , .id_table = sc1200, .probe = sc1200_init_one, .remove = ata_pci_remove_one
@@ -270,13 +271,11 @@ static int __init sc1200_init(void)return pci_register_driver (&sc1200_pci_driver); } - static void __exit sc1200_exit(void) {pci_unregister_driver (&sc1200_pci_driver); } -MODULE_AUTHOR ("Alan Cox, Mark Lord" );MODULE_DESCRIPTION ("low-level driver for the NS/AMD SC1200" );MODULE_LICENSE ("GPL" );
drivers/ata/pata_serverworks.c +8 -9
@@ -553,13 +553,14 @@ static int serverworks_init_one(struct preturn ata_pci_init_one (pdev, port_info, ports); } -static struct pci_device_id serverworks[] = { - {PCI_DEVICE (PCI_VENDOR_ID_SERVERWORKS ,PCI_DEVICE_ID_SERVERWORKS_OSB4IDE ),0 }, - {PCI_DEVICE (PCI_VENDOR_ID_SERVERWORKS ,PCI_DEVICE_ID_SERVERWORKS_CSB5IDE ),2 }, - {PCI_DEVICE (PCI_VENDOR_ID_SERVERWORKS ,PCI_DEVICE_ID_SERVERWORKS_CSB6IDE ),2 }, - {PCI_DEVICE (PCI_VENDOR_ID_SERVERWORKS ,PCI_DEVICE_ID_SERVERWORKS_CSB6IDE2 ),2 }, - {PCI_DEVICE (PCI_VENDOR_ID_SERVERWORKS ,PCI_DEVICE_ID_SERVERWORKS_HT1000IDE ),2 }, - {0 , }, +static const struct pci_device_id serverworks[] = { + {PCI_VDEVICE (SERVERWORKS ,PCI_DEVICE_ID_SERVERWORKS_OSB4IDE ),0 }, + {PCI_VDEVICE (SERVERWORKS ,PCI_DEVICE_ID_SERVERWORKS_CSB5IDE ),2 }, + {PCI_VDEVICE (SERVERWORKS ,PCI_DEVICE_ID_SERVERWORKS_CSB6IDE ),2 }, + {PCI_VDEVICE (SERVERWORKS ,PCI_DEVICE_ID_SERVERWORKS_CSB6IDE2 ),2 }, + {PCI_VDEVICE (SERVERWORKS ,PCI_DEVICE_ID_SERVERWORKS_HT1000IDE ),2 }, + + { }, };static struct pci_driver serverworks_pci_driver = {
@@ -574,13 +575,11 @@ static int __init serverworks_init(void)return pci_register_driver (&serverworks_pci_driver); } - static void __exit serverworks_exit(void) {pci_unregister_driver (&serverworks_pci_driver); } -MODULE_AUTHOR ("Alan Cox" );MODULE_DESCRIPTION ("low-level driver for Serverworks OSB4/CSB5/CSB6" );MODULE_LICENSE ("GPL" );
drivers/ata/pata_sil680.c +4 -5
@@ -348,12 +348,13 @@ static int sil680_init_one(struct pci_de }static const struct pci_device_id sil680[] = { - {PCI_DEVICE (PCI_VENDOR_ID_CMD ,PCI_DEVICE_ID_SII_680 ), }, - {0 , }, + {PCI_VDEVICE (CMD ,PCI_DEVICE_ID_SII_680 ), }, + + { }, };static struct pci_driver sil680_pci_driver = { - .name =DRV_NAME , + .name =DRV_NAME , .id_table = sil680, .probe = sil680_init_one, .remove = ata_pci_remove_one
@@ -364,13 +365,11 @@ static int __init sil680_init(void)return pci_register_driver (&sil680_pci_driver); } - static void __exit sil680_exit(void) {pci_unregister_driver (&sil680_pci_driver); } -MODULE_AUTHOR ("Alan Cox" );MODULE_DESCRIPTION ("low-level driver for SI680 PATA" );MODULE_LICENSE ("GPL" );
drivers/ata/pata_sis.c +3 -3
@@ -988,8 +988,9 @@ static int sis_init_one (struct pci_dev }static const struct pci_device_id sis_pci_tbl[] = { - {PCI_DEVICE (PCI_VENDOR_ID_SI ,0x5513 ), },/* SiS 5513 */ - {PCI_DEVICE (PCI_VENDOR_ID_SI ,0x5518 ), },/* SiS 5518 */ + {PCI_VDEVICE (SI ,0x5513 ), },/* SiS 5513 */ + {PCI_VDEVICE (SI ,0x5518 ), },/* SiS 5518 */ + { } };
@@ -1010,7 +1011,6 @@ static void __exit sis_exit(void)pci_unregister_driver (&sis_pci_driver); } -module_init (sis_init);module_exit (sis_exit);
drivers/ata/pata_sl82c105.c +4 -5
@@ -351,9 +351,10 @@ static int sl82c105_init_one(struct pci_return ata_pci_init_one (dev, port_info,1 );/* For now */ } -static struct pci_device_id sl82c105[] = { - {PCI_DEVICE (PCI_VENDOR_ID_WINBOND ,PCI_DEVICE_ID_WINBOND_82C105 ), }, - {0 , }, +static const struct pci_device_id sl82c105[] = { + {PCI_VDEVICE (WINBOND ,PCI_DEVICE_ID_WINBOND_82C105 ), }, + + { }, };static struct pci_driver sl82c105_pci_driver = {
@@ -368,13 +369,11 @@ static int __init sl82c105_init(void)return pci_register_driver (&sl82c105_pci_driver); } - static void __exit sl82c105_exit(void) {pci_unregister_driver (&sl82c105_pci_driver); } -MODULE_AUTHOR ("Alan Cox" );MODULE_DESCRIPTION ("low-level driver for Sl82c105" );MODULE_LICENSE ("GPL" );
drivers/ata/pata_triflex.c +4 -6
@@ -248,13 +248,13 @@ static int triflex_init_one(struct pci_d }static const struct pci_device_id triflex[] = { - {PCI_VENDOR_ID_COMPAQ ,PCI_DEVICE_ID_COMPAQ_TRIFLEX_IDE , -PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 ,0 }, - {0 , }, + {PCI_VDEVICE (COMPAQ ,PCI_DEVICE_ID_COMPAQ_TRIFLEX_IDE ), }, + + { }, };static struct pci_driver triflex_pci_driver = { - .name =DRV_NAME , + .name =DRV_NAME , .id_table = triflex, .probe = triflex_init_one, .remove = ata_pci_remove_one
@@ -265,13 +265,11 @@ static int __init triflex_init(void)return pci_register_driver (&triflex_pci_driver); } - static void __exit triflex_exit(void) {pci_unregister_driver (&triflex_pci_driver); } -MODULE_AUTHOR ("Alan Cox" );MODULE_DESCRIPTION ("low-level driver for Compaq Triflex" );MODULE_LICENSE ("GPL" );
drivers/ata/pata_via.c +7 -8
@@ -529,15 +529,16 @@ static int via_init_one(struct pci_dev * }static const struct pci_device_id via[] = { - {PCI_DEVICE (PCI_VENDOR_ID_VIA ,PCI_DEVICE_ID_VIA_82C576_1 ), }, - {PCI_DEVICE (PCI_VENDOR_ID_VIA ,PCI_DEVICE_ID_VIA_82C586_1 ), }, - {PCI_DEVICE (PCI_VENDOR_ID_VIA ,PCI_DEVICE_ID_VIA_6410 ), }, - {PCI_DEVICE (PCI_VENDOR_ID_VIA ,PCI_DEVICE_ID_VIA_SATA_EIDE ), }, - {0 , }, + {PCI_VDEVICE (VIA ,PCI_DEVICE_ID_VIA_82C576_1 ), }, + {PCI_VDEVICE (VIA ,PCI_DEVICE_ID_VIA_82C586_1 ), }, + {PCI_VDEVICE (VIA ,PCI_DEVICE_ID_VIA_6410 ), }, + {PCI_VDEVICE (VIA ,PCI_DEVICE_ID_VIA_SATA_EIDE ), }, + + { }, };static struct pci_driver via_pci_driver = { - .name =DRV_NAME , + .name =DRV_NAME , .id_table = via, .probe = via_init_one, .remove = ata_pci_remove_one
@@ -548,13 +549,11 @@ static int __init via_init(void)return pci_register_driver (&via_pci_driver); } - static void __exit via_exit(void) {pci_unregister_driver (&via_pci_driver); } -MODULE_AUTHOR ("Alan Cox" );MODULE_DESCRIPTION ("low-level driver for VIA PATA" );MODULE_LICENSE ("GPL" );
drivers/ata/pdc_adma.c +1 -2
@@ -192,8 +192,7 @@ static struct ata_port_info adma_port_in };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_mv.c +14 -13
@@ -533,19 +533,20 @@ static const struct ata_port_info mv_por };static const struct pci_device_id mv_pci_tbl[] = { - {PCI_DEVICE (PCI_VENDOR_ID_MARVELL ,0x5040 ),0 ,0 , chip_504x}, - {PCI_DEVICE (PCI_VENDOR_ID_MARVELL ,0x5041 ),0 ,0 , chip_504x}, - {PCI_DEVICE (PCI_VENDOR_ID_MARVELL ,0x5080 ),0 ,0 , chip_5080}, - {PCI_DEVICE (PCI_VENDOR_ID_MARVELL ,0x5081 ),0 ,0 , chip_508x}, - - {PCI_DEVICE (PCI_VENDOR_ID_MARVELL ,0x6040 ),0 ,0 , chip_604x}, - {PCI_DEVICE (PCI_VENDOR_ID_MARVELL ,0x6041 ),0 ,0 , chip_604x}, - {PCI_DEVICE (PCI_VENDOR_ID_MARVELL ,0x6042 ),0 ,0 , chip_6042}, - {PCI_DEVICE (PCI_VENDOR_ID_MARVELL ,0x6080 ),0 ,0 , chip_608x}, - {PCI_DEVICE (PCI_VENDOR_ID_MARVELL ,0x6081 ),0 ,0 , chip_608x}, - - {PCI_DEVICE (PCI_VENDOR_ID_ADAPTEC2 ,0x0241 ),0 ,0 , chip_604x}, - {}/* terminate list */ + {PCI_VDEVICE (MARVELL ,0x5040 ), chip_504x }, + {PCI_VDEVICE (MARVELL ,0x5041 ), chip_504x }, + {PCI_VDEVICE (MARVELL ,0x5080 ), chip_5080 }, + {PCI_VDEVICE (MARVELL ,0x5081 ), chip_508x }, + + {PCI_VDEVICE (MARVELL ,0x6040 ), chip_604x }, + {PCI_VDEVICE (MARVELL ,0x6041 ), chip_604x }, + {PCI_VDEVICE (MARVELL ,0x6042 ), chip_6042 }, + {PCI_VDEVICE (MARVELL ,0x6080 ), chip_608x }, + {PCI_VDEVICE (MARVELL ,0x6081 ), chip_608x }, + + {PCI_VDEVICE (ADAPTEC2 ,0x0241 ), chip_604x }, + + { }/* terminate list */ };static struct pci_driver mv_pci_driver = {
drivers/ata/sata_nv.c +20 -33
65 lines not on this page · raw message
drivers/ata/sata_promise.c +19 -36
67 lines not on this page · raw message
drivers/ata/sata_qstor.c +1 -2
@@ -185,8 +185,7 @@ static const struct ata_port_info qs_por };static const struct pci_device_id qs_ata_pci_tbl[] = { - {PCI_VENDOR_ID_PDC ,0x2068 ,PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 , - board_2068_idx }, + {PCI_VDEVICE (PDC ,0x2068 ), board_2068_idx }, { }/* terminate list */ };
drivers/ata/sata_sil.c +8 -7
@@ -123,13 +123,14 @@ static void sil_thaw(struct ata_port *apstatic 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 */ };
drivers/ata/sata_sil24.c +6 -5
@@ -344,11 +344,12 @@ static int sil24_pci_device_resume(struc#endif static const struct pci_device_id sil24_pci_tbl[] = { - {0x1095 ,0x3124 ,PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 ,BID_SIL3124 }, - {0x8086 ,0x3124 ,PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 ,BID_SIL3124 }, - {0x1095 ,0x3132 ,PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 ,BID_SIL3132 }, - {0x1095 ,0x3131 ,PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 ,BID_SIL3131 }, - {0x1095 ,0x3531 ,PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 ,BID_SIL3131 }, + {PCI_VDEVICE (CMD ,0x3124 ),BID_SIL3124 }, + {PCI_VDEVICE (INTEL ,0x3124 ),BID_SIL3124 }, + {PCI_VDEVICE (CMD ,0x3132 ),BID_SIL3132 }, + {PCI_VDEVICE (CMD ,0x3131 ),BID_SIL3131 }, + {PCI_VDEVICE (CMD ,0x3531 ),BID_SIL3131 }, + { }/* terminate list */ };
drivers/ata/sata_sis.c +4 -4
@@ -67,13 +67,13 @@ static u32 sis_scr_read (struct ata_portstatic void sis_scr_write (struct ata_port *ap,unsigned int sc_reg,u32 val);static const struct pci_device_id sis_pci_tbl[] = { - {PCI_VENDOR_ID_SI ,0x180 ,PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 , sis_180 }, - {PCI_VENDOR_ID_SI ,0x181 ,PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 , sis_180 }, - {PCI_VENDOR_ID_SI ,0x182 ,PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 , sis_180 }, + {PCI_VDEVICE (SI ,0x180 ), sis_180 }, + {PCI_VDEVICE (SI ,0x181 ), sis_180 }, + {PCI_VDEVICE (SI ,0x182 ), sis_180 }, + { }/* terminate list */ }; -static struct pci_driver sis_pci_driver = { .name =DRV_NAME , .id_table = sis_pci_tbl,
drivers/ata/sata_svw.c +6 -9
@@ -469,15 +469,15 @@ err_out:* controller * */ static const struct pci_device_id k2_sata_pci_tbl[] = { - {0x1166 ,0x0240 ,PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 ,4 }, - {0x1166 ,0x0241 ,PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 ,4 }, - {0x1166 ,0x0242 ,PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 ,8 }, - {0x1166 ,0x024a ,PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 ,4 }, - {0x1166 ,0x024b ,PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 ,4 }, + {PCI_VDEVICE (SERVERWORKS ,0x0240 ),4 }, + {PCI_VDEVICE (SERVERWORKS ,0x0241 ),4 }, + {PCI_VDEVICE (SERVERWORKS ,0x0242 ),8 }, + {PCI_VDEVICE (SERVERWORKS ,0x024a ),4 }, + {PCI_VDEVICE (SERVERWORKS ,0x024b ),4 }, + { } }; -static struct pci_driver k2_sata_pci_driver = { .name =DRV_NAME , .id_table = k2_sata_pci_tbl,
@@ -485,19 +485,16 @@ static struct pci_driver k2_sata_pci_dri .remove = ata_pci_remove_one, }; -static int __init k2_sata_init (void ) {return pci_register_driver (&k2_sata_pci_driver); } - static void __exit k2_sata_exit(void) {pci_unregister_driver (&k2_sata_pci_driver); } -MODULE_AUTHOR ("Benjamin Herrenschmidt" );MODULE_DESCRIPTION ("low-level driver for K2 SATA controller" );MODULE_LICENSE ("GPL" );
drivers/ata/sata_sx4.c +2 -3
@@ -230,12 +230,11 @@ static const struct ata_port_info pdc_po };static const struct pci_device_id pdc_sata_pci_tbl[] = { - {PCI_VENDOR_ID_PROMISE ,0x6622 ,PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 , - board_20621 }, + {PCI_VDEVICE (PROMISE ,0x6622 ), board_20621 }, + { }/* terminate list */ }; -static struct pci_driver pdc_sata_pci_driver = { .name =DRV_NAME , .id_table = pdc_sata_pci_tbl,
drivers/ata/sata_uli.c +4 -4
@@ -61,13 +61,13 @@ static u32 uli_scr_read (struct ata_portstatic void uli_scr_write (struct ata_port *ap,unsigned int sc_reg,u32 val);static const struct pci_device_id uli_pci_tbl[] = { - {PCI_VENDOR_ID_AL ,0x5289 ,PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 , uli_5289 }, - {PCI_VENDOR_ID_AL ,0x5287 ,PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 , uli_5287 }, - {PCI_VENDOR_ID_AL ,0x5281 ,PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 , uli_5281 }, + {PCI_VDEVICE (AL ,0x5289 ), uli_5289 }, + {PCI_VDEVICE (AL ,0x5287 ), uli_5287 }, + {PCI_VDEVICE (AL ,0x5281 ), uli_5281 }, + { }/* terminate list */ }; -static struct pci_driver uli_pci_driver = { .name =DRV_NAME , .id_table = uli_pci_tbl,
drivers/ata/sata_via.c +3 -3
@@ -77,9 +77,9 @@ static void svia_scr_write (struct ata_pstatic void vt6420_error_handler (struct ata_port *ap);static const struct pci_device_id svia_pci_tbl[] = { - {0x1106 ,0x0591 ,PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 , vt6420 }, - {0x1106 ,0x3149 ,PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 , vt6420 }, - {0x1106 ,0x3249 ,PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 , vt6421 }, + {PCI_VDEVICE (VIA ,0x0591 ), vt6420 }, + {PCI_VDEVICE (VIA ,0x3149 ), vt6420 }, + {PCI_VDEVICE (VIA ,0x3249 ), vt6421 }, { }/* terminate list */ };
drivers/ata/sata_vsc.c +1 -5
@@ -442,16 +442,15 @@ err_out:return rc; } -static const struct pci_device_id vsc_sata_pci_tbl[] = { {PCI_VENDOR_ID_VITESSE ,0x7174 ,PCI_ANY_ID ,PCI_ANY_ID ,0x10600 ,0xFFFFFF ,0 }, {PCI_VENDOR_ID_INTEL ,0x3200 ,PCI_ANY_ID ,PCI_ANY_ID ,0x10600 ,0xFFFFFF ,0 }, + { }/* terminate list */ }; -static struct pci_driver vsc_sata_pci_driver = { .name =DRV_NAME , .id_table = vsc_sata_pci_tbl,
@@ -459,19 +458,16 @@ static struct pci_driver vsc_sata_pci_dr .remove = ata_pci_remove_one, }; -static int __init vsc_sata_init (void ) {return pci_register_driver (&vsc_sata_pci_driver); } - static void __exit vsc_sata_exit(void) {pci_unregister_driver (&vsc_sata_pci_driver); } -MODULE_AUTHOR ("Jeremy Higdon" );MODULE_DESCRIPTION ("low-level driver for Vitesse VSC7174 SATA controller" );MODULE_LICENSE ("GPL" );
include/linux/libata.h +7 -2
@@ -109,6 +109,10 @@ static inline u32 ata_msg_init(int dval,#define ATA_TAG_POISON 0xfafbfcfdU/* move to PCI layer? */ +#define PCI_VDEVICE (vendor, device) \ + PCI_VENDOR_ID_##vendor, (device), \ + PCI_ANY_ID, PCI_ANY_ID, 0, 0 +static inline struct device *pci_dev_to_dev (struct pci_dev *pdev) {return &pdev->dev;
@@ -138,8 +142,9 @@ enum {ATA_DFLAG_NCQ = (1 <<3 ),/* device supports NCQ */ ATA_DFLAG_CFG_MASK = (1 <<8 ) -1 , -ATA_DFLAG_PIO = (1 <<8 ),/* device currently in PIO mode */ -ATA_DFLAG_SUSPENDED = (1 <<9 ),/* device suspended */ +ATA_DFLAG_PIO = (1 <<8 ),/* device limited to PIO mode */ +ATA_DFLAG_NCQ_OFF = (1 <<9 ),/* devied limited to non-NCQ mode */ +ATA_DFLAG_SUSPENDED = (1 <<10 ),/* device suspended */ ATA_DFLAG_INIT_MASK = (1 <<16 ) -1 , ATA_DFLAG_DETACH = (1 << 16),
Ar Mer, 2006-10-04 am 02:02 -0400, ysgrifennodd Jeff Garzik:
Quoted 3 lines
Final libata batch for 2.6.19. Meant to send this a couple days ago.
Nothing interesting: minor bugfix, some cleanups, improved diagnostics.
Please also include the following. The first fixes support for rev c8 of the ALi/ULi PATA. The second keeps pcmcia in sync so ide_cs and pata_pcmcia are interchangable, both are only changes to constants.
Right now rev 0xC8 and higher don't work with libata but 0xc8 is in the field now.
drivers/ata/pata_ali.c +2 -2
@@ -34,7 +34,7 @@#include <linux/dmi.h> #define DRV_NAME "pata_ali" -#define DRV_VERSION "0.6.5" +#define DRV_VERSION "0.6.6"/* * Cable special cases
@@ -630,7 +630,7 @@pci_read_config_byte (pdev,0x53 , &tmp);if (rev <=0x20 ) tmp &= ~0x02 ; -if (rev ==0xc7 ) +if (rev >=0xc7 ) tmp |=0x03 ;else tmp |=0x01 ;/* CD_ROM enable for DMA */
drivers/ata/pata_pcmcia.c +3 -1
@@ -42,7 +42,7 @@#define DRV_NAME "pata_pcmcia" -#define DRV_VERSION "0.2.9" +#define DRV_VERSION "0.2.11"/* * Private data structure to glue stuff together
@@ -355,6 +355,8 @@PCMCIA_DEVICE_PROD_ID12 ("SAMSUNG" ,"04/05/06" ,0x43d74cb4 ,0x6a22777d ),PCMCIA_DEVICE_PROD_ID12 ("SMI VENDOR" ,"SMI PRODUCT" ,0x30896c92 ,0x703cc5f6 ),PCMCIA_DEVICE_PROD_ID12 ("TOSHIBA" ,"MK2001MPL" ,0xb4585a1a ,0x3489e003 ), +PCMCIA_DEVICE_PROD_ID1 ("TRANSCEND 512M " ,0xd0909443 ), +PCMCIA_DEVICE_PROD_ID12 ("TRANSCEND" ,"TS4GCF120" ,0x709b1bf1 ,0xf54a91c8 ),PCMCIA_DEVICE_PROD_ID12 ("WIT" ,"IDE16" ,0x244e5994 ,0x3e232852 ),PCMCIA_DEVICE_PROD_ID1 ("STI Flash" ,0xe4a13209 ), PCMCIA_DEVICE_PROD_ID12("STI", "Flash 5.0", 0xbf2df18d, 0x8cb57a0e),
Ar Mer, 2006-10-04 am 12:47 +0100, ysgrifennodd Alan Cox:
Quoted 11 lines
Ar Mer, 2006-10-04 am 02:02 -0400, ysgrifennodd Jeff Garzik:
Quoted 3 lines
Final libata batch for 2.6.19. Meant to send this a couple days ago.
Nothing interesting: minor bugfix, some cleanups, improved diagnostics.
Please also include the following. The first fixes support for rev c8 of the ALi/ULi PATA. The second keeps pcmcia in sync so
ide_csandpata_pcmciaare interchangable, both are only changes to constants.Right now rev
0xC8and higher don't work with libata but0xc8is in the field now.
Forgot