Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 36488
b: refs/heads/master
c: bda3028
h: refs/heads/master
v: v3
  • Loading branch information
Jeff Garzik committed Sep 27, 2006
1 parent f845825 commit 2c85eef
Show file tree
Hide file tree
Showing 35 changed files with 55 additions and 75 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: ae1f19aeb715098ac06323f279383f3843429d97
refs/heads/master: bda3028813bd07f34f30288a492fbf6f7b8712dd
2 changes: 1 addition & 1 deletion trunk/drivers/ata/ata_generic.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ static struct ata_port_operations generic_port_ops = {

.qc_prep = ata_qc_prep,
.qc_issue = ata_qc_issue_prot,
.eng_timeout = ata_eng_timeout,

.irq_handler = ata_interrupt,
.irq_clear = ata_bmdma_irq_clear,

Expand Down
8 changes: 4 additions & 4 deletions trunk/drivers/ata/pata_ali.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -369,7 +369,7 @@ static struct ata_port_operations ali_early_port_ops = {

.qc_prep = ata_qc_prep,
.qc_issue = ata_qc_issue_prot,
.eng_timeout = ata_eng_timeout,

.data_xfer = ata_pio_data_xfer,

.irq_handler = ata_interrupt,
Expand Down Expand Up @@ -410,7 +410,7 @@ static struct ata_port_operations ali_20_port_ops = {

.qc_prep = ata_qc_prep,
.qc_issue = ata_qc_issue_prot,
.eng_timeout = ata_eng_timeout,

.data_xfer = ata_pio_data_xfer,

.irq_handler = ata_interrupt,
Expand Down Expand Up @@ -448,7 +448,7 @@ static struct ata_port_operations ali_c2_port_ops = {

.qc_prep = ata_qc_prep,
.qc_issue = ata_qc_issue_prot,
.eng_timeout = ata_eng_timeout,

.data_xfer = ata_pio_data_xfer,

.irq_handler = ata_interrupt,
Expand Down Expand Up @@ -485,7 +485,7 @@ static struct ata_port_operations ali_c5_port_ops = {

.qc_prep = ata_qc_prep,
.qc_issue = ata_qc_issue_prot,
.eng_timeout = ata_eng_timeout,

.data_xfer = ata_pio_data_xfer,

.irq_handler = ata_interrupt,
Expand Down
12 changes: 6 additions & 6 deletions trunk/drivers/ata/pata_amd.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -359,7 +359,7 @@ static struct ata_port_operations amd33_port_ops = {

.qc_prep = ata_qc_prep,
.qc_issue = ata_qc_issue_prot,
.eng_timeout = ata_eng_timeout,

.data_xfer = ata_pio_data_xfer,

.irq_handler = ata_interrupt,
Expand Down Expand Up @@ -393,7 +393,7 @@ static struct ata_port_operations amd66_port_ops = {

.qc_prep = ata_qc_prep,
.qc_issue = ata_qc_issue_prot,
.eng_timeout = ata_eng_timeout,

.data_xfer = ata_pio_data_xfer,

.irq_handler = ata_interrupt,
Expand Down Expand Up @@ -427,7 +427,7 @@ static struct ata_port_operations amd100_port_ops = {

.qc_prep = ata_qc_prep,
.qc_issue = ata_qc_issue_prot,
.eng_timeout = ata_eng_timeout,

.data_xfer = ata_pio_data_xfer,

.irq_handler = ata_interrupt,
Expand Down Expand Up @@ -461,7 +461,7 @@ static struct ata_port_operations amd133_port_ops = {

.qc_prep = ata_qc_prep,
.qc_issue = ata_qc_issue_prot,
.eng_timeout = ata_eng_timeout,

.data_xfer = ata_pio_data_xfer,

.irq_handler = ata_interrupt,
Expand Down Expand Up @@ -495,7 +495,7 @@ static struct ata_port_operations nv100_port_ops = {

.qc_prep = ata_qc_prep,
.qc_issue = ata_qc_issue_prot,
.eng_timeout = ata_eng_timeout,

.data_xfer = ata_pio_data_xfer,

.irq_handler = ata_interrupt,
Expand Down Expand Up @@ -529,7 +529,7 @@ static struct ata_port_operations nv133_port_ops = {

.qc_prep = ata_qc_prep,
.qc_issue = ata_qc_issue_prot,
.eng_timeout = ata_eng_timeout,

.data_xfer = ata_pio_data_xfer,

.irq_handler = ata_interrupt,
Expand Down
4 changes: 1 addition & 3 deletions trunk/drivers/ata/pata_artop.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -340,7 +340,7 @@ static const struct ata_port_operations artop6210_ops = {
.bmdma_status = ata_bmdma_status,
.qc_prep = ata_qc_prep,
.qc_issue = ata_qc_issue_prot,
.eng_timeout = ata_eng_timeout,

.data_xfer = ata_pio_data_xfer,

.irq_handler = ata_interrupt,
Expand Down Expand Up @@ -375,8 +375,6 @@ static const struct ata_port_operations artop6260_ops = {
.qc_issue = ata_qc_issue_prot,
.data_xfer = ata_pio_data_xfer,

.eng_timeout = ata_eng_timeout,

.irq_handler = ata_interrupt,
.irq_clear = ata_bmdma_irq_clear,

Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/ata/pata_atiixp.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@ static struct ata_port_operations atiixp_port_ops = {

.qc_prep = ata_qc_prep,
.qc_issue = ata_qc_issue_prot,
.eng_timeout = ata_eng_timeout,

.data_xfer = ata_pio_data_xfer,

.irq_handler = ata_interrupt,
Expand Down
6 changes: 3 additions & 3 deletions trunk/drivers/ata/pata_cmd64x.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -301,7 +301,7 @@ static struct ata_port_operations cmd64x_port_ops = {

.qc_prep = ata_qc_prep,
.qc_issue = ata_qc_issue_prot,
.eng_timeout = ata_eng_timeout,

.data_xfer = ata_pio_data_xfer,

.irq_handler = ata_interrupt,
Expand Down Expand Up @@ -335,7 +335,7 @@ static struct ata_port_operations cmd646r1_port_ops = {

.qc_prep = ata_qc_prep,
.qc_issue = ata_qc_issue_prot,
.eng_timeout = ata_eng_timeout,

.data_xfer = ata_pio_data_xfer,

.irq_handler = ata_interrupt,
Expand Down Expand Up @@ -369,7 +369,7 @@ static struct ata_port_operations cmd648_port_ops = {

.qc_prep = ata_qc_prep,
.qc_issue = ata_qc_issue_prot,
.eng_timeout = ata_eng_timeout,

.data_xfer = ata_pio_data_xfer,

.irq_handler = ata_interrupt,
Expand Down
2 changes: 0 additions & 2 deletions trunk/drivers/ata/pata_cs5520.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -193,8 +193,6 @@ static struct ata_port_operations cs5520_port_ops = {
.qc_issue = ata_qc_issue_prot,
.data_xfer = ata_pio_data_xfer,

.eng_timeout = ata_eng_timeout,

.irq_handler = ata_interrupt,
.irq_clear = ata_bmdma_irq_clear,

Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/ata/pata_cs5530.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ static struct ata_port_operations cs5530_port_ops = {

.qc_prep = ata_qc_prep,
.qc_issue = cs5530_qc_issue_prot,
.eng_timeout = ata_eng_timeout,

.data_xfer = ata_pio_data_xfer,

.irq_handler = ata_interrupt,
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/ata/pata_cs5535.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,7 @@ static struct ata_port_operations cs5535_port_ops = {

.qc_prep = ata_qc_prep,
.qc_issue = ata_qc_issue_prot,
.eng_timeout = ata_eng_timeout,

.data_xfer = ata_pio_data_xfer,

.irq_handler = ata_interrupt,
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/ata/pata_cypress.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ static struct ata_port_operations cy82c693_port_ops = {

.qc_prep = ata_qc_prep,
.qc_issue = ata_qc_issue_prot,
.eng_timeout = ata_eng_timeout,

.data_xfer = ata_pio_data_xfer,

.irq_handler = ata_interrupt,
Expand Down
2 changes: 0 additions & 2 deletions trunk/drivers/ata/pata_efar.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -261,8 +261,6 @@ static const struct ata_port_operations efar_ops = {
.qc_issue = ata_qc_issue_prot,
.data_xfer = ata_pio_data_xfer,

.eng_timeout = ata_eng_timeout,

.irq_handler = ata_interrupt,
.irq_clear = ata_bmdma_irq_clear,

Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/ata/pata_hpt366.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -360,7 +360,7 @@ static struct ata_port_operations hpt366_port_ops = {

.qc_prep = ata_qc_prep,
.qc_issue = ata_qc_issue_prot,
.eng_timeout = ata_eng_timeout,

.data_xfer = ata_pio_data_xfer,

.irq_handler = ata_interrupt,
Expand Down
8 changes: 4 additions & 4 deletions trunk/drivers/ata/pata_hpt37x.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -793,7 +793,7 @@ static struct ata_port_operations hpt370_port_ops = {

.qc_prep = ata_qc_prep,
.qc_issue = ata_qc_issue_prot,
.eng_timeout = ata_eng_timeout,

.data_xfer = ata_pio_data_xfer,

.irq_handler = ata_interrupt,
Expand Down Expand Up @@ -832,7 +832,7 @@ static struct ata_port_operations hpt370a_port_ops = {

.qc_prep = ata_qc_prep,
.qc_issue = ata_qc_issue_prot,
.eng_timeout = ata_eng_timeout,

.data_xfer = ata_pio_data_xfer,

.irq_handler = ata_interrupt,
Expand Down Expand Up @@ -872,7 +872,7 @@ static struct ata_port_operations hpt372_port_ops = {

.qc_prep = ata_qc_prep,
.qc_issue = ata_qc_issue_prot,
.eng_timeout = ata_eng_timeout,

.data_xfer = ata_pio_data_xfer,

.irq_handler = ata_interrupt,
Expand Down Expand Up @@ -912,7 +912,7 @@ static struct ata_port_operations hpt374_port_ops = {

.qc_prep = ata_qc_prep,
.qc_issue = ata_qc_issue_prot,
.eng_timeout = ata_eng_timeout,

.data_xfer = ata_pio_data_xfer,

.irq_handler = ata_interrupt,
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/ata/pata_hpt3x2n.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -372,7 +372,7 @@ static struct ata_port_operations hpt3x2n_port_ops = {

.qc_prep = ata_qc_prep,
.qc_issue = hpt3x2n_qc_issue_prot,
.eng_timeout = ata_eng_timeout,

.data_xfer = ata_pio_data_xfer,

.irq_handler = ata_interrupt,
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/ata/pata_hpt3x3.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ static struct ata_port_operations hpt3x3_port_ops = {

.qc_prep = ata_qc_prep,
.qc_issue = ata_qc_issue_prot,
.eng_timeout = ata_eng_timeout,

.data_xfer = ata_pio_data_xfer,

.irq_handler = ata_interrupt,
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/ata/pata_isapnp.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ static struct ata_port_operations isapnp_port_ops = {

.qc_prep = ata_qc_prep,
.qc_issue = ata_qc_issue_prot,
.eng_timeout = ata_eng_timeout,

.data_xfer = ata_pio_data_xfer,

.irq_handler = ata_interrupt,
Expand Down
4 changes: 2 additions & 2 deletions trunk/drivers/ata/pata_it821x.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -703,7 +703,7 @@ static struct ata_port_operations it821x_smart_port_ops = {

.qc_prep = ata_qc_prep,
.qc_issue = it821x_smart_qc_issue_prot,
.eng_timeout = ata_eng_timeout,

.data_xfer = ata_pio_data_xfer,

.irq_handler = ata_interrupt,
Expand Down Expand Up @@ -739,7 +739,7 @@ static struct ata_port_operations it821x_passthru_port_ops = {

.qc_prep = ata_qc_prep,
.qc_issue = it821x_passthru_qc_issue_prot,
.eng_timeout = ata_eng_timeout,

.data_xfer = ata_pio_data_xfer,

.irq_clear = ata_bmdma_irq_clear,
Expand Down
3 changes: 1 addition & 2 deletions trunk/drivers/ata/pata_jmicron.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -164,8 +164,7 @@ static const struct ata_port_operations jmicron_ops = {
.qc_issue = ata_qc_issue_prot,
.data_xfer = ata_pio_data_xfer,

/* Timeout handling. Special recovery hooks here */
.eng_timeout = ata_eng_timeout,
/* IRQ-related hooks */
.irq_handler = ata_interrupt,
.irq_clear = ata_bmdma_irq_clear,

Expand Down
14 changes: 7 additions & 7 deletions trunk/drivers/ata/pata_legacy.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ static struct ata_port_operations simple_port_ops = {

.qc_prep = ata_qc_prep,
.qc_issue = ata_qc_issue_prot,
.eng_timeout = ata_eng_timeout,

.data_xfer = ata_pio_data_xfer_noirq,

.irq_handler = ata_interrupt,
Expand All @@ -186,7 +186,7 @@ static struct ata_port_operations legacy_port_ops = {

.qc_prep = ata_qc_prep,
.qc_issue = ata_qc_issue_prot,
.eng_timeout = ata_eng_timeout,

.data_xfer = ata_pio_data_xfer_noirq,

.irq_handler = ata_interrupt,
Expand Down Expand Up @@ -296,7 +296,7 @@ static struct ata_port_operations pdc20230_port_ops = {

.qc_prep = ata_qc_prep,
.qc_issue = ata_qc_issue_prot,
.eng_timeout = ata_eng_timeout,

.data_xfer = pdc_data_xfer_vlb,

.irq_handler = ata_interrupt,
Expand Down Expand Up @@ -348,7 +348,7 @@ static struct ata_port_operations ht6560a_port_ops = {

.qc_prep = ata_qc_prep,
.qc_issue = ata_qc_issue_prot,
.eng_timeout = ata_eng_timeout,

.data_xfer = ata_pio_data_xfer, /* Check vlb/noirq */

.irq_handler = ata_interrupt,
Expand Down Expand Up @@ -411,7 +411,7 @@ static struct ata_port_operations ht6560b_port_ops = {

.qc_prep = ata_qc_prep,
.qc_issue = ata_qc_issue_prot,
.eng_timeout = ata_eng_timeout,

.data_xfer = ata_pio_data_xfer, /* FIXME: Check 32bit and noirq */

.irq_handler = ata_interrupt,
Expand Down Expand Up @@ -529,7 +529,7 @@ static struct ata_port_operations opti82c611a_port_ops = {

.qc_prep = ata_qc_prep,
.qc_issue = ata_qc_issue_prot,
.eng_timeout = ata_eng_timeout,

.data_xfer = ata_pio_data_xfer,

.irq_handler = ata_interrupt,
Expand Down Expand Up @@ -659,7 +659,7 @@ static struct ata_port_operations opti82c46x_port_ops = {

.qc_prep = ata_qc_prep,
.qc_issue = opti82c46x_qc_issue_prot,
.eng_timeout = ata_eng_timeout,

.data_xfer = ata_pio_data_xfer,

.irq_handler = ata_interrupt,
Expand Down
3 changes: 1 addition & 2 deletions trunk/drivers/ata/pata_netcell.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -90,8 +90,7 @@ static const struct ata_port_operations netcell_ops = {
.qc_issue = ata_qc_issue_prot,
.data_xfer = ata_pio_data_xfer,

/* Timeout handling. Special recovery hooks here */
.eng_timeout = ata_eng_timeout,
/* IRQ-related hooks */
.irq_handler = ata_interrupt,
.irq_clear = ata_bmdma_irq_clear,

Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/ata/pata_ns87410.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ static struct ata_port_operations ns87410_port_ops = {

.qc_prep = ata_qc_prep,
.qc_issue = ns87410_qc_issue_prot,
.eng_timeout = ata_eng_timeout,

.data_xfer = ata_pio_data_xfer,

.irq_handler = ata_interrupt,
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/ata/pata_opti.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@ static struct ata_port_operations opti_port_ops = {

.qc_prep = ata_qc_prep,
.qc_issue = ata_qc_issue_prot,
.eng_timeout = ata_eng_timeout,

.data_xfer = ata_pio_data_xfer,

.irq_handler = ata_interrupt,
Expand Down
Loading

0 comments on commit 2c85eef

Please sign in to comment.