Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

[PATCH] ide: clean up the garbage in eighty_ninty_three

Replace the foot long pile of festering garbage in eighty_ninty_three with
some actual clean code. All the ifdefs are fixed and havent changed since
2.4

Acked-by: Bartlomiej Zolnierkiewicz <B.Zolnierkiewicz@elka.pw.edu.pl>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

authored by

Alan Cox and committed by
Linus Torvalds
d7d7634c c352ec8a

+6 -35
+6 -35
drivers/ide/ide-iops.c
··· 601 601 */ 602 602 u8 eighty_ninty_three (ide_drive_t *drive) 603 603 { 604 - #if 0 605 - if (!HWIF(drive)->udma_four) 604 + if(HWIF(drive)->udma_four == 0) 606 605 return 0; 607 - 608 - if (drive->id->major_rev_num) { 609 - int hssbd = 0; 610 - int i; 611 - /* 612 - * Determine highest Supported SPEC 613 - */ 614 - for (i=1; i<=15; i++) 615 - if (drive->id->major_rev_num & (1<<i)) 616 - hssbd++; 617 - 618 - switch (hssbd) { 619 - case 7: 620 - case 6: 621 - case 5: 622 - /* ATA-4 and older do not support above Ultra 33 */ 623 - default: 624 - return 0; 625 - } 626 - } 627 - 628 - return ((u8) ( 606 + if (!(drive->id->hw_config & 0x6000)) 607 + return 0; 629 608 #ifndef CONFIG_IDEDMA_IVB 630 - (drive->id->hw_config & 0x4000) && 609 + if(!(drive->id->hw_config & 0x4000)) 610 + return 0; 631 611 #endif /* CONFIG_IDEDMA_IVB */ 632 - (drive->id->hw_config & 0x6000)) ? 1 : 0); 633 - 634 - #else 635 - 636 - return ((u8) ((HWIF(drive)->udma_four) && 637 - #ifndef CONFIG_IDEDMA_IVB 638 - (drive->id->hw_config & 0x4000) && 639 - #endif /* CONFIG_IDEDMA_IVB */ 640 - (drive->id->hw_config & 0x6000)) ? 1 : 0); 641 - #endif 612 + return 1; 642 613 } 643 614 644 615 EXPORT_SYMBOL(eighty_ninty_three);