diff options
| author | Arnaldo Carvalho de Melo <acme@conectiva.com.br> | 2003-05-15 17:33:27 -0300 |
|---|---|---|
| committer | Arnaldo Carvalho de Melo <acme@conectiva.com.br> | 2003-05-15 17:33:27 -0300 |
| commit | 4fd065e61a4c766ad5a280fa86dca9783eaacab6 (patch) | |
| tree | 1785a1e9e9a48c5e0700f12631dbe0ae276e7d66 | |
| parent | 7f47833c2c09af466591614f42f1af146dfcc921 (diff) | |
o wan/cycx: use min_t and remove one more private MIN() implementation
| -rw-r--r-- | drivers/net/wan/cycx_drv.c | 4 | ||||
| -rw-r--r-- | include/linux/cycx_drv.h | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/drivers/net/wan/cycx_drv.c b/drivers/net/wan/cycx_drv.c index e32302b38378..fa94d8d3f877 100644 --- a/drivers/net/wan/cycx_drv.c +++ b/drivers/net/wan/cycx_drv.c @@ -343,7 +343,7 @@ static int cycx_data_boot(u32 addr, u8 *code, u32 len) for (i = 0 ; i < len ; i += CFM_LOAD_BUFSZ) if (buffer_load(addr, code + i, - MIN(CFM_LOAD_BUFSZ, (len - i))) < 0) { + min_t(u32, CFM_LOAD_BUFSZ, (len - i))) < 0) { printk(KERN_ERR "%s: Error !!\n", modname); return -1; } @@ -374,7 +374,7 @@ static int cycx_code_boot(u32 addr, u8 *code, u32 len) for (i = 0 ; i < len ; i += CFM_LOAD_BUFSZ) if (buffer_load(addr, code + i, - MIN(CFM_LOAD_BUFSZ, (len - i)))) { + min_t(u32, CFM_LOAD_BUFSZ, (len - i)))) { printk(KERN_ERR "%s: Error !!\n", modname); return -1; } diff --git a/include/linux/cycx_drv.h b/include/linux/cycx_drv.h index 30294cc00297..93e239e1bca8 100644 --- a/include/linux/cycx_drv.h +++ b/include/linux/cycx_drv.h @@ -37,10 +37,6 @@ #define DATA_OFFSET 0x0100 /* For code and data files load */ #define START_OFFSET 0x3ff0 /* 80186 starts here */ -#ifndef MIN -#define MIN(a,b) ((a) < (b) ? (a) : (b)) -#endif - /** * struct cycx_hw - Adapter hardware configuration * @fwid - firmware ID |