From: Harvey Harrison Signed-off-by: Harvey Harrison Cc: Bartlomiej Zolnierkiewicz Signed-off-by: Andrew Morton --- drivers/ide/ide-tape.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff -puN drivers/ide/ide-tape.c~ide-tape-use-clamp_t-rather-than-nested-min_t-max_t drivers/ide/ide-tape.c --- a/drivers/ide/ide-tape.c~ide-tape-use-clamp_t-rather-than-nested-min_t-max_t +++ a/drivers/ide/ide-tape.c @@ -2747,9 +2747,8 @@ static void idetape_setup(ide_drive_t *d * Ensure that the number we got makes sense; limit it within * IDETAPE_DSC_RW_MIN and IDETAPE_DSC_RW_MAX. */ - tape->best_dsc_rw_freq = max_t(unsigned long, - min_t(unsigned long, t, IDETAPE_DSC_RW_MAX), - IDETAPE_DSC_RW_MIN); + tape->best_dsc_rw_freq = clamp_t(unsigned long, t, IDETAPE_DSC_RW_MIN, + IDETAPE_DSC_RW_MAX); printk(KERN_INFO "ide-tape: %s <-> %s: %dKBps, %d*%dkB buffer, " "%lums tDSC%s\n", drive->name, tape->name, *(u16 *)&tape->caps[14], _