diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-15 18:29:23 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-15 18:29:23 -0500 |
commit | 1309d4e68497184d2fd87e892ddf14076c2bda98 (patch) | |
tree | 5cbd4ee54ccbeb8834d600700a48d4acaa559923 /drivers/ata/pata_amd.c | |
parent | 101142c37be8e5af9b847860219217e6b958c739 (diff) | |
parent | 5410f729e331bd607d99057ece59f6d7866cd3dc (diff) |
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev
* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
ata: fix sparse warning in pata_acpi.c
ata: fix sparse warning in pata_marvell.c
ata: fix sparse warning in pata_jmicron.c
ata: fix sparse warning in pata_cs5536.c
ata: sparse fixes for pata_amd.c
pata_scc.c: add thaw ops
pata_cs5536.c bugfix
pata_legacy: don't call ata_host_detach() after initialization failure
ata: fix sparse warnings in sata_mv.c
ata: fix sparse warning in sata_via.c
ata: fix sparse warning in sata_promise.c
ata: fix sparse warning in ata_piix.c
ata: fix sparse warning in libata-core.c
ata: make ata_scsiop_inq_89 static in libata-scsi.c
Diffstat (limited to 'drivers/ata/pata_amd.c')
-rw-r--r-- | drivers/ata/pata_amd.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/ata/pata_amd.c b/drivers/ata/pata_amd.c index ea567e2b1703..4b8d9b592ca4 100644 --- a/drivers/ata/pata_amd.c +++ b/drivers/ata/pata_amd.c | |||
@@ -146,9 +146,8 @@ static int amd_pre_reset(struct ata_link *link, unsigned long deadline) | |||
146 | 146 | ||
147 | static void amd_error_handler(struct ata_port *ap) | 147 | static void amd_error_handler(struct ata_port *ap) |
148 | { | 148 | { |
149 | return ata_bmdma_drive_eh(ap, amd_pre_reset, | 149 | ata_bmdma_drive_eh(ap, amd_pre_reset, ata_std_softreset, NULL, |
150 | ata_std_softreset, NULL, | 150 | ata_std_postreset); |
151 | ata_std_postreset); | ||
152 | } | 151 | } |
153 | 152 | ||
154 | static int amd_cable_detect(struct ata_port *ap) | 153 | static int amd_cable_detect(struct ata_port *ap) |
@@ -506,7 +505,6 @@ static struct ata_port_operations amd133_port_ops = { | |||
506 | static struct ata_port_operations nv100_port_ops = { | 505 | static struct ata_port_operations nv100_port_ops = { |
507 | .set_piomode = nv100_set_piomode, | 506 | .set_piomode = nv100_set_piomode, |
508 | .set_dmamode = nv100_set_dmamode, | 507 | .set_dmamode = nv100_set_dmamode, |
509 | .mode_filter = ata_pci_default_filter, | ||
510 | .tf_load = ata_tf_load, | 508 | .tf_load = ata_tf_load, |
511 | .tf_read = ata_tf_read, | 509 | .tf_read = ata_tf_read, |
512 | .check_status = ata_check_status, | 510 | .check_status = ata_check_status, |
@@ -541,7 +539,6 @@ static struct ata_port_operations nv100_port_ops = { | |||
541 | static struct ata_port_operations nv133_port_ops = { | 539 | static struct ata_port_operations nv133_port_ops = { |
542 | .set_piomode = nv133_set_piomode, | 540 | .set_piomode = nv133_set_piomode, |
543 | .set_dmamode = nv133_set_dmamode, | 541 | .set_dmamode = nv133_set_dmamode, |
544 | .mode_filter = ata_pci_default_filter, | ||
545 | .tf_load = ata_tf_load, | 542 | .tf_load = ata_tf_load, |
546 | .tf_read = ata_tf_read, | 543 | .tf_read = ata_tf_read, |
547 | .check_status = ata_check_status, | 544 | .check_status = ata_check_status, |