1 files changed, 12 insertions, 30 deletions

diff --git a/drivers/ide/ppc/pmac.c b/drivers/ide/ppc/pmac.c
index 4559e29446e9..3dce80092fff 100644
--- a/drivers/ide/ppc/pmac.c
+++ b/drivers/ide/ppc/pmac.c
@@ -828,38 +828,20 @@ static void pmac_ide_set_dma_mode(ide_drive_t *drive, const u8 speed)
         tl[0] = *timings;
         tl[1] = *timings2;
 
-        switch(speed) {
 #ifdef CONFIG_BLK_DEV_IDEDMA_PMAC
-                case XFER_UDMA_6:
-                case XFER_UDMA_5:
-                case XFER_UDMA_4:
-                case XFER_UDMA_3:
-                case XFER_UDMA_2:
-                case XFER_UDMA_1:
-                case XFER_UDMA_0:
-                        if (pmif->kind == controller_kl_ata4)
-                                ret = set_timings_udma_ata4(&tl[0], speed);
-                        else if (pmif->kind == controller_un_ata6
-                                 || pmif->kind == controller_k2_ata6)
-                                ret = set_timings_udma_ata6(&tl[0], &tl[1], speed);
-                        else if (pmif->kind == controller_sh_ata6)
-                                ret = set_timings_udma_shasta(&tl[0], &tl[1], speed);
-                        else
-                                ret = 1;
-                        break;
-                case XFER_MW_DMA_2:
-                case XFER_MW_DMA_1:
-                case XFER_MW_DMA_0:
-                        set_timings_mdma(drive, pmif->kind, &tl[0], &tl[1], speed);
-                        break;
-                case XFER_SW_DMA_2:
-                case XFER_SW_DMA_1:
-                case XFER_SW_DMA_0:
-                        return;
+        if (speed >= XFER_UDMA_0) {
+                if (pmif->kind == controller_kl_ata4)
+                        ret = set_timings_udma_ata4(&tl[0], speed);
+                else if (pmif->kind == controller_un_ata6
+                         || pmif->kind == controller_k2_ata6)
+                        ret = set_timings_udma_ata6(&tl[0], &tl[1], speed);
+                else if (pmif->kind == controller_sh_ata6)
+                        ret = set_timings_udma_shasta(&tl[0], &tl[1], speed);
+                else
+                        ret = -1;
+        } else
+                set_timings_mdma(drive, pmif->kind, &tl[0], &tl[1], speed);
 #endif /* CONFIG_BLK_DEV_IDEDMA_PMAC */
-                default:
-                        ret = 1;
-        }
         if (ret)
                 return;