11 files changed, 66 insertions, 147 deletions

diff --git a/drivers/ide/Kconfig b/drivers/ide/Kconfig
index df752e690e47..eed6d8e1b5c7 100644
--- a/drivers/ide/Kconfig
+++ b/drivers/ide/Kconfig
@@ -50,7 +50,7 @@ menuconfig IDE
           To compile this driver as a module, choose M here: the
           module will be called ide.
 
-          For further information, please read <file:Documentation/ide.txt>.
+          For further information, please read <file:Documentation/ide/ide.txt>.
 
           If unsure, say Y.
 
@@ -77,7 +77,7 @@ config BLK_DEV_IDE
           Useful information about large (>540 MB) IDE disks, multiple
           interfaces, what to do if ATA/IDE devices are not automatically
           detected, sound card ATA/IDE ports, module support, and other
-          topics, is contained in <file:Documentation/ide.txt>. For detailed
+          topics, is contained in <file:Documentation/ide/ide.txt>. For detailed
           information about hard drives, consult the Disk-HOWTO and the
           Multi-Disk-HOWTO, available from
           <http://www.tldp.org/docs.html#howto>.
@@ -87,7 +87,7 @@ config BLK_DEV_IDE
           <ftp://ibiblio.org/pub/Linux/system/hardware/>.
 
           To compile this driver as a module, choose M here and read
-          <file:Documentation/ide.txt>. The module will be called ide-mod.
+          <file:Documentation/ide/ide.txt>. The module will be called ide-mod.
           Do not compile this driver as a module if your root file system (the
           one containing the directory /) is located on an IDE device.
 
@@ -98,7 +98,7 @@ config BLK_DEV_IDE
 
 if BLK_DEV_IDE
 
-comment "Please see Documentation/ide.txt for help/info on IDE drives"
+comment "Please see Documentation/ide/ide.txt for help/info on IDE drives"
 
 config BLK_DEV_IDE_SATA
         bool "Support for SATA (deprecated; conflicts with libata SATA driver)"
@@ -235,8 +235,8 @@ config BLK_DEV_IDETAPE
           along with other IDE devices, as "hdb" or "hdc", or something
           similar, and will be mapped to a character device such as "ht0"
           (check the boot messages with dmesg).  Be sure to consult the
-          <file:drivers/ide/ide-tape.c> and <file:Documentation/ide.txt> files
-          for usage information.
+          <file:drivers/ide/ide-tape.c> and <file:Documentation/ide/ide.txt>
+          files for usage information.
 
           To compile this driver as a module, choose M here: the
           module will be called ide-tape.
@@ -358,7 +358,7 @@ config BLK_DEV_CMD640
 
           The CMD640 chip is also used on add-in cards by Acculogic, and on
           the "CSA-6400E PCI to IDE controller" that some people have. For
-          details, read <file:Documentation/ide.txt>.
+          details, read <file:Documentation/ide/ide.txt>.
 
 config BLK_DEV_CMD640_ENHANCED
         bool "CMD640 enhanced support"
@@ -366,7 +366,7 @@ config BLK_DEV_CMD640_ENHANCED
         help
           This option includes support for setting/autotuning PIO modes and
           prefetch on CMD640 IDE interfaces.  For details, read
-          <file:Documentation/ide.txt>. If you have a CMD640 IDE interface
+          <file:Documentation/ide/ide.txt>. If you have a CMD640 IDE interface
           and your BIOS does not already do this for you, then say Y here.
           Otherwise say N.
 
@@ -1069,9 +1069,9 @@ config BLK_DEV_ALI14XX
           This driver is enabled at runtime using the "ali14xx.probe" kernel
           boot parameter.  It enables support for the secondary IDE interface
           of the ALI M1439/1443/1445/1487/1489 chipsets, and permits faster
-          I/O speeds to be set as well.  See the files
-          <file:Documentation/ide.txt> and <file:drivers/ide/legacy/ali14xx.c>
-          for more info.
+          I/O speeds to be set as well.
+          See the files <file:Documentation/ide/ide.txt> and
+          <file:drivers/ide/legacy/ali14xx.c> for more info.
 
 config BLK_DEV_DTC2278
         tristate "DTC-2278 support"
@@ -1079,7 +1079,7 @@ config BLK_DEV_DTC2278
           This driver is enabled at runtime using the "dtc2278.probe" kernel
           boot parameter. It enables support for the secondary IDE interface
           of the DTC-2278 card, and permits faster I/O speeds to be set as
-          well. See the <file:Documentation/ide.txt> and
+          well. See the <file:Documentation/ide/ide.txt> and
           <file:drivers/ide/legacy/dtc2278.c> files for more info.
 
 config BLK_DEV_HT6560B
@@ -1088,7 +1088,7 @@ config BLK_DEV_HT6560B
           This driver is enabled at runtime using the "ht6560b.probe" kernel
           boot parameter. It enables support for the secondary IDE interface
           of the Holtek card, and permits faster I/O speeds to be set as well.
-          See the <file:Documentation/ide.txt> and
+          See the <file:Documentation/ide/ide.txt> and
           <file:drivers/ide/legacy/ht6560b.c> files for more info.
 
 config BLK_DEV_QD65XX
@@ -1096,7 +1096,7 @@ config BLK_DEV_QD65XX
         help
           This driver is enabled at runtime using the "qd65xx.probe" kernel
           boot parameter.  It permits faster I/O speeds to be set.  See the
-          <file:Documentation/ide.txt> and <file:drivers/ide/legacy/qd65xx.c>
+          <file:Documentation/ide/ide.txt> and <file:drivers/ide/legacy/qd65xx.c>
           for more info.
 
 config BLK_DEV_UMC8672
@@ -1105,7 +1105,7 @@ config BLK_DEV_UMC8672
           This driver is enabled at runtime using the "umc8672.probe" kernel
           boot parameter. It enables support for the secondary IDE interface
           of the UMC-8672, and permits faster I/O speeds to be set as well.
-          See the files <file:Documentation/ide.txt> and
+          See the files <file:Documentation/ide/ide.txt> and
           <file:drivers/ide/legacy/umc8672.c> for more info.
 
 endif
diff --git a/drivers/ide/ide-cd.c b/drivers/ide/ide-cd.c
index 310e497b5838..c8d0e8715997 100644
--- a/drivers/ide/ide-cd.c
+++ b/drivers/ide/ide-cd.c
@@ -670,8 +670,8 @@ static void cdrom_buffer_sectors (ide_drive_t *drive, unsigned long sector,
  * and attempt to recover if there are problems.  Returns  0 if everything's
  * ok; nonzero if the request has been terminated.
  */
-static
-int ide_cd_check_ireason(ide_drive_t *drive, int len, int ireason, int rw)
+static int ide_cd_check_ireason(ide_drive_t *drive, struct request *rq,
+                                int len, int ireason, int rw)
 {
         /*
          * ireason == 0: the drive wants to receive data from us
@@ -701,6 +701,9 @@ int ide_cd_check_ireason(ide_drive_t *drive, int len, int ireason, int rw)
                                 drive->name, __FUNCTION__, ireason);
         }
 
+        if (rq->cmd_type == REQ_TYPE_ATA_PC)
+                rq->cmd_flags |= REQ_FAILED;
+
         cdrom_end_request(drive, 0);
         return -1;
 }
@@ -1071,11 +1074,11 @@ static ide_startstop_t cdrom_newpc_intr(ide_drive_t *drive)
         /*
          * check which way to transfer data
          */
-        if (blk_fs_request(rq) || blk_pc_request(rq)) {
-                if (ide_cd_check_ireason(drive, len, ireason, write))
-                        return ide_stopped;
+        if (ide_cd_check_ireason(drive, rq, len, ireason, write))
+                return ide_stopped;
 
-                if (blk_fs_request(rq) && write == 0) {
+        if (blk_fs_request(rq)) {
+                if (write == 0) {
                         int nskip;
 
                         if (ide_cd_check_transfer_size(drive, len)) {
@@ -1101,16 +1104,9 @@ static ide_startstop_t cdrom_newpc_intr(ide_drive_t *drive)
         if (ireason == 0) {
                 write = 1;
                 xferfunc = HWIF(drive)->atapi_output_bytes;
-        } else if (ireason == 2 || (ireason == 1 &&
-                   (blk_fs_request(rq) || blk_pc_request(rq)))) {
+        } else {
                 write = 0;
                 xferfunc = HWIF(drive)->atapi_input_bytes;
-        } else {
-                printk(KERN_ERR "%s: %s: The drive "
-                                "appears confused (ireason = 0x%02x). "
-                                "Trying to recover by ending request.\n",
-                                drive->name, __FUNCTION__, ireason);
-                goto end_request;
         }
 
         /*
@@ -1182,11 +1178,10 @@ static ide_startstop_t cdrom_newpc_intr(ide_drive_t *drive)
                         else
                                 rq->data += blen;
                 }
+                if (!write && blk_sense_request(rq))
+                        rq->sense_len += blen;
         }
 
-        if (write && blk_sense_request(rq))
-                rq->sense_len += thislen;
-
         /*
          * pad, if necessary
          */
@@ -1931,6 +1926,7 @@ static const struct cd_list_entry ide_cd_quirks_list[] = {
         { "MATSHITADVD-ROM SR-8186", NULL,   IDE_CD_FLAG_PLAY_AUDIO_OK      },
         { "MATSHITADVD-ROM SR-8176", NULL,   IDE_CD_FLAG_PLAY_AUDIO_OK      },
         { "MATSHITADVD-ROM SR-8174", NULL,   IDE_CD_FLAG_PLAY_AUDIO_OK      },
+        { "Optiarc DVD RW AD-5200A", NULL,   IDE_CD_FLAG_PLAY_AUDIO_OK      },
         { NULL, NULL, 0 }
 };
 
diff --git a/drivers/ide/ide-cd_ioctl.c b/drivers/ide/ide-cd_ioctl.c
index b68284de4e85..6d147ce6782f 100644
--- a/drivers/ide/ide-cd_ioctl.c
+++ b/drivers/ide/ide-cd_ioctl.c
@@ -457,6 +457,10 @@ int ide_cdrom_packet(struct cdrom_device_info *cdi,
            layer. the packet must be complete, as we do not
            touch it at all. */
         ide_cd_init_rq(drive, &req);
+
+        if (cgc->data_direction == CGC_DATA_WRITE)
+                req.cmd_flags |= REQ_RW;
+
         memcpy(req.cmd, cgc->cmd, CDROM_PACKET_SIZE);
         if (cgc->sense)
                 memset(cgc->sense, 0, sizeof(struct request_sense));
diff --git a/drivers/ide/ide-disk.c b/drivers/ide/ide-disk.c
index 8f5bed471050..39501d130256 100644
--- a/drivers/ide/ide-disk.c
+++ b/drivers/ide/ide-disk.c
@@ -867,7 +867,7 @@ static void idedisk_setup (ide_drive_t *drive)
 
         /* Only print cache size when it was specified */
         if (id->buf_size)
-                printk (" w/%dKiB Cache", id->buf_size/2);
+                printk(KERN_CONT " w/%dKiB Cache", id->buf_size / 2);
 
         printk(KERN_CONT ", CHS=%d/%d/%d\n",
                          drive->bios_cyl, drive->bios_head, drive->bios_sect);
@@ -949,7 +949,8 @@ static void ide_device_shutdown(ide_drive_t *drive)
                 return;
         }
 
-        printk("Shutdown: %s\n", drive->name);
+        printk(KERN_INFO "Shutdown: %s\n", drive->name);
+
         drive->gendev.bus->suspend(&drive->gendev, PMSG_SUSPEND);
 }
 
diff --git a/drivers/ide/ide-dma.c b/drivers/ide/ide-dma.c
index d0e7b537353e..d61e5788d310 100644
--- a/drivers/ide/ide-dma.c
+++ b/drivers/ide/ide-dma.c
@@ -1,9 +1,13 @@
 /*
+ *  IDE DMA support (including IDE PCI BM-DMA).
+ *
  *  Copyright (C) 1995-1998   Mark Lord
  *  Copyright (C) 1999-2000   Andre Hedrick <andre@linux-ide.org>
  *  Copyright (C) 2004, 2007  Bartlomiej Zolnierkiewicz
  *
  *  May be copied or modified under the terms of the GNU General Public License
+ *
+ *  DMA is supported for all IDE devices (disk drives, cdroms, tapes, floppies).
  */
 
 /*
@@ -11,49 +15,6 @@
  */
 
 /*
- * This module provides support for the bus-master IDE DMA functions
- * of various PCI chipsets, including the Intel PIIX (i82371FB for
- * the 430 FX chipset), the PIIX3 (i82371SB for the 430 HX/VX and 
- * 440 chipsets), and the PIIX4 (i82371AB for the 430 TX chipset)
- * ("PIIX" stands for "PCI ISA IDE Xcellerator").
- *
- * Pretty much the same code works for other IDE PCI bus-mastering chipsets.
- *
- * DMA is supported for all IDE devices (disk drives, cdroms, tapes, floppies).
- *
- * By default, DMA support is prepared for use, but is currently enabled only
- * for drives which already have DMA enabled (UltraDMA or mode 2 multi/single),
- * or which are recognized as "good" (see table below).  Drives with only mode0
- * or mode1 (multi/single) DMA should also work with this chipset/driver
- * (eg. MC2112A) but are not enabled by default.
- *
- * Use "hdparm -i" to view modes supported by a given drive.
- *
- * The hdparm-3.5 (or later) utility can be used for manually enabling/disabling
- * DMA support, but must be (re-)compiled against this kernel version or later.
- *
- * To enable DMA, use "hdparm -d1 /dev/hd?" on a per-drive basis after booting.
- * If problems arise, ide.c will disable DMA operation after a few retries.
- * This error recovery mechanism works and has been extremely well exercised.
- *
- * IDE drives, depending on their vintage, may support several different modes
- * of DMA operation.  The boot-time modes are indicated with a "*" in
- * the "hdparm -i" listing, and can be changed with *knowledgeable* use of
- * the "hdparm -X" feature.  There is seldom a need to do this, as drives
- * normally power-up with their "best" PIO/DMA modes enabled.
- *
- * Testing has been done with a rather extensive number of drives,
- * with Quantum & Western Digital models generally outperforming the pack,
- * and Fujitsu & Conner (and some Seagate which are really Conner) drives
- * showing more lackluster throughput.
- *
- * Keep an eye on /var/adm/messages for "DMA disabled" messages.
- *
- * Some people have reported trouble with Intel Zappa motherboards.
- * This can be fixed by upgrading the AMI BIOS to version 1.00.04.BS0,
- * available from ftp://ftp.intel.com/pub/bios/10004bs0.exe
- * (thanks to Glen Morrell <glen@spin.Stanford.edu> for researching this).
- *
  * Thanks to "Christopher J. Reimer" <reimer@doe.carleton.ca> for
  * fixing the problem with the BIOS on some Acer motherboards.
  *
@@ -65,11 +26,6 @@
  *
  * Most importantly, thanks to Robert Bringman <rob@mars.trion.com>
  * for supplying a Promise UDMA board & WD UDMA drive for this work!
- *
- * And, yes, Intel Zappa boards really *do* use both PIIX IDE ports.
- *
- * ATA-66/100 and recovery functions, I forgot the rest......
- *
  */
 
 #include <linux/module.h>
@@ -757,7 +713,7 @@ static int ide_tune_dma(ide_drive_t *drive)
         }
 
         if (hwif->host_flags & IDE_HFLAG_NO_SET_MODE)
-                return 0;
+                return 1;
 
         if (ide_set_dma_mode(drive, speed))
                 return 0;
diff --git a/drivers/ide/ide-probe.c b/drivers/ide/ide-probe.c
index 4a2cb2868226..194ecb0049eb 100644
--- a/drivers/ide/ide-probe.c
+++ b/drivers/ide/ide-probe.c
@@ -756,7 +756,8 @@ static int ide_probe_port(ide_hwif_t *hwif)
 
         BUG_ON(hwif->present);
 
-        if (hwif->noprobe)
+        if (hwif->noprobe ||
+            (hwif->drives[0].noprobe && hwif->drives[1].noprobe))
                 return -EACCES;
 
         /*
diff --git a/drivers/ide/ide-tape.c b/drivers/ide/ide-tape.c
index 0598ecfd5f37..43e0e0557776 100644
--- a/drivers/ide/ide-tape.c
+++ b/drivers/ide/ide-tape.c
@@ -3765,6 +3765,11 @@ static int ide_tape_probe(ide_drive_t *drive)
         g->fops = &idetape_block_ops;
         ide_register_region(g);
 
+        printk(KERN_WARNING "It is possible that this driver does not have any"
+                " users anymore and, as a result, it will be REMOVED soon."
+                " Please notify Bart <bzolnier@gmail.com> or Boris"
+                " <petkovbb@gmail.com> in case you still need it.\n");
+
         return 0;
 
 out_free_tape:
diff --git a/drivers/ide/ide.c b/drivers/ide/ide.c
index 477833f0daf5..9976f9d627d4 100644
--- a/drivers/ide/ide.c
+++ b/drivers/ide/ide.c
@@ -590,11 +590,6 @@ void ide_unregister(unsigned int index, int init_default, int restore)
                 hwif->extra_ports = 0;
         }
 
-        /*
-         * Note that we only release the standard ports,
-         * and do not even try to handle any extra ports
-         * allocated for weird IDE interface chipsets.
-         */
         ide_hwif_release_regions(hwif);
 
         /* copy original settings */
@@ -672,7 +667,6 @@ int ide_register_hw(hw_regs_t *hw, void (*quirkproc)(ide_drive_t *),
 
         do {
                 hwif = ide_deprecated_find_port(hw->io_ports[IDE_DATA_OFFSET]);
-                index = hwif->index;
                 if (hwif)
                         goto found;
                 for (index = 0; index < MAX_HWIFS; index++)
@@ -680,6 +674,7 @@ int ide_register_hw(hw_regs_t *hw, void (*quirkproc)(ide_drive_t *),
         } while (retry--);
         return -1;
 found:
+        index = hwif->index;
         if (hwif->present)
                 ide_unregister(index, 0, 1);
         else if (!hwif->hold)
@@ -1036,10 +1031,9 @@ int generic_ide_ioctl(ide_drive_t *drive, struct file *file, struct block_device
                         drive->nice1 = (arg >> IDE_NICE_1) & 1;
                         return 0;
                 case HDIO_DRIVE_RESET:
-                {
-                        unsigned long flags;
-                        if (!capable(CAP_SYS_ADMIN)) return -EACCES;
-                        
+                        if (!capable(CAP_SYS_ADMIN))
+                                return -EACCES;
+
                         /*
                          *      Abort the current command on the
                          *      group if there is one, taking
@@ -1058,17 +1052,15 @@ int generic_ide_ioctl(ide_drive_t *drive, struct file *file, struct block_device
                         ide_abort(drive, "drive reset");
 
                         BUG_ON(HWGROUP(drive)->handler);
-                                
+
                         /* Ensure nothing gets queued after we
                            drop the lock. Reset will clear the busy */
-                   
+
                         HWGROUP(drive)->busy = 1;
                         spin_unlock_irqrestore(&ide_lock, flags);
                         (void) ide_do_reset(drive);
 
                         return 0;
-                }
-
                 case HDIO_GET_BUSSTATE:
                         if (!capable(CAP_SYS_ADMIN))
                                 return -EACCES;
@@ -1188,7 +1180,7 @@ static int __initdata is_chipset_set[MAX_HWIFS];
  * ide_setup() gets called VERY EARLY during initialization,
  * to handle kernel "command line" strings beginning with "hdx=" or "ide".
  *
- * Remember to update Documentation/ide.txt if you change something here.
+ * Remember to update Documentation/ide/ide.txt if you change something here.
  */
 static int __init ide_setup(char *s)
 {
@@ -1449,7 +1441,7 @@ static int __init ide_setup(char *s)
 
                         case -1: /* "noprobe" */
                                 hwif->noprobe = 1;
-                                goto done;
+                                goto obsolete_option;
 
                         case 1: /* base */
                                 vals[1] = vals[0] + 0x206; /* default ctl */
diff --git a/drivers/ide/legacy/qd65xx.c b/drivers/ide/legacy/qd65xx.c
index bba29df5f21d..2f4f47ad602f 100644
--- a/drivers/ide/legacy/qd65xx.c
+++ b/drivers/ide/legacy/qd65xx.c
@@ -334,43 +334,6 @@ static void __init qd6580_port_init_devs(ide_hwif_t *hwif)
         hwif->drives[1].drive_data = t2;
 }
 
-/*
- * qd_unsetup:
- *
- * called to unsetup an ata channel : back to default values, unlinks tuning
- */
-/*
-static void __exit qd_unsetup(ide_hwif_t *hwif)
-{
-        u8 config = hwif->config_data;
-        int base = hwif->select_data;
-        void *set_pio_mode = (void *)hwif->set_pio_mode;
-
-        if (hwif->chipset != ide_qd65xx)
-                return;
-
-        printk(KERN_NOTICE "%s: back to defaults\n", hwif->name);
-
-        hwif->selectproc = NULL;
-        hwif->set_pio_mode = NULL;
-
-        if (set_pio_mode == (void *)qd6500_set_pio_mode) {
-                // will do it for both
-                outb(QD6500_DEF_DATA, QD_TIMREG(&hwif->drives[0]));
-        } else if (set_pio_mode == (void *)qd6580_set_pio_mode) {
-                if (QD_CONTROL(hwif) & QD_CONTR_SEC_DISABLED) {
-                        outb(QD6580_DEF_DATA, QD_TIMREG(&hwif->drives[0]));
-                        outb(QD6580_DEF_DATA2, QD_TIMREG(&hwif->drives[1]));
-                } else {
-                        outb(hwif->channel ? QD6580_DEF_DATA2 : QD6580_DEF_DATA, QD_TIMREG(&hwif->drives[0]));
-                }
-        } else {
-                printk(KERN_WARNING "Unknown qd65xx tuning fonction !\n");
-                printk(KERN_WARNING "keeping settings !\n");
-        }
-}
-*/
-
 static const struct ide_port_info qd65xx_port_info __initdata = {
         .chipset                = ide_qd65xx,
         .host_flags             = IDE_HFLAG_IO_32BIT |
@@ -444,6 +407,8 @@ static int __init qd_probe(int base)
                 printk(KERN_DEBUG "qd6580: config=%#x, control=%#x, ID3=%u\n",
                         config, control, QD_ID3);
 
+                outb(QD_DEF_CONTR, QD_CONTROL_PORT);
+
                 if (control & QD_CONTR_SEC_DISABLED) {
                         /* secondary disabled */
 
@@ -460,8 +425,6 @@ static int __init qd_probe(int base)
 
                         ide_device_add(idx, &qd65xx_port_info);
 
-                        outb(QD_DEF_CONTR, QD_CONTROL_PORT);
-
                         return 1;
                 } else {
                         ide_hwif_t *mate;
@@ -487,8 +450,6 @@ static int __init qd_probe(int base)
 
                         ide_device_add(idx, &qd65xx_port_info);
 
-                        outb(QD_DEF_CONTR, QD_CONTROL_PORT);
-
                         return 0; /* no other qd65xx possible */
                 }
         }
diff --git a/drivers/ide/pci/cmd640.c b/drivers/ide/pci/cmd640.c
index bd24dad3cfc6..ec667982809c 100644
--- a/drivers/ide/pci/cmd640.c
+++ b/drivers/ide/pci/cmd640.c
@@ -787,7 +787,8 @@ static int __init cmd640x_init(void)
         /*
          * Try to enable the secondary interface, if not already enabled
          */
-        if (cmd_hwif1->noprobe) {
+        if (cmd_hwif1->noprobe ||
+            (cmd_hwif1->drives[0].noprobe && cmd_hwif1->drives[1].noprobe)) {
                 port2 = "not probed";
         } else {
                 b = get_cmd640_reg(CNTRL);
diff --git a/drivers/ide/pci/hpt366.c b/drivers/ide/pci/hpt366.c
index d0f7bb8b8adf..6357bb6269ab 100644
--- a/drivers/ide/pci/hpt366.c
+++ b/drivers/ide/pci/hpt366.c
@@ -1570,10 +1570,12 @@ static int __devinit hpt366_init_one(struct pci_dev *dev, const struct pci_devic
                 if (rev < 3)
                         info = &hpt36x;
                 else {
-                        static const struct hpt_info *hpt37x_info[] =
-                                { &hpt370, &hpt370a, &hpt372, &hpt372n };
-
-                        info = hpt37x_info[min_t(u8, rev, 6) - 3];
+                        switch (min_t(u8, rev, 6)) {
+                        case 3: info = &hpt370;  break;
+                        case 4: info = &hpt370a; break;
+                        case 5: info = &hpt372;  break;
+                        case 6: info = &hpt372n; break;
+                        }
                         idx++;
                 }
                 break;
@@ -1626,7 +1628,7 @@ static int __devinit hpt366_init_one(struct pci_dev *dev, const struct pci_devic
         return ide_setup_pci_device(dev, &d);
 }
 
-static const struct pci_device_id hpt366_pci_tbl[] = {
+static const struct pci_device_id hpt366_pci_tbl[] __devinitconst = {
         { PCI_VDEVICE(TTI, PCI_DEVICE_ID_TTI_HPT366),  0 },
         { PCI_VDEVICE(TTI, PCI_DEVICE_ID_TTI_HPT372),  1 },
         { PCI_VDEVICE(TTI, PCI_DEVICE_ID_TTI_HPT302),  2 },