redonkable
/
remarkable-linux
1
0
Fork 0
Code Releases Activity

w1: Use kernel common min() implementation 

Signed-off-by: Andrew F. Davis <afd@ti.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
zero-colors
Andrew F. Davis 2017-03-16 10:19:53 -05:00 committed by Greg Kroah-Hartman
parent 270579d95f
commit b04e085499
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/w1/w1_netlink.c
View File

@ -23,8 +23,6 @@
#if defined(CONFIG_W1_CON) && (defined(CONFIG_CONNECTOR) || (defined(CONFIG_CONNECTOR_MODULE) && defined(CONFIG_W1_MODULE)))
#define MIN(a, b) (((a) < (b)) ? (a) : (b))
/* Bundle together everything required to process a request in one memory
* allocation.
*/
@ -598,7 +596,7 @@ static void w1_cn_callback(struct cn_msg *cn, struct netlink_skb_parms *nsp)
sizeof(struct w1_netlink_msg) +
sizeof(struct w1_netlink_cmd));
}
reply_size = MIN(CONNECTOR_MAX_MSG_SIZE, reply_size);
reply_size = min(CONNECTOR_MAX_MSG_SIZE, reply_size);
/* allocate space for the block, a copy of the original message,
* one node per cmd to point into the original message,