Kernel/linux-next
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git synced 2025-01-08 15:04:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

alim15x3: remove redundant m5229_revision check

Browse Source 
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>
This commit is contained in:
Bartlomiej Zolnierkiewicz 2007-10-13 17:47:53 +02:00
parent 88ae4d8c38
commit 99149a4859
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
drivers/ide/pci/alim15x3.c
View File

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