Commit b04e0854 authored by Andrew F. Davis's avatar Andrew F. Davis Committed by Greg Kroah-Hartman
Browse files

w1: Use kernel common min() implementation 



Signed-off-by: default avatarAndrew F. Davis <afd@ti.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 270579d9

drivers/w1/w1_netlink.c

+1 −3
Original line number Diff line number Diff line
@@ -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,