17 files changed, 107 insertions, 277 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/alim15x3.c b/drivers/ide/alim15x3.c
index e59b6dee9ae2..0abc43f3101e 100644
--- a/drivers/ide/alim15x3.c
+++ b/drivers/ide/alim15x3.c
@@ -40,16 +40,6 @@
 #define DRV_NAME "alim15x3"
 
 /*
- * Allow UDMA on M1543C-E chipset for WDC disks that ignore CRC checking
- * (this is DANGEROUS and could result in data corruption).
- */
-static int wdc_udma;
-
-module_param(wdc_udma, bool, 0);
-MODULE_PARM_DESC(wdc_udma,
-                 "allow UDMA on M1543C-E chipset for WDC disks (DANGEROUS)");
-
-/*
  *      ALi devices are not plug in. Otherwise these static values would
  *      need to go. They ought to go away anyway
  */
@@ -132,7 +122,7 @@ static u8 ali_udma_filter(ide_drive_t *drive)
         if (m5229_revision > 0x20 && m5229_revision < 0xC2) {
                 if (drive->media != ide_disk)
                         return 0;
-                if (wdc_udma == 0 && chip_is_1543c_e &&
+                if (chip_is_1543c_e &&
                     strstr((char *)&drive->id[ATA_ID_PROD], "WDC "))
                         return 0;
         }
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/cmd64x.c b/drivers/ide/cmd64x.c
index ca0c46f6580a..f2500c8826bb 100644
--- a/drivers/ide/cmd64x.c
+++ b/drivers/ide/cmd64x.c
@@ -20,14 +20,6 @@
 
 #define DRV_NAME "cmd64x"
 
-#define CMD_DEBUG 0
-
-#if CMD_DEBUG
-#define cmdprintk(x...) printk(x)
-#else
-#define cmdprintk(x...)
-#endif
-
 /*
  * CMD64x specific registers definition.
  */
@@ -76,9 +68,6 @@ static void program_cycle_times (ide_drive_t *drive, int cycle_time, int active_
                 {15, 15, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 0};
         static const u8 drwtim_regs[4] = {DRWTIM0, DRWTIM1, DRWTIM2, DRWTIM3};
 
-        cmdprintk("program_cycle_times parameters: total=%d, active=%d\n",
-                  cycle_time, active_time);
-
         cycle_count     = quantize_timing( cycle_time, clock_time);
         active_count    = quantize_timing(active_time, clock_time);
         recovery_count  = cycle_count - active_count;
@@ -94,9 +83,6 @@ static void program_cycle_times (ide_drive_t *drive, int cycle_time, int active_
         if (active_count > 16)          /* shouldn't actually happen... */
                 active_count = 16;
 
-        cmdprintk("Final counts: total=%d, active=%d, recovery=%d\n",
-                  cycle_count, active_count, recovery_count);
-
         /*
          * Convert values to internal chipset representation
          */
@@ -106,7 +92,6 @@ static void program_cycle_times (ide_drive_t *drive, int cycle_time, int active_
         /* Program the active/recovery counts into the DRWTIM register */
         drwtim = (active_count << 4) | recovery_count;
         (void) pci_write_config_byte(dev, drwtim_regs[drive->dn], drwtim);
-        cmdprintk("Write 0x%02x to reg 0x%x\n", drwtim, drwtim_regs[drive->dn]);
 }
 
 /*
@@ -150,7 +135,6 @@ static void cmd64x_tune_pio(ide_drive_t *drive, const u8 pio)
 
         if (setup_count > 5)            /* shouldn't actually happen... */
                 setup_count = 5;
-        cmdprintk("Final address setup count: %d\n", setup_count);
 
         /*
          * Program the address setup clocks into the ARTTIM registers.
@@ -162,7 +146,6 @@ static void cmd64x_tune_pio(ide_drive_t *drive, const u8 pio)
         arttim &= ~0xc0;
         arttim |= setup_values[setup_count];
         (void) pci_write_config_byte(dev, arttim_regs[drive->dn], arttim);
-        cmdprintk("Write 0x%02x to reg 0x%x\n", arttim, arttim_regs[drive->dn]);
 }
 
 /*
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/cy82c693.c b/drivers/ide/cy82c693.c
index 74fc5401f407..d6e2cbbc53a0 100644
--- a/drivers/ide/cy82c693.c
+++ b/drivers/ide/cy82c693.c
@@ -51,11 +51,6 @@
 #define DRV_NAME "cy82c693"
 
 /*
- *      The following are used to debug the driver.
- */
-#define CY82C693_DEBUG_INFO     0
-
-/*
  *      NOTE: the value for busmaster timeout is tricky and I got it by
  *      trial and error!  By using a to low value will cause DMA timeouts
  *      and drop IDE performance, and by using a to high value will cause
@@ -176,11 +171,6 @@ static void cy82c693_set_dma_mode(ide_drive_t *drive, const u8 mode)
         outb(index, CY82_INDEX_PORT);
         outb(data, CY82_DATA_PORT);
 
-#if CY82C693_DEBUG_INFO
-        printk(KERN_INFO "%s (ch=%d, dev=%d): set DMA mode to %d (single=%d)\n",
-                drive->name, hwif->channel, drive->dn & 1, mode & 3, single);
-#endif /* CY82C693_DEBUG_INFO */
-
         /*
          * note: below we set the value for Bus Master IDE TimeOut Register
          * I'm not absolutly sure what this does, but it solved my problem
@@ -194,11 +184,6 @@ static void cy82c693_set_dma_mode(ide_drive_t *drive, const u8 mode)
         data = BUSMASTER_TIMEOUT;
         outb(CY82_INDEX_TIMEOUT, CY82_INDEX_PORT);
         outb(data, CY82_DATA_PORT);
-
-#if CY82C693_DEBUG_INFO
-        printk(KERN_INFO "%s: Set IDE Bus Master TimeOut Register to 0x%X\n",
-                drive->name, data);
-#endif /* CY82C693_DEBUG_INFO */
 }
 
 static void cy82c693_set_pio_mode(ide_drive_t *drive, const u8 pio)
@@ -239,8 +224,6 @@ static void cy82c693_set_pio_mode(ide_drive_t *drive, const u8 pio)
                 pci_write_config_byte(dev, CY82_IDE_MASTER_IOR, pclk.time_16r);
                 pci_write_config_byte(dev, CY82_IDE_MASTER_IOW, pclk.time_16w);
                 pci_write_config_byte(dev, CY82_IDE_MASTER_8BIT, pclk.time_8);
-
-                addrCtrl &= 0xF;
         } else {
                 /*
                  * set slave drive
@@ -257,17 +240,7 @@ static void cy82c693_set_pio_mode(ide_drive_t *drive, const u8 pio)
                 pci_write_config_byte(dev, CY82_IDE_SLAVE_IOR, pclk.time_16r);
                 pci_write_config_byte(dev, CY82_IDE_SLAVE_IOW, pclk.time_16w);
                 pci_write_config_byte(dev, CY82_IDE_SLAVE_8BIT, pclk.time_8);
-
-                addrCtrl >>= 4;
-                addrCtrl &= 0xF;
         }
-
-#if CY82C693_DEBUG_INFO
-        printk(KERN_INFO "%s (ch=%d, dev=%d): set PIO timing to "
-                "(addr=0x%X, ior=0x%X, iow=0x%X, 8bit=0x%X)\n",
-                drive->name, hwif->channel, drive->dn & 1,
-                addrCtrl, pclk.time_16r, pclk.time_16w, pclk.time_8);
-#endif /* CY82C693_DEBUG_INFO */
 }
 
 static void __devinit init_iops_cy82c693(ide_hwif_t *hwif)
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-cs.c b/drivers/ide/ide-cs.c
index 063b933d864a..dd6396384c25 100644
--- a/drivers/ide/ide-cs.c
+++ b/drivers/ide/ide-cs.c
@@ -60,15 +60,6 @@ MODULE_AUTHOR("David Hinds <dahinds@users.sourceforge.net>");
 MODULE_DESCRIPTION("PCMCIA ATA/IDE card driver");
 MODULE_LICENSE("Dual MPL/GPL");
 
-#define INT_MODULE_PARM(n, v) static int n = v; module_param(n, int, 0)
-
-#ifdef CONFIG_PCMCIA_DEBUG
-INT_MODULE_PARM(pc_debug, 0);
-#define DEBUG(n, args...) if (pc_debug>(n)) printk(KERN_DEBUG args)
-#else
-#define DEBUG(n, args...)
-#endif
-
 /*====================================================================*/
 
 typedef struct ide_info_t {
@@ -98,7 +89,7 @@ static int ide_probe(struct pcmcia_device *link)
 {
     ide_info_t *info;
 
-    DEBUG(0, "ide_attach()\n");
+    dev_dbg(&link->dev, "ide_attach()\n");
 
     /* Create new ide device */
     info = kzalloc(sizeof(*info), GFP_KERNEL);
@@ -112,7 +103,6 @@ static int ide_probe(struct pcmcia_device *link)
     link->io.Attributes2 = IO_DATA_PATH_WIDTH_8;
     link->io.IOAddrLines = 3;
     link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING;
-    link->irq.IRQInfo1 = IRQ_LEVEL_ID;
     link->conf.Attributes = CONF_ENABLE_IRQ;
     link->conf.IntType = INT_MEMORY_AND_IO;
 
@@ -134,7 +124,7 @@ static void ide_detach(struct pcmcia_device *link)
     ide_hwif_t *hwif = info->host->ports[0];
     unsigned long data_addr, ctl_addr;
 
-    DEBUG(0, "ide_detach(0x%p)\n", link);
+    dev_dbg(&link->dev, "ide_detach(0x%p)\n", link);
 
     data_addr = hwif->io_ports.data_addr;
     ctl_addr  = hwif->io_ports.ctl_addr;
@@ -217,9 +207,6 @@ out_release:
 
 ======================================================================*/
 
-#define CS_CHECK(fn, ret) \
-do { last_fn = (fn); if ((last_ret = (ret)) != 0) goto cs_failed; } while (0)
-
 struct pcmcia_config_check {
         unsigned long ctl_base;
         int skip_vcc;
@@ -282,11 +269,11 @@ static int ide_config(struct pcmcia_device *link)
 {
     ide_info_t *info = link->priv;
     struct pcmcia_config_check *stk = NULL;
-    int last_ret = 0, last_fn = 0, is_kme = 0;
+    int ret = 0, is_kme = 0;
     unsigned long io_base, ctl_base;
     struct ide_host *host;
 
-    DEBUG(0, "ide_config(0x%p)\n", link);
+    dev_dbg(&link->dev, "ide_config(0x%p)\n", link);
 
     is_kme = ((link->manf_id == MANFID_KME) &&
               ((link->card_id == PRODID_KME_KXLC005_A) ||
@@ -306,8 +293,12 @@ static int ide_config(struct pcmcia_device *link)
     io_base = link->io.BasePort1;
     ctl_base = stk->ctl_base;
 
-    CS_CHECK(RequestIRQ, pcmcia_request_irq(link, &link->irq));
-    CS_CHECK(RequestConfiguration, pcmcia_request_configuration(link, &link->conf));
+    ret = pcmcia_request_irq(link, &link->irq);
+    if (ret)
+            goto failed;
+    ret = pcmcia_request_configuration(link, &link->conf);
+    if (ret)
+            goto failed;
 
     /* disable drive interrupts during IDE probe */
     outb(0x02, ctl_base);
@@ -342,8 +333,6 @@ err_mem:
     printk(KERN_NOTICE "ide-cs: ide_config failed memory allocation\n");
     goto failed;
 
-cs_failed:
-    cs_error(link, last_fn, last_ret);
 failed:
     kfree(stk);
     ide_release(link);
@@ -363,7 +352,7 @@ static void ide_release(struct pcmcia_device *link)
     ide_info_t *info = link->priv;
     struct ide_host *host = info->host;
 
-    DEBUG(0, "ide_release(0x%p)\n", link);
+    dev_dbg(&link->dev, "ide_release(0x%p)\n", link);
 
     if (info->ndev)
         /* FIXME: if this fails we need to queue the cleanup somehow
diff --git a/drivers/ide/ide-pci-generic.c b/drivers/ide/ide-pci-generic.c
index 39d4e01f5c9c..a743e68a8903 100644
--- a/drivers/ide/ide-pci-generic.c
+++ b/drivers/ide/ide-pci-generic.c
@@ -162,9 +162,10 @@ static const struct pci_device_id generic_pci_tbl[] = {
 #ifdef CONFIG_BLK_DEV_IDE_SATA
         { PCI_VDEVICE(VIA,      PCI_DEVICE_ID_VIA_8237_SATA),            5 },
 #endif
-        { PCI_VDEVICE(TOSHIBA,  PCI_DEVICE_ID_TOSHIBA_PICCOLO),          4 },
         { PCI_VDEVICE(TOSHIBA,  PCI_DEVICE_ID_TOSHIBA_PICCOLO_1),        4 },
         { PCI_VDEVICE(TOSHIBA,  PCI_DEVICE_ID_TOSHIBA_PICCOLO_2),        4 },
+        { PCI_VDEVICE(TOSHIBA,  PCI_DEVICE_ID_TOSHIBA_PICCOLO_3),        4 },
+        { PCI_VDEVICE(TOSHIBA,  PCI_DEVICE_ID_TOSHIBA_PICCOLO_5),        4 },
         { PCI_VDEVICE(NETCELL,  PCI_DEVICE_ID_REVOLUTION),               6 },
         /*
          * Must come last.  If you add entries adjust
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/pdc202xx_old.c b/drivers/ide/pdc202xx_old.c
index cb812f3700e8..35161dd840a0 100644
--- a/drivers/ide/pdc202xx_old.c
+++ b/drivers/ide/pdc202xx_old.c
@@ -21,8 +21,6 @@
 
 #define DRV_NAME "pdc202xx_old"
 
-#define PDC202XX_DEBUG_DRIVE_INFO       0
-
 static void pdc_old_disable_66MHz_clock(ide_hwif_t *);
 
 static void pdc202xx_set_mode(ide_drive_t *drive, const u8 speed)
@@ -34,11 +32,6 @@ static void pdc202xx_set_mode(ide_drive_t *drive, const u8 speed)
         u8                      AP = 0, BP = 0, CP = 0;
         u8                      TA = 0, TB = 0, TC = 0;
 
-#if PDC202XX_DEBUG_DRIVE_INFO
-        u32                     drive_conf = 0;
-        pci_read_config_dword(dev, drive_pci, &drive_conf);
-#endif
-
         /*
          * TODO: do this once per channel
          */
@@ -89,14 +82,6 @@ static void pdc202xx_set_mode(ide_drive_t *drive, const u8 speed)
                 pci_write_config_byte(dev, drive_pci + 1, BP | TB);
                 pci_write_config_byte(dev, drive_pci + 2, CP | TC);
         }
-
-#if PDC202XX_DEBUG_DRIVE_INFO
-        printk(KERN_DEBUG "%s: %s drive%d 0x%08x ",
-                drive->name, ide_xfer_verbose(speed),
-                drive->dn, drive_conf);
-        pci_read_config_dword(dev, drive_pci, &drive_conf);
-        printk("0x%08x\n", drive_conf);
-#endif
 }
 
 static void pdc202xx_set_pio_mode(ide_drive_t *drive, const u8 pio)
diff --git a/drivers/ide/pmac.c b/drivers/ide/pmac.c
index 97642a7a79c4..7a4e788cab2f 100644
--- a/drivers/ide/pmac.c
+++ b/drivers/ide/pmac.c
@@ -43,10 +43,7 @@
 #include <asm/pmac_feature.h>
 #include <asm/sections.h>
 #include <asm/irq.h>
-
-#ifndef CONFIG_PPC64
 #include <asm/mediabay.h>
-#endif
 
 #define DRV_NAME "ide-pmac"
 
@@ -59,13 +56,14 @@ typedef struct pmac_ide_hwif {
         int                             irq;
         int                             kind;
         int                             aapl_bus_id;
-        unsigned                        mediabay : 1;
         unsigned                        broken_dma : 1;
         unsigned                        broken_dma_warn : 1;
         struct device_node*             node;
         struct macio_dev                *mdev;
         u32                             timings[4];
         volatile u32 __iomem *          *kauai_fcr;
+        ide_hwif_t                      *hwif;
+
         /* Those fields are duplicating what is in hwif. We currently
          * can't use the hwif ones because of some assumptions that are
          * beeing done by the generic code about the kind of dma controller
@@ -854,6 +852,11 @@ sanitize_timings(pmac_ide_hwif_t *pmif)
         pmif->timings[2] = pmif->timings[3] = value2;
 }
 
+static int on_media_bay(pmac_ide_hwif_t *pmif)
+{
+        return pmif->mdev && pmif->mdev->media_bay != NULL;
+}
+
 /* Suspend call back, should be called after the child devices
  * have actually been suspended
  */
@@ -866,7 +869,7 @@ static int pmac_ide_do_suspend(pmac_ide_hwif_t *pmif)
         disable_irq(pmif->irq);
 
         /* The media bay will handle itself just fine */
-        if (pmif->mediabay)
+        if (on_media_bay(pmif))
                 return 0;
         
         /* Kauai has bus control FCRs directly here */
@@ -889,7 +892,7 @@ static int pmac_ide_do_suspend(pmac_ide_hwif_t *pmif)
 static int pmac_ide_do_resume(pmac_ide_hwif_t *pmif)
 {
         /* Hard reset & re-enable controller (do we really need to reset ? -BenH) */
-        if (!pmif->mediabay) {
+        if (!on_media_bay(pmif)) {
                 ppc_md.feature_call(PMAC_FTR_IDE_RESET, pmif->node, pmif->aapl_bus_id, 1);
                 ppc_md.feature_call(PMAC_FTR_IDE_ENABLE, pmif->node, pmif->aapl_bus_id, 1);
                 msleep(10);
@@ -950,13 +953,11 @@ static void pmac_ide_init_dev(ide_drive_t *drive)
         pmac_ide_hwif_t *pmif =
                 (pmac_ide_hwif_t *)dev_get_drvdata(hwif->gendev.parent);
 
-        if (pmif->mediabay) {
-#ifdef CONFIG_PMAC_MEDIABAY
-                if (check_media_bay_by_base(pmif->regbase, MB_CD) == 0) {
+        if (on_media_bay(pmif)) {
+                if (check_media_bay(pmif->mdev->media_bay) == MB_CD) {
                         drive->dev_flags &= ~IDE_DFLAG_NOPROBE;
                         return;
                 }
-#endif
                 drive->dev_flags |= IDE_DFLAG_NOPROBE;
         }
 }
@@ -1072,26 +1073,23 @@ static int __devinit pmac_ide_setup_device(pmac_ide_hwif_t *pmif,
                 writel(KAUAI_FCR_UATA_MAGIC |
                        KAUAI_FCR_UATA_RESET_N |
                        KAUAI_FCR_UATA_ENABLE, pmif->kauai_fcr);
-
-        pmif->mediabay = 0;
         
         /* Make sure we have sane timings */
         sanitize_timings(pmif);
 
+        /* If we are on a media bay, wait for it to settle and lock it */
+        if (pmif->mdev)
+                lock_media_bay(pmif->mdev->media_bay);
+
         host = ide_host_alloc(&d, hws, 1);
-        if (host == NULL)
-                return -ENOMEM;
-        hwif = host->ports[0];
+        if (host == NULL) {
+                rc = -ENOMEM;
+                goto bail;
+        }
+        hwif = pmif->hwif = host->ports[0];
 
-#ifndef CONFIG_PPC64
-        /* XXX FIXME: Media bay stuff need re-organizing */
-        if (np->parent && np->parent->name
-            && strcasecmp(np->parent->name, "media-bay") == 0) {
-#ifdef CONFIG_PMAC_MEDIABAY
-                media_bay_set_ide_infos(np->parent, pmif->regbase, pmif->irq,
-                                        hwif);
-#endif /* CONFIG_PMAC_MEDIABAY */
-                pmif->mediabay = 1;
+        if (on_media_bay(pmif)) {
+                /* Fixup bus ID for media bay */
                 if (!bidp)
                         pmif->aapl_bus_id = 1;
         } else if (pmif->kind == controller_ohare) {
@@ -1100,9 +1098,7 @@ static int __devinit pmac_ide_setup_device(pmac_ide_hwif_t *pmif,
                  * units, I keep the old way
                  */
                 ppc_md.feature_call(PMAC_FTR_IDE_ENABLE, np, 0, 1);
-        } else
-#endif
-        {
+        } else {
                 /* This is necessary to enable IDE when net-booting */
                 ppc_md.feature_call(PMAC_FTR_IDE_RESET, np, pmif->aapl_bus_id, 1);
                 ppc_md.feature_call(PMAC_FTR_IDE_ENABLE, np, pmif->aapl_bus_id, 1);
@@ -1112,17 +1108,21 @@ static int __devinit pmac_ide_setup_device(pmac_ide_hwif_t *pmif,
         }
 
         printk(KERN_INFO DRV_NAME ": Found Apple %s controller (%s), "
-                         "bus ID %d%s, irq %d\n", model_name[pmif->kind],
-                         pmif->mdev ? "macio" : "PCI", pmif->aapl_bus_id,
-                         pmif->mediabay ? " (mediabay)" : "", hw->irq);
+               "bus ID %d%s, irq %d\n", model_name[pmif->kind],
+               pmif->mdev ? "macio" : "PCI", pmif->aapl_bus_id,
+               on_media_bay(pmif) ? " (mediabay)" : "", hw->irq);
 
         rc = ide_host_register(host, &d, hws);
-        if (rc) {
-                ide_host_free(host);
-                return rc;
-        }
+        if (rc)
+                pmif->hwif = NULL;
 
-        return 0;
+        if (pmif->mdev)
+                unlock_media_bay(pmif->mdev->media_bay);
+
+ bail:
+        if (rc && host)
+                ide_host_free(host);
+        return rc;
 }
 
 static void __devinit pmac_ide_init_ports(struct ide_hw *hw, unsigned long base)
@@ -1362,6 +1362,25 @@ pmac_ide_pci_resume(struct pci_dev *pdev)
         return rc;
 }
 
+#ifdef CONFIG_PMAC_MEDIABAY
+static void pmac_ide_macio_mb_event(struct macio_dev* mdev, int mb_state)
+{
+        pmac_ide_hwif_t *pmif =
+                (pmac_ide_hwif_t *)dev_get_drvdata(&mdev->ofdev.dev);
+
+        switch(mb_state) {
+        case MB_CD:
+                if (!pmif->hwif->present)
+                        ide_port_scan(pmif->hwif);
+                break;
+        default:
+                if (pmif->hwif->present)
+                        ide_port_unregister_devices(pmif->hwif);
+        }
+}
+#endif /* CONFIG_PMAC_MEDIABAY */
+
+
 static struct of_device_id pmac_ide_macio_match[] = 
 {
         {
@@ -1386,6 +1405,9 @@ static struct macio_driver pmac_ide_macio_driver =
         .probe          = pmac_ide_macio_attach,
         .suspend        = pmac_ide_macio_suspend,
         .resume         = pmac_ide_macio_resume,
+#ifdef CONFIG_PMAC_MEDIABAY
+        .mediabay_event = pmac_ide_macio_mb_event,
+#endif
 };
 
 static const struct pci_device_id pmac_ide_pci_match[] = {
diff --git a/drivers/ide/sis5513.c b/drivers/ide/sis5513.c
index 3b88eba04c9c..468706082fb5 100644
--- a/drivers/ide/sis5513.c
+++ b/drivers/ide/sis5513.c
@@ -632,12 +632,3 @@ module_exit(sis5513_ide_exit);
 MODULE_AUTHOR("Lionel Bouton, L C Chang, Andre Hedrick, Vojtech Pavlik");
 MODULE_DESCRIPTION("PCI driver module for SIS IDE");
 MODULE_LICENSE("GPL");
-
-/*
- * TODO:
- *      - CLEANUP
- *      - More checks in the config registers (force values instead of
- *        relying on the BIOS setting them correctly).
- *      - Further optimisations ?
- *        . for example ATA66+ regs 0x48 & 0x4A
- */
diff --git a/drivers/ide/sl82c105.c b/drivers/ide/sl82c105.c
index d698da470d6f..3c2bbf0057ea 100644
--- a/drivers/ide/sl82c105.c
+++ b/drivers/ide/sl82c105.c
@@ -24,13 +24,6 @@
 
 #define DRV_NAME "sl82c105"
 
-#undef DEBUG
-
-#ifdef DEBUG
-#define DBG(arg) printk arg
-#else
-#define DBG(fmt,...)
-#endif
 /*
  * SL82C105 PCI config register 0x40 bits.
  */
@@ -104,9 +97,6 @@ static void sl82c105_set_dma_mode(ide_drive_t *drive, const u8 speed)
         unsigned long timings = (unsigned long)ide_get_drivedata(drive);
         u16 drv_ctrl;
 
-        DBG(("sl82c105_tune_chipset(drive:%s, speed:%s)\n",
-             drive->name, ide_xfer_verbose(speed)));
-
         drv_ctrl = mwdma_timings[speed - XFER_MW_DMA_0];
 
         /*
@@ -196,8 +186,6 @@ static void sl82c105_dma_start(ide_drive_t *drive)
         struct pci_dev *dev     = to_pci_dev(hwif->dev);
         int reg                 = 0x44 + drive->dn * 4;
 
-        DBG(("%s(drive:%s)\n", __func__, drive->name));
-
         pci_write_config_word(dev, reg,
                               (unsigned long)ide_get_drivedata(drive) >> 16);
 
@@ -209,8 +197,6 @@ static void sl82c105_dma_clear(ide_drive_t *drive)
 {
         struct pci_dev *dev = to_pci_dev(drive->hwif->dev);
 
-        DBG(("sl82c105_dma_clear(drive:%s)\n", drive->name));
-
         sl82c105_reset_host(dev);
 }
 
@@ -218,11 +204,7 @@ static int sl82c105_dma_end(ide_drive_t *drive)
 {
         struct pci_dev *dev     = to_pci_dev(drive->hwif->dev);
         int reg                 = 0x44 + drive->dn * 4;
-        int ret;
-
-        DBG(("%s(drive:%s)\n", __func__, drive->name));
-
-        ret = ide_dma_end(drive);
+        int ret                 = ide_dma_end(drive);
 
         pci_write_config_word(dev, reg,
                               (unsigned long)ide_get_drivedata(drive));
@@ -239,8 +221,6 @@ static void sl82c105_resetproc(ide_drive_t *drive)
         struct pci_dev *dev = to_pci_dev(drive->hwif->dev);
         u32 val;
 
-        DBG(("sl82c105_resetproc(drive:%s)\n", drive->name));
-
         pci_read_config_dword(dev, 0x40, &val);
         val |= (CTRL_P1F16 | CTRL_P0F16);
         pci_write_config_dword(dev, 0x40, val);
@@ -291,8 +271,6 @@ static int init_chipset_sl82c105(struct pci_dev *dev)
 {
         u32 val;
 
-        DBG(("init_chipset_sl82c105()\n"));
-
         pci_read_config_dword(dev, 0x40, &val);
         val |= CTRL_P0EN | CTRL_P0F16 | CTRL_P1F16;
         pci_write_config_dword(dev, 0x40, val);
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);