Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus

[linux-2.6] / drivers / ata / pata_legacy.c

diff --git a/drivers/ata/pata_legacy.c b/drivers/ata/pata_legacy.c
index eb510660b42431fb4a5950950c79d564ec83e8f7..c7d1738e4e696630ed73605728ddec1b2037e820 100644 (file)
--- a/drivers/ata/pata_legacy.c
+++ b/drivers/ata/pata_legacy.c
@@ -128,13 +128,13 @@ static struct scsi_host_template legacy_sht = {
        .can_queue              = ATA_DEF_QUEUE,
        .this_id                = ATA_SHT_THIS_ID,
        .sg_tablesize           = LIBATA_MAX_PRD,
-       .max_sectors            = ATA_MAX_SECTORS,
        .cmd_per_lun            = ATA_SHT_CMD_PER_LUN,
        .emulated               = ATA_SHT_EMULATED,
        .use_clustering         = ATA_SHT_USE_CLUSTERING,
        .proc_name              = DRV_NAME,
        .dma_boundary           = ATA_DMA_BOUNDARY,
        .slave_configure        = ata_scsi_slave_config,
+       .slave_destroy          = ata_scsi_slave_destroy,
        .bios_param             = ata_std_bios_param,
 };
 
@@ -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,
@@ -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,
@@ -211,11 +211,11 @@ static void pdc20230_set_piomode(struct ata_port *ap, struct ata_device *adev)
        int pio = adev->pio_mode - XFER_PIO_0;
        u8 rt;
        unsigned long flags;
-       
+
        /* Safe as UP only. Force I/Os to occur together */
-       
+
        local_irq_save(flags);
-       
+
        /* Unlock the control interface */
        do
        {
@@ -230,7 +230,7 @@ static void pdc20230_set_piomode(struct ata_port *ap, struct ata_device *adev)
        while((inb(0x1F2) & 0x80) && --tries);
 
        local_irq_restore(flags);
-       
+
        outb(inb(0x1F4) & 0x07, 0x1F4);
 
        rt = inb(0x1F3);
@@ -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,
@@ -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,
@@ -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,
@@ -425,7 +425,7 @@ static struct ata_port_operations ht6560b_port_ops = {
 /*
  *     Opti core chipset helpers
  */
- 
+
 /**
  *     opti_syscfg     -       read OPTI chipset configuration
  *     @reg: Configuration register to read
@@ -437,7 +437,7 @@ static u8 opti_syscfg(u8 reg)
 {
        unsigned long flags;
        u8 r;
-       
+
        /* Uniprocessor chipset and must force cycles adjancent */
        local_irq_save(flags);
        outb(reg, 0x22);
@@ -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,
@@ -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,
@@ -719,7 +719,7 @@ static __init int legacy_init_one(int port, unsigned long io, unsigned long ctrl
        }
 
        /* Probe for automatically detectable controllers */
- 
+
        if (io == 0x1F0 && ops == &legacy_port_ops) {
                unsigned long flags;
 
@@ -868,7 +868,7 @@ static __init int legacy_init(void)
                        last_port = 2;
        }
 
-       /* If an OPTI 82C46X is present find out where the channels are */      
+       /* If an OPTI 82C46X is present find out where the channels are */
        if (opti82c46x) {
                static const char *optis[4] = {
                        "3/463MV", "5MV",
@@ -876,7 +876,7 @@ static __init int legacy_init(void)
                };
                u8 chans = 1;
                u8 ctrl = (opti_syscfg(0x30) & 0xC0) >> 6;
-               
+
                opti82c46x = 3; /* Assume master and slave first */
                printk(KERN_INFO DRV_NAME ": Opti 82C46%s chipset support.\n", optis[ctrl]);
                if (ctrl == 3)