Commit a792bd5a authored by Harvey Harrison's avatar Harvey Harrison Committed by Bartlomiej Zolnierkiewicz
Browse files

ide-tape: use clamp_t() rather than nested min_t()/max_t() 



Signed-off-by: default avatarHarvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
parent d6cddd3c

drivers/ide/ide-tape.c

+2 −3
Original line number Diff line number Diff line
@@ -2746,9 +2746,8 @@ static void idetape_setup(ide_drive_t *drive, idetape_tape_t *tape, int minor) 
	 * 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],