aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ata/pata_isapnp.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/ata/pata_isapnp.c')
-rw-r--r--drivers/ata/pata_isapnp.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/ata/pata_isapnp.c b/drivers/ata/pata_isapnp.c
index 9e553c54203a..88ab0e1d353f 100644
--- a/drivers/ata/pata_isapnp.c
+++ b/drivers/ata/pata_isapnp.c
@@ -38,7 +38,6 @@ static struct scsi_host_template isapnp_sht = {
38}; 38};
39 39
40static struct ata_port_operations isapnp_port_ops = { 40static struct ata_port_operations isapnp_port_ops = {
41 .port_disable = ata_port_disable,
42 .tf_load = ata_tf_load, 41 .tf_load = ata_tf_load,
43 .tf_read = ata_tf_read, 42 .tf_read = ata_tf_read,
44 .check_status = ata_check_status, 43 .check_status = ata_check_status,
@@ -58,9 +57,8 @@ static struct ata_port_operations isapnp_port_ops = {
58 57
59 .irq_clear = ata_bmdma_irq_clear, 58 .irq_clear = ata_bmdma_irq_clear,
60 .irq_on = ata_irq_on, 59 .irq_on = ata_irq_on,
61 .irq_ack = ata_irq_ack,
62 60
63 .port_start = ata_port_start, 61 .port_start = ata_sff_port_start,
64}; 62};
65 63
66/** 64/**
@@ -112,6 +110,10 @@ static int isapnp_init_one(struct pnp_dev *idev, const struct pnp_device_id *dev
112 110
113 ata_std_ports(&ap->ioaddr); 111 ata_std_ports(&ap->ioaddr);
114 112
113 ata_port_desc(ap, "cmd 0x%llx ctl 0x%llx",
114 (unsigned long long)pnp_port_start(idev, 0),
115 (unsigned long long)pnp_port_start(idev, 1));
116
115 /* activate */ 117 /* activate */
116 return ata_host_activate(host, pnp_irq(idev, 0), ata_interrupt, 0, 118 return ata_host_activate(host, pnp_irq(idev, 0), ata_interrupt, 0,
117 &isapnp_sht); 119 &isapnp_sht);