aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ata/pata_via.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-10-12 19:16:41 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-10-12 19:16:41 -0400
commitab9c232286c2b77be78441c2d8396500b045777e (patch)
tree17570e159e4fb1ba36f1c363a7abef9b55909275 /drivers/ata/pata_via.c
parent8bd0983e05757e5c1f7a3342cd09badae93c167d (diff)
parent2855568b1ee4f58ef2c0a13ddfceb4b0b216b7ed (diff)
Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev
* 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev: (119 commits) [libata] struct pci_dev related cleanups libata: use ata_exec_internal() for PMP register access libata: implement ATA_PFLAG_RESETTING libata: add @timeout to ata_exec_internal[_sg]() ahci: fix notification handling ahci: clean up PORT_IRQ_BAD_PMP enabling ahci: kill leftover from enabling NCQ over PMP libata: wrap schedule_timeout_uninterruptible() in loop libata: skip suppress reporting if ATA_EHI_QUIET libata: clear ehi description after initial host report pata_jmicron: match vendor and class code only libata: add ST9160821AS / 3.ALD to NCQ blacklist pata_acpi: ACPI driver support libata-core: Expose gtm methods for driver use libata: add HDT722516DLA380 to NCQ blacklist libata: blacklist NCQ on Seagate Barracuda ST380817AS [libata] Turn on ACPI by default libata_scsi: Fix ATAPI transfer lengths libata: correct handling of SRST reset sequences libata: Integrate ACPI-based PATA/SATA hotplug - version 5 ...
Diffstat (limited to 'drivers/ata/pata_via.c')
-rw-r--r--drivers/ata/pata_via.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/ata/pata_via.c b/drivers/ata/pata_via.c
index f143db4559e0..5d41b6612d7f 100644
--- a/drivers/ata/pata_via.c
+++ b/drivers/ata/pata_via.c
@@ -184,11 +184,15 @@ static int via_cable_detect(struct ata_port *ap) {
184 two drives */ 184 two drives */
185 if (ata66 & (0x10100000 >> (16 * ap->port_no))) 185 if (ata66 & (0x10100000 >> (16 * ap->port_no)))
186 return ATA_CBL_PATA80; 186 return ATA_CBL_PATA80;
187 /* Check with ACPI so we can spot BIOS reported SATA bridges */
188 if (ata_acpi_cbl_80wire(ap))
189 return ATA_CBL_PATA80;
187 return ATA_CBL_PATA40; 190 return ATA_CBL_PATA40;
188} 191}
189 192
190static int via_pre_reset(struct ata_port *ap, unsigned long deadline) 193static int via_pre_reset(struct ata_link *link, unsigned long deadline)
191{ 194{
195 struct ata_port *ap = link->ap;
192 const struct via_isa_bridge *config = ap->host->private_data; 196 const struct via_isa_bridge *config = ap->host->private_data;
193 197
194 if (!(config->flags & VIA_NO_ENABLES)) { 198 if (!(config->flags & VIA_NO_ENABLES)) {
@@ -201,7 +205,7 @@ static int via_pre_reset(struct ata_port *ap, unsigned long deadline)
201 return -ENOENT; 205 return -ENOENT;
202 } 206 }
203 207
204 return ata_std_prereset(ap, deadline); 208 return ata_std_prereset(link, deadline);
205} 209}
206 210
207 211
@@ -344,7 +348,6 @@ static struct scsi_host_template via_sht = {
344}; 348};
345 349
346static struct ata_port_operations via_port_ops = { 350static struct ata_port_operations via_port_ops = {
347 .port_disable = ata_port_disable,
348 .set_piomode = via_set_piomode, 351 .set_piomode = via_set_piomode,
349 .set_dmamode = via_set_dmamode, 352 .set_dmamode = via_set_dmamode,
350 .mode_filter = ata_pci_default_filter, 353 .mode_filter = ata_pci_default_filter,
@@ -374,13 +377,11 @@ static struct ata_port_operations via_port_ops = {
374 .irq_handler = ata_interrupt, 377 .irq_handler = ata_interrupt,
375 .irq_clear = ata_bmdma_irq_clear, 378 .irq_clear = ata_bmdma_irq_clear,
376 .irq_on = ata_irq_on, 379 .irq_on = ata_irq_on,
377 .irq_ack = ata_irq_ack,
378 380
379 .port_start = ata_port_start, 381 .port_start = ata_sff_port_start,
380}; 382};
381 383
382static struct ata_port_operations via_port_ops_noirq = { 384static struct ata_port_operations via_port_ops_noirq = {
383 .port_disable = ata_port_disable,
384 .set_piomode = via_set_piomode, 385 .set_piomode = via_set_piomode,
385 .set_dmamode = via_set_dmamode, 386 .set_dmamode = via_set_dmamode,
386 .mode_filter = ata_pci_default_filter, 387 .mode_filter = ata_pci_default_filter,
@@ -410,9 +411,8 @@ static struct ata_port_operations via_port_ops_noirq = {
410 .irq_handler = ata_interrupt, 411 .irq_handler = ata_interrupt,
411 .irq_clear = ata_bmdma_irq_clear, 412 .irq_clear = ata_bmdma_irq_clear,
412 .irq_on = ata_irq_on, 413 .irq_on = ata_irq_on,
413 .irq_ack = ata_irq_ack,
414 414
415 .port_start = ata_port_start, 415 .port_start = ata_sff_port_start,
416}; 416};
417 417
418/** 418/**