diff options
| author | Atsushi Nemoto <anemo@mba.ocn.ne.jp> | 2010-06-04 16:19:23 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-08-09 03:17:55 -0700 |
| commit | cd078af65d5c2f19c0f378062b07a0a79b000723 (patch) | |
| tree | 240c79f10333e3f2281e441ddca6924633654df1 | |
| parent | 7d543d8468348c44010c7b4e6fdd23a398779668 (diff) | |
| download | op-kernel-dev-cd078af65d5c2f19c0f378062b07a0a79b000723.zip op-kernel-dev-cd078af65d5c2f19c0f378062b07a0a79b000723.tar.gz | |
tx493xide: use min_t() macro instead of min()
This fixes a warning ("comparison of distinct pointer types lacks a
cast") introduced by the commit
040f6b4f14adb2ca5babb84e9fb2ebc6661e0be2 ("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>
| -rw-r--r-- | drivers/ide/tx4938ide.c | 2 | ||||
| -rw-r--r-- | drivers/ide/tx4939ide.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/ide/tx4938ide.c b/drivers/ide/tx4938ide.c index 1d80f1f..7002765 100644 --- a/drivers/ide/tx4938ide.c +++ b/drivers/ide/tx4938ide.c @@ -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); } diff --git a/drivers/ide/tx4939ide.c b/drivers/ide/tx4939ide.c index 3c73677..bed3e39 100644 --- a/drivers/ide/tx4939ide.c +++ b/drivers/ide/tx4939ide.c @@ -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. |
