Commit cd078af6 authored Jun 04, 2010 by Atsushi Nemoto Committed by David S. Miller Aug 09, 2010

tx493xide: use min_t() macro instead of min()



This fixes a warning ("comparison of distinct pointer types lacks a
cast") introduced by the commit
040f6b4f ("tx493xide: use ->pio_mode
value to determine pair device speed").

Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 7d543d84

drivers/ide/tx4938ide.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -64,7 +64,7 @@ static void tx4938ide_set_pio_mode(ide_hwif_t hwif, ide_drive_t drive)

		pair = ide_get_pair_dev(drive);
		if (pair)
		safe = min(safe, pair->pio_mode - XFER_PIO_0);
		safe = min_t(u8, safe, pair->pio_mode - XFER_PIO_0);
		tx4938ide_tune_ebusc(pdata->ebus_ch, pdata->gbus_clock, safe);
		}

drivers/ide/tx4939ide.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -114,7 +114,7 @@ static void tx4939ide_set_pio_mode(ide_hwif_t hwif, ide_drive_t drive)

		pair = ide_get_pair_dev(drive);
		if (pair)
		safe = min(safe, pair->pio_mode - XFER_PIO_0);
		safe = min_t(u8, safe, pair->pio_mode - XFER_PIO_0);
		/*
		* Update Command Transfer Mode for master/slave and Data
		* Transfer Mode for this drive.