o wan/cycx: use min_t and remove one more private MIN() implementation

parent 7f47833c
...@@ -343,7 +343,7 @@ static int cycx_data_boot(u32 addr, u8 *code, u32 len) ...@@ -343,7 +343,7 @@ static int cycx_data_boot(u32 addr, u8 *code, u32 len)
for (i = 0 ; i < len ; i += CFM_LOAD_BUFSZ) for (i = 0 ; i < len ; i += CFM_LOAD_BUFSZ)
if (buffer_load(addr, code + i, 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); printk(KERN_ERR "%s: Error !!\n", modname);
return -1; return -1;
} }
...@@ -374,7 +374,7 @@ static int cycx_code_boot(u32 addr, u8 *code, u32 len) ...@@ -374,7 +374,7 @@ static int cycx_code_boot(u32 addr, u8 *code, u32 len)
for (i = 0 ; i < len ; i += CFM_LOAD_BUFSZ) for (i = 0 ; i < len ; i += CFM_LOAD_BUFSZ)
if (buffer_load(addr, code + i, 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); printk(KERN_ERR "%s: Error !!\n", modname);
return -1; return -1;
} }
......
...@@ -37,10 +37,6 @@ ...@@ -37,10 +37,6 @@
#define DATA_OFFSET 0x0100 /* For code and data files load */ #define DATA_OFFSET 0x0100 /* For code and data files load */
#define START_OFFSET 0x3ff0 /* 80186 starts here */ #define START_OFFSET 0x3ff0 /* 80186 starts here */
#ifndef MIN
#define MIN(a,b) ((a) < (b) ? (a) : (b))
#endif
/** /**
* struct cycx_hw - Adapter hardware configuration * struct cycx_hw - Adapter hardware configuration
* @fwid - firmware ID * @fwid - firmware ID
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment