From patchwork Tue Mar 31 01:31:02 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabio Estevam X-Patchwork-Id: 6126801 Return-Path: X-Original-To: patchwork-alsa-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 71861BF4A6 for ; Tue, 31 Mar 2015 01:31:38 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 68E14203C3 for ; Tue, 31 Mar 2015 01:31:37 +0000 (UTC) Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.kernel.org (Postfix) with ESMTP id 24AA7203A1 for ; Tue, 31 Mar 2015 01:31:36 +0000 (UTC) Received: by alsa0.perex.cz (Postfix, from userid 1000) id 55B582606EB; Tue, 31 Mar 2015 03:31:34 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Spam-Level: X-Spam-Status: No, score=-1.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, NO_DNS_FOR_FROM, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=no version=3.3.1 Received: from alsa0.perex.cz (localhost [IPv6:::1]) by alsa0.perex.cz (Postfix) with ESMTP id C5C99260609; Tue, 31 Mar 2015 03:31:26 +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 20A8A260616; Tue, 31 Mar 2015 03:31:25 +0200 (CEST) Received: from mail-qc0-f178.google.com (mail-qc0-f178.google.com [209.85.216.178]) by alsa0.perex.cz (Postfix) with ESMTP id CD311260603 for ; Tue, 31 Mar 2015 03:31:17 +0200 (CEST) Received: by qcgx3 with SMTP id x3so2435576qcg.3 for ; Mon, 30 Mar 2015 18:31:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=dZhuxZuedzOieANNSlXRSy7GtFKDwohZ1YS5S+1G/9c=; b=TLDbk3hxdfbjJxs6WI6Zl+macdJJlDGJgQhF/gX1lttCIC83X5zlv7VnHpyqmrZW/i mOiC23RIuuPyQssKN3pPCTlgKViCmPGDUG0XsMHy313W5jTRlf7XtGyhjPgXyBU4k4dh HApBHW0ce2MrnjI/PeR3FzS6c1CvAGgausFd6dEK9yvrmbRJ4GDWtFrQa5GZ9P395OaN tAsIhahE9EF99/5CMB4EXP6nYA6ZcaR84sRxiKHpDXf9zkcl4h5Yh9zSDBRbPGBfLNYO I5ITdtKqDj8/zNuU9+UaWMGQunDDCydWTeQKZ86mf/CZrI5exso7LbQin8aRGXh7SrY3 Se0w== X-Received: by 10.140.106.244 with SMTP id e107mr21446762qgf.0.1427765476759; Mon, 30 Mar 2015 18:31:16 -0700 (PDT) Received: from localhost.localdomain ([187.66.157.195]) by mx.google.com with ESMTPSA id 2sm8969370qgg.31.2015.03.30.18.31.13 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 30 Mar 2015 18:31:15 -0700 (PDT) From: Fabio Estevam To: broonie@kernel.org Date: Mon, 30 Mar 2015 22:31:02 -0300 Message-Id: <1427765462-7318-1-git-send-email-festevam@gmail.com> X-Mailer: git-send-email 1.9.1 Cc: Fabio Estevam , alsa-devel@alsa-project.org, peda@axentia.se Subject: [alsa-devel] [PATCH] ASoC: pcm512x: Do not redefine DIV_ROUND_CLOSEST_ULL 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 X-Virus-Scanned: ClamAV using ClamSMTP From: Fabio Estevam DIV_ROUND_CLOSEST_ULL is already defined at , so use the definition from this header file rather than re-defining it locally. This fixes the following build warning: sound/soc/codecs/pcm512x.c:34:0: warning: "DIV_ROUND_CLOSEST_ULL" redefined [enabled by default] In file included from include/linux/list.h:8:0, from include/linux/module.h:9, from sound/soc/codecs/pcm512x.c:19: include/linux/kernel.h:110:0: note: this is the location of the previous definition Reported-by: Olof's autobuilder Signed-off-by: Fabio Estevam --- sound/soc/codecs/pcm512x.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sound/soc/codecs/pcm512x.c b/sound/soc/codecs/pcm512x.c index 5a30fdd..e12764d 100644 --- a/sound/soc/codecs/pcm512x.c +++ b/sound/soc/codecs/pcm512x.c @@ -18,6 +18,7 @@ #include #include #include +#include #include #include #include @@ -31,8 +32,6 @@ #define DIV_ROUND_DOWN_ULL(ll, d) \ ({ unsigned long long _tmp = (ll); do_div(_tmp, d); _tmp; }) -#define DIV_ROUND_CLOSEST_ULL(ll, d) \ - ({ unsigned long long _tmp = (ll)+(d)/2; do_div(_tmp, d); _tmp; }) #define PCM512x_NUM_SUPPLIES 3 static const char * const pcm512x_supply_names[PCM512x_NUM_SUPPLIES] = {