From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.7 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, UNPARSEABLE_RELAY autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 37FE8C4360C for ; Thu, 26 Sep 2019 21:36:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 12E04222C2 for ; Thu, 26 Sep 2019 21:36:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1725991AbfIZVg5 (ORCPT ); Thu, 26 Sep 2019 17:36:57 -0400 Received: from varys.harry.pm ([206.189.117.216]:39136 "EHLO varys.harry.pm" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725280AbfIZVg4 (ORCPT ); Thu, 26 Sep 2019 17:36:56 -0400 X-Greylist: delayed 382 seconds by postgrey-1.27 at vger.kernel.org; Thu, 26 Sep 2019 17:36:56 EDT Received: from authenticated-user (PRIMARY_HOSTNAME [PUBLIC_IP]) by varys.harry.pm (Postfix) with ESMTPA id A262C68868; Thu, 26 Sep 2019 21:30:32 +0000 (UTC) From: Harry Jeffery To: linux-kernel@vger.kernel.org Cc: Harry Jeffery Subject: [PATCH] btree: Remove custom MAX macro Date: Thu, 26 Sep 2019 22:34:05 +0100 Message-Id: <20190926213405.91757-1-me@harry.pm> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spamd-Bar: ++++ Authentication-Results: varys.harry.pm; auth=pass smtp.auth=me@harry.pm smtp.mailfrom=me@harry.pm Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The btree implementation defines its own MAX macro, whilst also including kernel.h, which already defines a max macro. This removes the custom implementation in favour of the standard one provided in kernel.h Signed-off-by: Harry Jeffery --- lib/btree.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/btree.c b/lib/btree.c index b4cf08a5c267..4b5968b6167b 100644 --- a/lib/btree.c +++ b/lib/btree.c @@ -43,8 +43,7 @@ #include #include -#define MAX(a, b) ((a) > (b) ? (a) : (b)) -#define NODESIZE MAX(L1_CACHE_BYTES, 128) +#define NODESIZE max(L1_CACHE_BYTES, 128) struct btree_geo { int keylen; -- 2.23.0