9 files changed, 37 insertions, 119 deletions

diff --git a/drivers/ide/Kconfig b/drivers/ide/Kconfig
index 9a5d0aaac9d0..98ccfeb3f5aa 100644
--- a/drivers/ide/Kconfig
+++ b/drivers/ide/Kconfig
@@ -7,50 +7,25 @@ config HAVE_IDE
         bool
 
 menuconfig IDE
-        tristate "ATA/ATAPI/MFM/RLL support"
+        tristate "ATA/ATAPI/MFM/RLL support (DEPRECATED)"
         depends on HAVE_IDE
         depends on BLOCK
         ---help---
-          If you say Y here, your kernel will be able to manage low cost mass
-          storage units such as ATA/(E)IDE and ATAPI units. The most common
-          cases are IDE hard drives and ATAPI CD-ROM drives.
-
-          If your system is pure SCSI and doesn't use these interfaces, you
-          can say N here.
-
-          Integrated Disk Electronics (IDE aka ATA-1) is a connecting standard
-          for mass storage units such as hard disks. It was designed by
-          Western Digital and Compaq Computer in 1984. It was then named
-          ST506. Quite a number of disks use the IDE interface.
-
-          AT Attachment (ATA) is the superset of the IDE specifications.
-          ST506 was also called ATA-1.
-
-          Fast-IDE is ATA-2 (also named Fast ATA), Enhanced IDE (EIDE) is
-          ATA-3. It provides support for larger disks (up to 8.4GB by means of
-          the LBA standard), more disks (4 instead of 2) and for other mass
-          storage units such as tapes and cdrom. UDMA/33 (aka UltraDMA/33) is
-          ATA-4 and provides faster (and more CPU friendly) transfer modes
-          than previous PIO (Programmed processor Input/Output) from previous
-          ATA/IDE standards by means of fast DMA controllers.
-
-          ATA Packet Interface (ATAPI) is a protocol used by EIDE tape and
-          CD-ROM drives, similar in many respects to the SCSI protocol.
-
-          SMART IDE (Self Monitoring, Analysis and Reporting Technology) was
-          designed in order to prevent data corruption and disk crash by
-          detecting pre hardware failure conditions (heat, access time, and
-          the like...). Disks built since June 1995 may follow this standard.
-          The kernel itself doesn't manage this; however there are quite a
-          number of user programs such as smart that can query the status of
-          SMART parameters from disk drives.
+          If you say Y here, your kernel will be able to manage ATA/(E)IDE and
+          ATAPI units. The most common cases are IDE hard drives and ATAPI
+          CD-ROM drives.
+
+          This subsystem is currently in maintenance mode with only bug fix
+          changes applied. Users of ATA hardware are encouraged to migrate to
+          the newer ATA subsystem ("Serial ATA (prod) and Parallel ATA
+          (experimental) drivers") which is more actively maintained.
 
           To compile this driver as a module, choose M here: the
           module will be called ide-core.
 
           For further information, please read <file:Documentation/ide/ide.txt>.
 
-          If unsure, say Y.
+          If unsure, say N.
 
 if IDE
 
diff --git a/drivers/ide/au1xxx-ide.c b/drivers/ide/au1xxx-ide.c
index 58121bd6c115..87cef0c440ad 100644
--- a/drivers/ide/au1xxx-ide.c
+++ b/drivers/ide/au1xxx-ide.c
@@ -532,14 +532,13 @@ static int au_ide_probe(struct platform_device *dev)
                 goto out;
         }
 
-        if (!request_mem_region(res->start, res->end - res->start + 1,
-                                dev->name)) {
+        if (!request_mem_region(res->start, resource_size(res), dev->name)) {
                 pr_debug("%s: request_mem_region failed\n", DRV_NAME);
                 ret =  -EBUSY;
                 goto out;
         }
 
-        ahwif->regbase = (u32)ioremap(res->start, res->end - res->start + 1);
+        ahwif->regbase = (u32)ioremap(res->start, resource_size(res));
         if (ahwif->regbase == 0) {
                 ret = -ENOMEM;
                 goto out;
@@ -575,7 +574,7 @@ static int au_ide_remove(struct platform_device *dev)
         iounmap((void *)ahwif->regbase);
 
         res = platform_get_resource(dev, IORESOURCE_MEM, 0);
-        release_mem_region(res->start, res->end - res->start + 1);
+        release_mem_region(res->start, resource_size(res));
 
         return 0;
 }
diff --git a/drivers/ide/cs5535.c b/drivers/ide/cs5535.c
index 983d957a0189..b883838adc24 100644
--- a/drivers/ide/cs5535.c
+++ b/drivers/ide/cs5535.c
@@ -187,6 +187,7 @@ static int __devinit cs5535_init_one(struct pci_dev *dev,
 
 static const struct pci_device_id cs5535_pci_tbl[] = {
         { PCI_VDEVICE(NS, PCI_DEVICE_ID_NS_CS5535_IDE), 0 },
+        { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_CS5535_IDE), },
         { 0, },
 };
 
diff --git a/drivers/ide/hpt366.c b/drivers/ide/hpt366.c
index 7ce68ef6b904..4d90ac2dbb1b 100644
--- a/drivers/ide/hpt366.c
+++ b/drivers/ide/hpt366.c
@@ -297,68 +297,6 @@ static u32 twenty_five_base_hpt36x[] = {
         /* XFER_PIO_0 */        0xc0d08585
 };
 
-#if 0
-/* These are the timing tables from the HighPoint open source drivers... */
-static u32 thirty_three_base_hpt37x[] = {
-        /* XFER_UDMA_6 */       0x12446231,     /* 0x12646231 ?? */
-        /* XFER_UDMA_5 */       0x12446231,
-        /* XFER_UDMA_4 */       0x12446231,
-        /* XFER_UDMA_3 */       0x126c6231,
-        /* XFER_UDMA_2 */       0x12486231,
-        /* XFER_UDMA_1 */       0x124c6233,
-        /* XFER_UDMA_0 */       0x12506297,
-
-        /* XFER_MW_DMA_2 */     0x22406c31,
-        /* XFER_MW_DMA_1 */     0x22406c33,
-        /* XFER_MW_DMA_0 */     0x22406c97,
-
-        /* XFER_PIO_4 */        0x06414e31,
-        /* XFER_PIO_3 */        0x06414e42,
-        /* XFER_PIO_2 */        0x06414e53,
-        /* XFER_PIO_1 */        0x06814e93,
-        /* XFER_PIO_0 */        0x06814ea7
-};
-
-static u32 fifty_base_hpt37x[] = {
-        /* XFER_UDMA_6 */       0x12848242,
-        /* XFER_UDMA_5 */       0x12848242,
-        /* XFER_UDMA_4 */       0x12ac8242,
-        /* XFER_UDMA_3 */       0x128c8242,
-        /* XFER_UDMA_2 */       0x120c8242,
-        /* XFER_UDMA_1 */       0x12148254,
-        /* XFER_UDMA_0 */       0x121882ea,
-
-        /* XFER_MW_DMA_2 */     0x22808242,
-        /* XFER_MW_DMA_1 */     0x22808254,
-        /* XFER_MW_DMA_0 */     0x228082ea,
-
-        /* XFER_PIO_4 */        0x0a81f442,
-        /* XFER_PIO_3 */        0x0a81f443,
-        /* XFER_PIO_2 */        0x0a81f454,
-        /* XFER_PIO_1 */        0x0ac1f465,
-        /* XFER_PIO_0 */        0x0ac1f48a
-};
-
-static u32 sixty_six_base_hpt37x[] = {
-        /* XFER_UDMA_6 */       0x1c869c62,
-        /* XFER_UDMA_5 */       0x1cae9c62,     /* 0x1c8a9c62 */
-        /* XFER_UDMA_4 */       0x1c8a9c62,
-        /* XFER_UDMA_3 */       0x1c8e9c62,
-        /* XFER_UDMA_2 */       0x1c929c62,
-        /* XFER_UDMA_1 */       0x1c9a9c62,
-        /* XFER_UDMA_0 */       0x1c829c62,
-
-        /* XFER_MW_DMA_2 */     0x2c829c62,
-        /* XFER_MW_DMA_1 */     0x2c829c66,
-        /* XFER_MW_DMA_0 */     0x2c829d2e,
-
-        /* XFER_PIO_4 */        0x0c829c62,
-        /* XFER_PIO_3 */        0x0c829c84,
-        /* XFER_PIO_2 */        0x0c829ca6,
-        /* XFER_PIO_1 */        0x0d029d26,
-        /* XFER_PIO_0 */        0x0d029d5e
-};
-#else
 /*
  * The following are the new timing tables with PIO mode data/taskfile transfer
  * overclocking fixed...
@@ -424,16 +362,13 @@ static u32 sixty_six_base_hpt37x[] = {
         /* XFER_PIO_1 */        0x0d02ff26,
         /* XFER_PIO_0 */        0x0d42ff7f
 };
-#endif
 
-#define HPT366_DEBUG_DRIVE_INFO         0
 #define HPT371_ALLOW_ATA133_6           1
 #define HPT302_ALLOW_ATA133_6           1
 #define HPT372_ALLOW_ATA133_6           1
 #define HPT370_ALLOW_ATA100_5           0
 #define HPT366_ALLOW_ATA66_4            1
 #define HPT366_ALLOW_ATA66_3            1
-#define HPT366_MAX_DEVS                 8
 
 /* Supported ATA clock frequencies */
 enum ata_clock {
diff --git a/drivers/ide/ide-tape.c b/drivers/ide/ide-tape.c
index 58fc920d5c32..6a0e62542167 100644
--- a/drivers/ide/ide-tape.c
+++ b/drivers/ide/ide-tape.c
@@ -221,6 +221,8 @@ typedef struct ide_tape_obj {
 
 static DEFINE_MUTEX(idetape_ref_mutex);
 
+static DEFINE_MUTEX(idetape_chrdev_mutex);
+
 static struct class *idetape_sysfs_class;
 
 static void ide_tape_release(struct device *);
@@ -1457,10 +1459,11 @@ static int idetape_chrdev_open(struct inode *inode, struct file *filp)
         if (i >= MAX_HWIFS * MAX_DRIVES)
                 return -ENXIO;
 
-        lock_kernel();
+        mutex_lock(&idetape_chrdev_mutex);
+
         tape = ide_tape_get(NULL, true, i);
         if (!tape) {
-                unlock_kernel();
+                mutex_unlock(&idetape_chrdev_mutex);
                 return -ENXIO;
         }
 
@@ -1519,12 +1522,15 @@ static int idetape_chrdev_open(struct inode *inode, struct file *filp)
                                 tape->door_locked = DOOR_LOCKED;
                 }
         }
-        unlock_kernel();
+        mutex_unlock(&idetape_chrdev_mutex);
+
         return 0;
 
 out_put_tape:
         ide_tape_put(tape);
-        unlock_kernel();
+
+        mutex_unlock(&idetape_chrdev_mutex);
+
         return retval;
 }
 
@@ -1551,7 +1557,8 @@ static int idetape_chrdev_release(struct inode *inode, struct file *filp)
         ide_drive_t *drive = tape->drive;
         unsigned int minor = iminor(inode);
 
-        lock_kernel();
+        mutex_lock(&idetape_chrdev_mutex);
+
         tape = drive->driver_data;
 
         ide_debug_log(IDE_DBG_FUNC, "enter");
@@ -1575,7 +1582,9 @@ static int idetape_chrdev_release(struct inode *inode, struct file *filp)
         }
         clear_bit(ilog2(IDE_AFLAG_BUSY), &drive->atapi_flags);
         ide_tape_put(tape);
-        unlock_kernel();
+
+        mutex_unlock(&idetape_chrdev_mutex);
+
         return 0;
 }
 
diff --git a/drivers/ide/ide_platform.c b/drivers/ide/ide_platform.c
index b579fbe88370..42965b3e30b9 100644
--- a/drivers/ide/ide_platform.c
+++ b/drivers/ide/ide_platform.c
@@ -81,14 +81,14 @@ static int __devinit plat_ide_probe(struct platform_device *pdev)
 
         if (mmio) {
                 base = devm_ioremap(&pdev->dev,
-                        res_base->start, res_base->end - res_base->start + 1);
+                        res_base->start, resource_size(res_base));
                 alt_base = devm_ioremap(&pdev->dev,
-                        res_alt->start, res_alt->end - res_alt->start + 1);
+                        res_alt->start, resource_size(res_alt));
         } else {
                 base = devm_ioport_map(&pdev->dev,
-                        res_base->start, res_base->end - res_base->start + 1);
+                        res_base->start, resource_size(res_base));
                 alt_base = devm_ioport_map(&pdev->dev,
-                        res_alt->start, res_alt->end - res_alt->start + 1);
+                        res_alt->start, resource_size(res_alt));
         }
 
         memset(&hw, 0, sizeof(hw));
diff --git a/drivers/ide/slc90e66.c b/drivers/ide/slc90e66.c
index 9aec78d3bcff..1ccfb40e7215 100644
--- a/drivers/ide/slc90e66.c
+++ b/drivers/ide/slc90e66.c
@@ -91,8 +91,7 @@ static void slc90e66_set_dma_mode(ide_drive_t *drive, const u8 speed)
 
                 if (!(reg48 & u_flag))
                         pci_write_config_word(dev, 0x48, reg48|u_flag);
-                /* FIXME: (reg4a & a_speed) ? */
-                if ((reg4a & u_speed) != u_speed) {
+                if ((reg4a & a_speed) != u_speed) {
                         pci_write_config_word(dev, 0x4a, reg4a & ~a_speed);
                         pci_read_config_word(dev, 0x4a, &reg4a);
                         pci_write_config_word(dev, 0x4a, reg4a|u_speed);
diff --git a/drivers/ide/tx4938ide.c b/drivers/ide/tx4938ide.c
index ea89fddeed91..fd59c0d235b5 100644
--- a/drivers/ide/tx4938ide.c
+++ b/drivers/ide/tx4938ide.c
@@ -146,7 +146,7 @@ static int __init tx4938ide_probe(struct platform_device *pdev)
                 return -ENODEV;
 
         if (!devm_request_mem_region(&pdev->dev, res->start,
-                                     res->end - res->start + 1, "tx4938ide"))
+                                     resource_size(res), "tx4938ide"))
                 return -EBUSY;
         mapbase = (unsigned long)devm_ioremap(&pdev->dev, res->start,
                                               8 << pdata->ioport_shift);
diff --git a/include/linux/ide.h b/include/linux/ide.h
index e4135d6e0556..0ec612959042 100644
--- a/include/linux/ide.h
+++ b/include/linux/ide.h
@@ -125,8 +125,8 @@ struct ide_io_ports {
  * Timeouts for various operations:
  */
 enum {
-        /* spec allows up to 20ms */
-        WAIT_DRQ        = HZ / 10,      /* 100ms */
+        /* spec allows up to 20ms, but CF cards and SSD drives need more */
+        WAIT_DRQ        = 1 * HZ,       /* 1s */
         /* some laptops are very slow */
         WAIT_READY      = 5 * HZ,       /* 5s */
         /* should be less than 3ms (?), if all ATAPI CD is closed at boot */