11 files changed, 81 insertions, 72 deletions

diff --git a/drivers/ide/ide-cd.c b/drivers/ide/ide-cd.c
index b4a41d6d0714..6de3cd3d6e8e 100644
--- a/drivers/ide/ide-cd.c
+++ b/drivers/ide/ide-cd.c
@@ -1451,9 +1451,12 @@ static ide_startstop_t cdrom_pc_intr (ide_drive_t *drive)
         } else {
 confused:
                 printk (KERN_ERR "%s: cdrom_pc_intr: The drive "
-                        "appears confused (ireason = 0x%02x)\n",
+                        "appears confused (ireason = 0x%02x). "
+                        "Trying to recover by ending request.\n",
                         drive->name, ireason);
                 rq->flags |= REQ_FAILED;
+                cdrom_end_request(drive, 0);
+                return ide_stopped;
         }
 
         /* Now we wait for another interrupt. */
@@ -1722,8 +1725,7 @@ static ide_startstop_t cdrom_newpc_intr(ide_drive_t *drive)
                 }
         }
 
-        if (HWGROUP(drive)->handler != NULL)
-                BUG();
+        BUG_ON(HWGROUP(drive)->handler != NULL);
 
         ide_set_handler(drive, cdrom_newpc_intr, rq->timeout, NULL);
         return ide_started;
diff --git a/drivers/ide/ide-dma.c b/drivers/ide/ide-dma.c
index c481be8b807f..783a2475ee8b 100644
--- a/drivers/ide/ide-dma.c
+++ b/drivers/ide/ide-dma.c
@@ -206,8 +206,7 @@ int ide_build_sglist(ide_drive_t *drive, struct request *rq)
         ide_hwif_t *hwif = HWIF(drive);
         struct scatterlist *sg = hwif->sg_table;
 
-        if ((rq->flags & REQ_DRIVE_TASKFILE) && rq->nr_sectors > 256)
-                BUG();
+        BUG_ON((rq->flags & REQ_DRIVE_TASKFILE) && rq->nr_sectors > 256);
 
         ide_map_sg(drive, rq);
 
@@ -947,8 +946,7 @@ void ide_setup_dma (ide_hwif_t *hwif, unsigned long dma_base, unsigned int num_p
         }
         printk("\n");
 
-        if (!(hwif->dma_master))
-                BUG();
+        BUG_ON(!hwif->dma_master);
 }
 
 EXPORT_SYMBOL_GPL(ide_setup_dma);
diff --git a/drivers/ide/ide-floppy.c b/drivers/ide/ide-floppy.c
index a53e3ce4a142..a1179e924962 100644
--- a/drivers/ide/ide-floppy.c
+++ b/drivers/ide/ide-floppy.c
@@ -898,8 +898,7 @@ static ide_startstop_t idefloppy_pc_intr (ide_drive_t *drive)
                                         "to send us more data than expected "
                                         "- discarding data\n");
                                 idefloppy_discard_data(drive,bcount.all);
-                                if (HWGROUP(drive)->handler != NULL)
-                                        BUG();
+                                BUG_ON(HWGROUP(drive)->handler != NULL);
                                 ide_set_handler(drive,
                                                 &idefloppy_pc_intr,
                                                 IDEFLOPPY_WAIT_CMD,
@@ -932,8 +931,7 @@ static ide_startstop_t idefloppy_pc_intr (ide_drive_t *drive)
         pc->actually_transferred += bcount.all;
         pc->current_position += bcount.all;
 
-        if (HWGROUP(drive)->handler != NULL)
-                BUG();
+        BUG_ON(HWGROUP(drive)->handler != NULL);
         ide_set_handler(drive, &idefloppy_pc_intr, IDEFLOPPY_WAIT_CMD, NULL);           /* And set the interrupt handler again */
         return ide_started;
 }
@@ -960,8 +958,7 @@ static ide_startstop_t idefloppy_transfer_pc (ide_drive_t *drive)
                                 "issuing a packet command\n");
                 return ide_do_reset(drive);
         }
-        if (HWGROUP(drive)->handler != NULL)
-                BUG();
+        BUG_ON(HWGROUP(drive)->handler != NULL);
         /* Set the interrupt routine */
         ide_set_handler(drive, &idefloppy_pc_intr, IDEFLOPPY_WAIT_CMD, NULL);
         /* Send the actual packet */
@@ -1017,8 +1014,7 @@ static ide_startstop_t idefloppy_transfer_pc1 (ide_drive_t *drive)
          * 40 and 50msec work well. idefloppy_pc_intr will not be actually
          * used until after the packet is moved in about 50 msec.
          */
-        if (HWGROUP(drive)->handler != NULL)
-                BUG();
+        BUG_ON(HWGROUP(drive)->handler != NULL);
         ide_set_handler(drive, 
           &idefloppy_pc_intr,           /* service routine for packet command */
           floppy->ticks,                /* wait this long before "failing" */
diff --git a/drivers/ide/ide-io.c b/drivers/ide/ide-io.c
index c01615dec202..4f2f138de2ca 100644
--- a/drivers/ide/ide-io.c
+++ b/drivers/ide/ide-io.c
@@ -142,38 +142,41 @@ enum {
 
 static void ide_complete_power_step(ide_drive_t *drive, struct request *rq, u8 stat, u8 error)
 {
+        struct request_pm_state *pm = rq->end_io_data;
+
         if (drive->media != ide_disk)
                 return;
 
-        switch (rq->pm->pm_step) {
+        switch (pm->pm_step) {
         case ide_pm_flush_cache:        /* Suspend step 1 (flush cache) complete */
-                if (rq->pm->pm_state == PM_EVENT_FREEZE)
-                        rq->pm->pm_step = ide_pm_state_completed;
+                if (pm->pm_state == PM_EVENT_FREEZE)
+                        pm->pm_step = ide_pm_state_completed;
                 else
-                        rq->pm->pm_step = idedisk_pm_standby;
+                        pm->pm_step = idedisk_pm_standby;
                 break;
         case idedisk_pm_standby:        /* Suspend step 2 (standby) complete */
-                rq->pm->pm_step = ide_pm_state_completed;
+                pm->pm_step = ide_pm_state_completed;
                 break;
         case idedisk_pm_idle:           /* Resume step 1 (idle) complete */
-                rq->pm->pm_step = ide_pm_restore_dma;
+                pm->pm_step = ide_pm_restore_dma;
                 break;
         }
 }
 
 static ide_startstop_t ide_start_power_step(ide_drive_t *drive, struct request *rq)
 {
+        struct request_pm_state *pm = rq->end_io_data;
         ide_task_t *args = rq->special;
 
         memset(args, 0, sizeof(*args));
 
         if (drive->media != ide_disk) {
                 /* skip idedisk_pm_idle for ATAPI devices */
-                if (rq->pm->pm_step == idedisk_pm_idle)
-                        rq->pm->pm_step = ide_pm_restore_dma;
+                if (pm->pm_step == idedisk_pm_idle)
+                        pm->pm_step = ide_pm_restore_dma;
         }
 
-        switch (rq->pm->pm_step) {
+        switch (pm->pm_step) {
         case ide_pm_flush_cache:        /* Suspend step 1 (flush cache) */
                 if (drive->media != ide_disk)
                         break;
@@ -215,7 +218,7 @@ static ide_startstop_t ide_start_power_step(ide_drive_t *drive, struct request *
                 drive->hwif->ide_dma_check(drive);
                 break;
         }
-        rq->pm->pm_step = ide_pm_state_completed;
+        pm->pm_step = ide_pm_state_completed;
         return ide_stopped;
 }
 
@@ -362,12 +365,13 @@ void ide_end_drive_cmd (ide_drive_t *drive, u8 stat, u8 err)
                         }
                 }
         } else if (blk_pm_request(rq)) {
+                struct request_pm_state *pm = rq->end_io_data;
 #ifdef DEBUG_PM
                 printk("%s: complete_power_step(step: %d, stat: %x, err: %x)\n",
                         drive->name, rq->pm->pm_step, stat, err);
 #endif
                 ide_complete_power_step(drive, rq, stat, err);
-                if (rq->pm->pm_step == ide_pm_state_completed)
+                if (pm->pm_step == ide_pm_state_completed)
                         ide_complete_pm_request(drive, rq);
                 return;
         }
@@ -871,6 +875,39 @@ done:
         return ide_stopped;
 }
 
+static void ide_check_pm_state(ide_drive_t *drive, struct request *rq)
+{
+        struct request_pm_state *pm = rq->end_io_data;
+
+        if (blk_pm_suspend_request(rq) &&
+            pm->pm_step == ide_pm_state_start_suspend)
+                /* Mark drive blocked when starting the suspend sequence. */
+                drive->blocked = 1;
+        else if (blk_pm_resume_request(rq) &&
+                 pm->pm_step == ide_pm_state_start_resume) {
+                /* 
+                 * The first thing we do on wakeup is to wait for BSY bit to
+                 * go away (with a looong timeout) as a drive on this hwif may
+                 * just be POSTing itself.
+                 * We do that before even selecting as the "other" device on
+                 * the bus may be broken enough to walk on our toes at this
+                 * point.
+                 */
+                int rc;
+#ifdef DEBUG_PM
+                printk("%s: Wakeup request inited, waiting for !BSY...\n", drive->name);
+#endif
+                rc = ide_wait_not_busy(HWIF(drive), 35000);
+                if (rc)
+                        printk(KERN_WARNING "%s: bus not ready on wakeup\n", drive->name);
+                SELECT_DRIVE(drive);
+                HWIF(drive)->OUTB(8, HWIF(drive)->io_ports[IDE_CONTROL_OFFSET]);
+                rc = ide_wait_not_busy(HWIF(drive), 10000);
+                if (rc)
+                        printk(KERN_WARNING "%s: drive not ready on wakeup\n", drive->name);
+        }
+}
+
 /**
  *      start_request   -       start of I/O and command issuing for IDE
  *
@@ -909,33 +946,8 @@ static ide_startstop_t start_request (ide_drive_t *drive, struct request *rq)
         if (block == 0 && drive->remap_0_to_1 == 1)
                 block = 1;  /* redirect MBR access to EZ-Drive partn table */
 
-        if (blk_pm_suspend_request(rq) &&
-            rq->pm->pm_step == ide_pm_state_start_suspend)
-                /* Mark drive blocked when starting the suspend sequence. */
-                drive->blocked = 1;
-        else if (blk_pm_resume_request(rq) &&
-                 rq->pm->pm_step == ide_pm_state_start_resume) {
-                /* 
-                 * The first thing we do on wakeup is to wait for BSY bit to
-                 * go away (with a looong timeout) as a drive on this hwif may
-                 * just be POSTing itself.
-                 * We do that before even selecting as the "other" device on
-                 * the bus may be broken enough to walk on our toes at this
-                 * point.
-                 */
-                int rc;
-#ifdef DEBUG_PM
-                printk("%s: Wakeup request inited, waiting for !BSY...\n", drive->name);
-#endif
-                rc = ide_wait_not_busy(HWIF(drive), 35000);
-                if (rc)
-                        printk(KERN_WARNING "%s: bus not ready on wakeup\n", drive->name);
-                SELECT_DRIVE(drive);
-                HWIF(drive)->OUTB(8, HWIF(drive)->io_ports[IDE_CONTROL_OFFSET]);
-                rc = ide_wait_not_busy(HWIF(drive), 10000);
-                if (rc)
-                        printk(KERN_WARNING "%s: drive not ready on wakeup\n", drive->name);
-        }
+        if (blk_pm_request(rq))
+                ide_check_pm_state(drive, rq);
 
         SELECT_DRIVE(drive);
         if (ide_wait_stat(&startstop, drive, drive->ready_stat, BUSY_STAT|DRQ_STAT, WAIT_READY)) {
@@ -950,13 +962,14 @@ static ide_startstop_t start_request (ide_drive_t *drive, struct request *rq)
                 else if (rq->flags & REQ_DRIVE_TASKFILE)
                         return execute_drive_cmd(drive, rq);
                 else if (blk_pm_request(rq)) {
+                        struct request_pm_state *pm = rq->end_io_data;
 #ifdef DEBUG_PM
                         printk("%s: start_power_step(step: %d)\n",
                                 drive->name, rq->pm->pm_step);
 #endif
                         startstop = ide_start_power_step(drive, rq);
                         if (startstop == ide_stopped &&
-                            rq->pm->pm_step == ide_pm_state_completed)
+                            pm->pm_step == ide_pm_state_completed)
                                 ide_complete_pm_request(drive, rq);
                         return startstop;
                 }
diff --git a/drivers/ide/ide-iops.c b/drivers/ide/ide-iops.c
index b72dde70840a..97a49e77a8f1 100644
--- a/drivers/ide/ide-iops.c
+++ b/drivers/ide/ide-iops.c
@@ -939,8 +939,7 @@ void ide_execute_command(ide_drive_t *drive, task_ioreg_t cmd, ide_handler_t *ha
         
         spin_lock_irqsave(&ide_lock, flags);
         
-        if(hwgroup->handler)
-                BUG();
+        BUG_ON(hwgroup->handler);
         hwgroup->handler        = handler;
         hwgroup->expiry         = expiry;
         hwgroup->timer.expires  = jiffies + timeout;
@@ -981,8 +980,7 @@ static ide_startstop_t atapi_reset_pollfunc (ide_drive_t *drive)
                 printk("%s: ATAPI reset complete\n", drive->name);
         } else {
                 if (time_before(jiffies, hwgroup->poll_timeout)) {
-                        if (HWGROUP(drive)->handler != NULL)
-                                BUG();
+                        BUG_ON(HWGROUP(drive)->handler != NULL);
                         ide_set_handler(drive, &atapi_reset_pollfunc, HZ/20, NULL);
                         /* continue polling */
                         return ide_started;
@@ -1021,8 +1019,7 @@ static ide_startstop_t reset_pollfunc (ide_drive_t *drive)
 
         if (!OK_STAT(tmp = hwif->INB(IDE_STATUS_REG), 0, BUSY_STAT)) {
                 if (time_before(jiffies, hwgroup->poll_timeout)) {
-                        if (HWGROUP(drive)->handler != NULL)
-                                BUG();
+                        BUG_ON(HWGROUP(drive)->handler != NULL);
                         ide_set_handler(drive, &reset_pollfunc, HZ/20, NULL);
                         /* continue polling */
                         return ide_started;
@@ -1138,8 +1135,7 @@ static ide_startstop_t do_reset1 (ide_drive_t *drive, int do_not_try_atapi)
         hwgroup = HWGROUP(drive);
 
         /* We must not reset with running handlers */
-        if(hwgroup->handler != NULL)
-                BUG();
+        BUG_ON(hwgroup->handler != NULL);
 
         /* For an ATAPI device, first try an ATAPI SRST. */
         if (drive->media != ide_disk && !do_not_try_atapi) {
diff --git a/drivers/ide/ide-lib.c b/drivers/ide/ide-lib.c
index 41d46dbe6c24..16a143133f93 100644
--- a/drivers/ide/ide-lib.c
+++ b/drivers/ide/ide-lib.c
@@ -164,8 +164,7 @@ u8 ide_rate_filter (u8 mode, u8 speed)
 //      printk("%s: mode 0x%02x, speed 0x%02x\n", __FUNCTION__, mode, speed);
 
         /* So that we remember to update this if new modes appear */
-        if (mode > 4)
-                BUG();
+        BUG_ON(mode > 4);
         return min(speed, speed_max[mode]);
 #else /* !CONFIG_BLK_DEV_IDEDMA */
         return min(speed, (u8)XFER_PIO_4);
diff --git a/drivers/ide/ide-taskfile.c b/drivers/ide/ide-taskfile.c
index 9233b8109a0f..a839b2a8f6f4 100644
--- a/drivers/ide/ide-taskfile.c
+++ b/drivers/ide/ide-taskfile.c
@@ -196,8 +196,7 @@ ide_startstop_t set_geometry_intr (ide_drive_t *drive)
         if (stat & (ERR_STAT|DRQ_STAT))
                 return ide_error(drive, "set_geometry_intr", stat);
 
-        if (HWGROUP(drive)->handler != NULL)
-                BUG();
+        BUG_ON(HWGROUP(drive)->handler != NULL);
         ide_set_handler(drive, &set_geometry_intr, WAIT_WORSTCASE, NULL);
         return ide_started;
 }
diff --git a/drivers/ide/ide.c b/drivers/ide/ide.c
index 3fdab563fec2..59fe358048b3 100644
--- a/drivers/ide/ide.c
+++ b/drivers/ide/ide.c
@@ -726,6 +726,7 @@ void ide_setup_ports (	hw_regs_t *hw,
 {
         int i;
 
+        memset(hw, 0, sizeof(hw_regs_t));
         for (i = 0; i < IDE_NR_PORTS; i++) {
                 if (offsets[i] == -1) {
                         switch(i) {
@@ -1225,7 +1226,7 @@ static int generic_ide_suspend(struct device *dev, pm_message_t state)
         memset(&args, 0, sizeof(args));
         rq.flags = REQ_PM_SUSPEND;
         rq.special = &args;
-        rq.pm = &rqpm;
+        rq.end_io_data = &rqpm;
         rqpm.pm_step = ide_pm_state_start_suspend;
         rqpm.pm_state = state.event;
 
@@ -1244,7 +1245,7 @@ static int generic_ide_resume(struct device *dev)
         memset(&args, 0, sizeof(args));
         rq.flags = REQ_PM_RESUME;
         rq.special = &args;
-        rq.pm = &rqpm;
+        rq.end_io_data = &rqpm;
         rqpm.pm_step = ide_pm_state_start_resume;
         rqpm.pm_state = PM_EVENT_ON;
 
@@ -1366,8 +1367,7 @@ int generic_ide_ioctl(ide_drive_t *drive, struct file *file, struct block_device
 
                         ide_abort(drive, "drive reset");
 
-                        if(HWGROUP(drive)->handler)
-                                BUG();
+                        BUG_ON(HWGROUP(drive)->handler);
                                 
                         /* Ensure nothing gets queued after we
                            drop the lock. Reset will clear the busy */
diff --git a/drivers/ide/legacy/q40ide.c b/drivers/ide/legacy/q40ide.c
index 2a78b792f7fb..434a94faa3b7 100644
--- a/drivers/ide/legacy/q40ide.c
+++ b/drivers/ide/legacy/q40ide.c
@@ -80,6 +80,7 @@ void q40_ide_setup_ports ( hw_regs_t *hw,
 {
         int i;
 
+        memset(hw, 0, sizeof(hw_regs_t));
         for (i = 0; i < IDE_NR_PORTS; i++) {
                 /* BIG FAT WARNING: 
                    assumption: only DATA port is ever used in 16 bit mode */
diff --git a/drivers/ide/pci/sgiioc4.c b/drivers/ide/pci/sgiioc4.c
index 27c9eb989a9a..e125032bb403 100644
--- a/drivers/ide/pci/sgiioc4.c
+++ b/drivers/ide/pci/sgiioc4.c
@@ -723,6 +723,12 @@ static ide_pci_device_t sgiioc4_chipsets[] __devinitdata = {
 int
 ioc4_ide_attach_one(struct ioc4_driver_data *idd)
 {
+        /* PCI-RT does not bring out IDE connection.
+         * Do not attach to this particular IOC4.
+         */
+        if (idd->idd_variant == IOC4_VARIANT_PCI_RT)
+                return 0;
+
         return pci_init_sgiioc4(idd->idd_pdev,
                                 &sgiioc4_chipsets[idd->idd_pci_id->driver_data]);
 }
diff --git a/drivers/ide/pci/trm290.c b/drivers/ide/pci/trm290.c
index c26c8ca90dd4..fe80295974e1 100644
--- a/drivers/ide/pci/trm290.c
+++ b/drivers/ide/pci/trm290.c
@@ -183,8 +183,7 @@ static void trm290_ide_dma_exec_cmd(ide_drive_t *drive, u8 command)
 {
         ide_hwif_t *hwif        = HWIF(drive);
 
-        if (HWGROUP(drive)->handler != NULL)    /* paranoia check */
-                BUG();
+        BUG_ON(HWGROUP(drive)->handler != NULL);        /* paranoia check */
         ide_set_handler(drive, &ide_dma_intr, WAIT_CMD, NULL);
         /* issue cmd to drive */
         hwif->OUTB(command, IDE_COMMAND_REG);