w1: Use kernel common min() implementation

Signed-off-by: Andrew F. Davis <afd@ti.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/w1/w1_netlink.c b/drivers/w1/w1_netlink.c
index 49e520ca79c5395215701d507c8323391cc6ce93..18374cad3acee0927ce67d20a85f3f8bad2bd1bc 100644 (file)
--- a/drivers/w1/w1_netlink.c
+++ b/drivers/w1/w1_netlink.c
@@ -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,