alim15x3: remove redundant m5229_revision check

init_dma_ali15x3() guarantees that hwif->dma_base will never be set for
m5229_revision < 0x20 so remove redundant m5229_revision >= 0x20 check from
init_hwif_common_ali15x3().

While at it remove incorrect comment.

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

1 files changed, 13 insertions, 12 deletions

diff --git a/drivers/ide/pci/alim15x3.c b/drivers/ide/pci/alim15x3.c
index 88f084eae193..0b83443bf250 100644
--- a/drivers/ide/pci/alim15x3.c
+++ b/drivers/ide/pci/alim15x3.c
@@ -694,6 +694,10 @@ static void __devinit init_hwif_common_ali15x3 (ide_hwif_t *hwif)
                 return;
         }
 
+        /*
+         * check in ->init_dma guarantees m5229_revision >= 0x20 here
+         */
+
         if (m5229_revision > 0x20)
                 hwif->atapi_dma = 1;
 
@@ -711,18 +715,15 @@ static void __devinit init_hwif_common_ali15x3 (ide_hwif_t *hwif)
         hwif->mwdma_mask = 0x07;
         hwif->swdma_mask = 0x07;
 
-        if (m5229_revision >= 0x20) {
-                /*
-                 * M1543C or newer for DMAing
-                 */
-                hwif->ide_dma_check = &ali15x3_config_drive_for_dma;
-                hwif->dma_setup = &ali15x3_dma_setup;
-                if (!noautodma)
-                        hwif->autodma = 1;
-
-                if (hwif->cbl != ATA_CBL_PATA40_SHORT)
-                        hwif->cbl = ata66_ali15x3(hwif);
-        }
+        hwif->ide_dma_check = &ali15x3_config_drive_for_dma;
+        hwif->dma_setup = &ali15x3_dma_setup;
+
+        if (hwif->cbl != ATA_CBL_PATA40_SHORT)
+                hwif->cbl = ata66_ali15x3(hwif);
+
+        if (!noautodma)
+                hwif->autodma = 1;
+
         hwif->drives[0].autodma = hwif->autodma;
         hwif->drives[1].autodma = hwif->autodma;
 }