From patchwork Tue Jul 25 01:12:36 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 108600 Delivered-To: patch@linaro.org Received: by 10.140.101.44 with SMTP id t41csp4678021qge; Mon, 24 Jul 2017 18:13:16 -0700 (PDT) X-Received: by 10.28.51.5 with SMTP id z5mr5832064wmz.80.1500945196218; Mon, 24 Jul 2017 18:13:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1500945196; cv=none; d=google.com; s=arc-20160816; b=WuC5/fgg2voa/ODvD6L7zKzxFGhM0sf++wEPhmMSRmY4xMPHUToDireiLq99abcHbG nIfpOFoQ7Z9nF22a1BrQg4Q+LNDVH8EVTZKFBz/53u3McDQng+/Tqyz8m8EWFvioEzH8 Gnv2j7czn7ET0bOw4PgeXyViGndlop8qt7TkLqDAuqahPS2o5YEeUMGnVJa7mbdk23iW jLnx/jaCKRHvs+S0X3zoqV/vxCQXsfsIg7zFYj/uMiLJPfiZqEeN8Ben5MU7xspFF40z 4yEjLD0K3/jfmiMeICuSLLM/0OXls1bPThZMoy+X0Hr3fco/NaGLBraAKLmrwDw09pv+ y3BA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:cc:message-id:date:to:from :dkim-signature:dkim-filter:delivered-to:arc-authentication-results; bh=vTERj/s87Oh0g5bpOuXpb19YLOx9H4Ug9GTcVZvsI5c=; b=VNgHa67RrXuHSKuV5mIRAdyNSO9YL5gxs6VLD4Ba7K1gRAQmiaH2p5vXor5YobuEd/ EzF5SXxbx1yJeINfRo6b7XqtnNhBI56zWRLswDlm3kBUUfZspitdfKSthh4tZ01yX96f EwVCyAnUkNusrJoh3Gp/eqDZ1v1M4SRFiaiHm5/GIE8y+ZOWSIzmfnXyrYjzCLoeUXAF I3NpcYZb/SP7uQzjO+WzgwGhPwDd+8gj67UDnwOpNLz2xyVSLNVnrszaZuqBBcmEOHug vfxBMcKkWF6K/T6r/XTmErMP1Q3JQ3suVqn6QC40L4X9OV5MZB3RGWShiLzos5JMlZ0f sjlw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@nifty.com header.b=OCiI+pvR; spf=pass (google.com: domain of alsa-devel-bounces@alsa-project.org designates 77.48.224.243 as permitted sender) smtp.mailfrom=alsa-devel-bounces@alsa-project.org Return-Path: Received: from alsa0.perex.cz (alsa0.perex.cz. [77.48.224.243]) by mx.google.com with ESMTP id m62si710244wmi.187.2017.07.24.18.13.15; Mon, 24 Jul 2017 18:13:16 -0700 (PDT) Received-SPF: pass (google.com: domain of alsa-devel-bounces@alsa-project.org designates 77.48.224.243 as permitted sender) client-ip=77.48.224.243; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@nifty.com header.b=OCiI+pvR; spf=pass (google.com: domain of alsa-devel-bounces@alsa-project.org designates 77.48.224.243 as permitted sender) smtp.mailfrom=alsa-devel-bounces@alsa-project.org Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 48295266EC4; Tue, 25 Jul 2017 03:13:14 +0200 (CEST) X-Original-To: alsa-devel@alsa-project.org Delivered-To: alsa-devel@alsa-project.org Received: by alsa0.perex.cz (Postfix, from userid 1000) id 7C9D2266EDD; Tue, 25 Jul 2017 03:13:13 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mail1.perex.cz X-Spam-Level: X-Spam-Status: No, score=1.0 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, SPF_SOFTFAIL,URIBL_BLOCKED autolearn=disabled version=3.4.0 Received: from conuserg-07.nifty.com (conuserg-07.nifty.com [210.131.2.74]) by alsa0.perex.cz (Postfix) with ESMTP id 40982266EBF for ; Tue, 25 Jul 2017 03:13:09 +0200 (CEST) Received: from pug.e01.socionext.com (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-07.nifty.com with ESMTP id v6P1ClI7007350; Tue, 25 Jul 2017 10:12:48 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-07.nifty.com v6P1ClI7007350 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1500945169; bh=e2JUfo6ueFZql/YehaM67Hpcm3SHVbD35WO8FFhC5MI=; h=From:To:Cc:Subject:Date:From; b=OCiI+pvRR20MjmdYfovjYwjkOdUTtdgNdaU9x8HBrofo4XtcmASKRQoE6ptQ3abOz mPHqa3LWRstFG5jkRDsKU1ZTG+r7IDM1Jm1KiB4+UqXxci64keKjFeKlWpUl7PbJKQ 0OC+thuzbf2CU2pWE5Ggx9jn5gSwI1woOlhnyB5M9ZEc5NyOGUKIuSTmVTSyaOHLTs PUyrMGzHj99hjeBnSWfLYaNowFlyaV7Djro2cSEOnqQHwRNQfOnpdJQp2extyvtWvU mDpO58Wag9vsbddiBG+u77ZrhEGs6NQsM4M5c8QCyCnb40PotTDYEtkhZQFw4T3u/3 039llIQDQ0XNA== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: Andrew Morton Date: Tue, 25 Jul 2017 10:12:36 +0900 Message-Id: <1500945156-12907-1-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 Cc: Boris Brezillon , alsa-devel@alsa-project.org, Richard Weinberger , Marek Vasut , linux-kernel@vger.kernel.org, Takashi Iwai , Liam Girdwood , Masahiro Yamada , Mark Brown , linux-mtd@lists.infradead.org, Cyrille Pitchen , Brian Norris , David Woodhouse Subject: [alsa-devel] [PATCH] linux/kernel.h: move DIV_ROUND_DOWN_ULL() macro X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org This macro is useful to avoid link error on 32-bit systems. We have the same definition in two drivers, so move it to include/linux/kernel.h While we are here, refactor DIV_ROUND_UP_ULL() by using DIV_ROUND_DOWN_ULL(). Signed-off-by: Masahiro Yamada --- drivers/mtd/nand/denali.c | 3 --- include/linux/kernel.h | 7 +++++-- sound/soc/codecs/pcm512x.c | 3 --- 3 files changed, 5 insertions(+), 8 deletions(-) -- 2.7.4 _______________________________________________ Alsa-devel mailing list Alsa-devel@alsa-project.org http://mailman.alsa-project.org/mailman/listinfo/alsa-devel diff --git a/drivers/mtd/nand/denali.c b/drivers/mtd/nand/denali.c index d723be352148..3087b0ba7b7f 100644 --- a/drivers/mtd/nand/denali.c +++ b/drivers/mtd/nand/denali.c @@ -980,9 +980,6 @@ static int denali_erase(struct mtd_info *mtd, int page) return irq_status & INTR__ERASE_COMP ? 0 : NAND_STATUS_FAIL; } -#define DIV_ROUND_DOWN_ULL(ll, d) \ - ({ unsigned long long _tmp = (ll); do_div(_tmp, d); _tmp; }) - static int denali_setup_data_interface(struct mtd_info *mtd, int chipnr, const struct nand_data_interface *conf) { diff --git a/include/linux/kernel.h b/include/linux/kernel.h index 96381f2b0e09..2a254ae6f7f7 100644 --- a/include/linux/kernel.h +++ b/include/linux/kernel.h @@ -78,8 +78,11 @@ #define FIELD_SIZEOF(t, f) (sizeof(((t*)0)->f)) #define DIV_ROUND_UP __KERNEL_DIV_ROUND_UP -#define DIV_ROUND_UP_ULL(ll,d) \ - ({ unsigned long long _tmp = (ll)+(d)-1; do_div(_tmp, d); _tmp; }) + +#define DIV_ROUND_DOWN_ULL(ll, d) \ + ({ unsigned long long _tmp = (ll); do_div(_tmp, d); _tmp; }) + +#define DIV_ROUND_UP_ULL(ll, d) DIV_ROUND_DOWN_ULL((ll) + (d) - 1, (d)) #if BITS_PER_LONG == 32 # define DIV_ROUND_UP_SECTOR_T(ll,d) DIV_ROUND_UP_ULL(ll, d) diff --git a/sound/soc/codecs/pcm512x.c b/sound/soc/codecs/pcm512x.c index 72b19e62f626..ad3bfb894ee0 100644 --- a/sound/soc/codecs/pcm512x.c +++ b/sound/soc/codecs/pcm512x.c @@ -30,9 +30,6 @@ #include "pcm512x.h" -#define DIV_ROUND_DOWN_ULL(ll, d) \ - ({ unsigned long long _tmp = (ll); do_div(_tmp, d); _tmp; }) - #define PCM512x_NUM_SUPPLIES 3 static const char * const pcm512x_supply_names[PCM512x_NUM_SUPPLIES] = { "AVDD",