From patchwork Thu May 18 15:46:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexey Dobriyan X-Patchwork-Id: 95977 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp597401vqo; Thu, 18 May 2023 08:58:02 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4aSb/y+QYHyyw9rrr8dJHUMWcKE+mZ/8Bg2REhfR45EbIdm71JN6g6sQP1yjKIAWHhGF7m X-Received: by 2002:a17:90a:a411:b0:253:3cfa:e310 with SMTP id y17-20020a17090aa41100b002533cfae310mr3112597pjp.19.1684425482172; Thu, 18 May 2023 08:58:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684425482; cv=none; d=google.com; s=arc-20160816; b=h5BRQEXBqJtYxx8hDAT19DRnm4JTCvDv7PPoG+GgOoCHebRDJd6RYz7G3VxoSFl5cS dFEMk0q4+d5TTCpwSU2ZHo3iwOYlGaeyDIBUim/iRmY6n00x0pQuRgvlZFMdiJoI09TF k5MHOgWLdL99vK/I+IL5XCumhdasjfLDjhFnNiOME3lvNyOFa8Hh8ogvmQye9uOCypAY HmZp5OJskuBAwxH7AT/K/V7cCFfvoJ/Nqm3YHhTM17/cOp38AINf/V4X3fdCzaaDV+1C 13IKu0yA3tmLlaCGXI5k7jz1MbQvcdYuw35qUb6x7MqjGSxIc48OLvoSbf7WsEY8hwTe 2+dw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=yEZKMKV3a30xjKrkkWxSisXiqQtt0sbU7lcbWPA7pl4=; b=bVd+rcxhorzuJfy4p/4LF97v6Yi7A838zj66VrfdbaqlARZpwpxgPLimyjpllxNnni Tb7j04cC4xZylreOYhT5FIHZYo1PwieCGQolqvaZyirt+aaTrt48xKS5eRbIrdNTvMZL JRQ5KzaSrGMS/e/qCsS4clxEvwBV2jGARsh3MnkqaZLd46BTt7ex1q6lbJJrq2jluNjn UW2N0lcwlrti7JbOjSaRGAH43NuglQ+AbMzQ4rV2c1sOyxuQbHVCpmZ+GurBcwQZafpE TfT2tAU0K70fQDJywWlIneFDJITgx2iJLrRPsSdRDDLFs5oGuoLRxvW/meLvf0BOLggf LDQw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20221208 header.b=nleAiPCG; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id z186-20020a6333c3000000b0051b48085aaasi1672496pgz.858.2023.05.18.08.57.47; Thu, 18 May 2023 08:58:02 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20221208 header.b=nleAiPCG; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231945AbjERPrV (ORCPT + 99 others); Thu, 18 May 2023 11:47:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34122 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231845AbjERPrI (ORCPT ); Thu, 18 May 2023 11:47:08 -0400 Received: from mail-wm1-x32c.google.com (mail-wm1-x32c.google.com [IPv6:2a00:1450:4864:20::32c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 880A6135 for ; Thu, 18 May 2023 08:47:07 -0700 (PDT) Received: by mail-wm1-x32c.google.com with SMTP id 5b1f17b1804b1-3f4449fa085so14078425e9.0 for ; Thu, 18 May 2023 08:47:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1684424827; x=1687016827; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=yEZKMKV3a30xjKrkkWxSisXiqQtt0sbU7lcbWPA7pl4=; b=nleAiPCGTsiSqeXbC+uTlkoBeZpbHGS9vCgo5sq4Naz8KDLyD7RB40k9BHL9XLDQ9t 9oyDpy+g2sd39bOGg4YljSFV59hiqTX0wNNqjhN0KWXGPvVn2Mc7ue7HGcEz0G1H0px+ fKcS0ycFSf7rDjTvd7GUu+zpxODCjjiGd0i8negXwzcAxZHvGlgX92InvgpRYlVaQ3ls HBvk7pvcef/z2QNT/Ynfi1QU3oVK3wbaoZXbnrA0cs9QzDITQcDSB/uoIRB4r57l/YtC Fx1/wZMcRzwAgmpw7W7YVBPn83pJdb2OmeoMzjLChZMHmL33n85/XDNGbhSgyJC6y1HG 73Uw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684424827; x=1687016827; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=yEZKMKV3a30xjKrkkWxSisXiqQtt0sbU7lcbWPA7pl4=; b=X8BcUbsKgKZVqEJv6CN4FoWx50Tc7fLqmbtrElctrLnt5QjhKZijZjljidbiMInNyI +4v5H3aO/mk3wo4ypAPJ7Xjx4U1s7aenv35E8ZqS7mYEok98BMBCuM+QZtwXciVOzcW1 qFdUhX+EzuD6GtRCY8//K6wdAtznwtOPGDnxOQISFjtyOcXArqzfHYsNk1V9k6fVIO3B KkmBtXeLHuHUTCmM1Sb23fHxb4DaNhy7Wy+GeIsXJ0TUGpFQXL5pxvfazqE/D3UwOaJb 818IURfl7S5aNaIf5EDCA5aUNGidrQJ0YmCmDBGH6Td9HMOIfS6DWDT62kRzstO6a1oB dwBw== X-Gm-Message-State: AC+VfDzxNelouCM7R7HIEODTPUHYPFEH3V4oxo2qy+ofRNYlDeIhu41G afZt7PBLSoj+CPYlJMeETsdnLOIIhg== X-Received: by 2002:a1c:f413:0:b0:3f4:298b:d925 with SMTP id z19-20020a1cf413000000b003f4298bd925mr1540626wma.41.1684424826922; Thu, 18 May 2023 08:47:06 -0700 (PDT) Received: from p183.Dlink ([46.53.250.37]) by smtp.gmail.com with ESMTPSA id h2-20020a1ccc02000000b003f421979398sm5671769wmb.26.2023.05.18.08.47.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 May 2023 08:47:06 -0700 (PDT) From: Alexey Dobriyan To: akpm@linux-foundation.org Cc: linux-kernel@vger.kernel.org, adobriyan@gmail.com Subject: [PATCH 7/8] auto: promote DIV_S64_ROUND_CLOSEST macro to function Date: Thu, 18 May 2023 18:46:48 +0300 Message-Id: <20230518154648.581643-7-adobriyan@gmail.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230518154648.581643-1-adobriyan@gmail.com> References: <20230518154648.581643-1-adobriyan@gmail.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1766248134454630953?= X-GMAIL-MSGID: =?utf-8?q?1766248134454630953?= so that people don't use "auto" in it. Both arguments are cast to specific types so it's OK to move them to function arguments: s64 __x = (dividend); s32 __d = (divisor); Delete useless () while I'm at it. Signed-off-by: Alexey Dobriyan --- include/linux/math64.h | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/include/linux/math64.h b/include/linux/math64.h index 3ab235c8a94c..7ecae251b0f4 100644 --- a/include/linux/math64.h +++ b/include/linux/math64.h @@ -335,21 +335,20 @@ static inline u64 DIV_U64_ROUND_CLOSEST(u64 dividend, u32 divisor) /** * DIV_S64_ROUND_CLOSEST - signed 64bit divide with 32bit divisor rounded to nearest integer - * @dividend: signed 64bit dividend - * @divisor: signed 32bit divisor + * @x: signed 64bit dividend + * @d: signed 32bit divisor * * Divide signed 64bit dividend by signed 32bit divisor * and round to closest integer. * * Return: dividend / divisor rounded to nearest integer */ -#define DIV_S64_ROUND_CLOSEST(dividend, divisor)( \ -{ \ - s64 __x = (dividend); \ - s32 __d = (divisor); \ - ((__x > 0) == (__d > 0)) ? \ - div_s64((__x + (__d / 2)), __d) : \ - div_s64((__x - (__d / 2)), __d); \ -} \ -) +static inline s64 DIV_S64_ROUND_CLOSEST(s64 x, s32 d) +{ + if ((x > 0) == (d > 0)) { + return div_s64(x + d / 2, d); + } else { + return div_s64(x - d / 2, d); + } +} #endif /* _LINUX_MATH64_H */