summaryrefslogtreecommitdiffstats
path: root/drivers/w1
diff options
context:
space:
mode:
authorAndrew F. Davis <afd@ti.com>2017-03-16 10:19:53 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-04-08 18:20:27 +0200
commitb04e08549910626cda1dbe68ed600afa3ce2af81 (patch)
tree3f8b9df667daf8a7a937bc7232843dc8a7e5fc76 /drivers/w1
parent270579d95f820e93b39dafd4382530b3beb744e4 (diff)
downloadblackbird-obmc-linux-b04e08549910626cda1dbe68ed600afa3ce2af81.tar.gz
blackbird-obmc-linux-b04e08549910626cda1dbe68ed600afa3ce2af81.zip
w1: Use kernel common min() implementation
Signed-off-by: Andrew F. Davis <afd@ti.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/w1')
-rw-r--r--drivers/w1/w1_netlink.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/w1/w1_netlink.c b/drivers/w1/w1_netlink.c
index 49e520ca79c5..18374cad3ace 100644
--- 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,
OpenPOWER on IntegriCloud