From dde1ec5b0adcbc13ed821fd345fe52d9fb4605e8 Mon Sep 17 00:00:00 2001 From: Chas Williams Date: Wed, 24 Mar 2004 23:06:05 -0800 Subject: [PATCH] [ATM]: [nicstar] use kernel min/max (by Randy.Dunlap ) --- drivers/atm/nicstar.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/drivers/atm/nicstar.c b/drivers/atm/nicstar.c index 59028ad6c3179..a2e465d9be601 100644 --- a/drivers/atm/nicstar.c +++ b/drivers/atm/nicstar.c @@ -112,9 +112,6 @@ /* Macros *********************************************************************/ -#define MAX(a,b) ((a) > (b) ? (a) : (b)) -#define MIN(a,b) ((a) < (b) ? (a) : (b)) - #define CMD_BUSY(card) (readl((card)->membase + STAT) & NS_STAT_CMDBZ) #define NS_DELAY mdelay(1) @@ -2483,7 +2480,7 @@ static void dequeue_rx(ns_dev *card, ns_rsqe *rsqe) for (j = 1; j < NS_SKB(iovb)->iovcnt; j++) { lb = (struct sk_buff *) iov->iov_base; - tocopy = MIN(remaining, iov->iov_len); + tocopy = min_t(int, remaining, iov->iov_len); memcpy(hb->tail, lb->data, tocopy); skb_put(hb, tocopy); iov++; -- 2.53.0