From: Andrew Morton Cc: Sergei Shtylyov Cc: Alan Cox Cc: Bartlomiej Zolnierkiewicz Signed-off-by: Andrew Morton --- drivers/ide/pci/hpt366.c | 23 ++++++++++++++--------- 1 files changed, 14 insertions(+), 9 deletions(-) diff -puN drivers/ide/pci/hpt366.c~hpt3xx-rework-rate-filtering-tidy drivers/ide/pci/hpt366.c --- devel/drivers/ide/pci/hpt366.c~hpt3xx-rework-rate-filtering-tidy 2006-05-17 23:53:37.000000000 -0700 +++ devel-akpm/drivers/ide/pci/hpt366.c 2006-05-17 23:53:37.000000000 -0700 @@ -380,15 +380,20 @@ static __devinit u8 hpt_revision(struct switch(dev->device) { /* Remap new 372N onto 372 */ case PCI_DEVICE_ID_TTI_HPT372N: - rev = PCI_DEVICE_ID_TTI_HPT372; break; + rev = PCI_DEVICE_ID_TTI_HPT372; + break; case PCI_DEVICE_ID_TTI_HPT374: - rev = PCI_DEVICE_ID_TTI_HPT374; break; + rev = PCI_DEVICE_ID_TTI_HPT374; + break; case PCI_DEVICE_ID_TTI_HPT371: - rev = PCI_DEVICE_ID_TTI_HPT371; break; + rev = PCI_DEVICE_ID_TTI_HPT371; + break; case PCI_DEVICE_ID_TTI_HPT302: - rev = PCI_DEVICE_ID_TTI_HPT302; break; + rev = PCI_DEVICE_ID_TTI_HPT302; + break; case PCI_DEVICE_ID_TTI_HPT372: - rev = PCI_DEVICE_ID_TTI_HPT372; break; + rev = PCI_DEVICE_ID_TTI_HPT372; + break; default: break; } @@ -440,7 +445,7 @@ static u8 hpt3xx_ratefilter(ide_drive_t goto check_bad_ata33; /* fall thru */ case 0x02: - speed = min(speed, (u8)XFER_UDMA_4); + speed = min_t(u8, speed, XFER_UDMA_4); /* * CHECK ME, Does this need to be set to 5 ?? */ @@ -450,13 +455,13 @@ static u8 hpt3xx_ratefilter(ide_drive_t !check_in_drive_list(drive, bad_ata66_4)) goto check_bad_ata33; - speed = min(speed, (u8)XFER_UDMA_3); + speed = min_t(u8, speed, XFER_UDMA_3); if (HPT366_ALLOW_ATA66_3 && !check_in_drive_list(drive, bad_ata66_3)) goto check_bad_ata33; /* fall thru */ case 0x01: - speed = min(speed, (u8)XFER_UDMA_2); + speed = min_t(u8, speed, XFER_UDMA_2); check_bad_ata33: if (info->revision >= 4) @@ -466,7 +471,7 @@ static u8 hpt3xx_ratefilter(ide_drive_t /* fall thru */ case 0x00: default: - speed = min(speed, (u8)XFER_MW_DMA_2); + speed = min_t(u8, speed, XFER_MW_DMA_2); break; } return speed; _