From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754832AbdCPPor (ORCPT ); Thu, 16 Mar 2017 11:44:47 -0400 Received: from fllnx209.ext.ti.com ([198.47.19.16]:13415 "EHLO fllnx209.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752892AbdCPPop (ORCPT ); Thu, 16 Mar 2017 11:44:45 -0400 From: "Andrew F. Davis" To: Evgeniy Polyakov , Greg Kroah-Hartman CC: , , "Andrew F . Davis" Subject: [PATCH 1/3] w1: Use kernel common min() implementation Date: Thu, 16 Mar 2017 10:19:53 -0500 Message-ID: <20170316151955.10710-2-afd@ti.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170316151955.10710-1-afd@ti.com> References: <20170316151955.10710-1-afd@ti.com> MIME-Version: 1.0 Content-Type: text/plain Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Signed-off-by: Andrew F. Davis --- drivers/w1/w1_netlink.c | 4 +--- 1 file changed, 1 insertion(+), 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, -- 2.11.0