From patchwork Fri Nov 8 18:49:20 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 178943 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp3141123ilf; Fri, 8 Nov 2019 11:07:51 -0800 (PST) X-Google-Smtp-Source: APXvYqxjuoLvuHUr6wApp6qGATaCpTzuwSPp82nir32eDkv1TLPoWqQ7v39EmB/7pJr1w3Dsfnw1 X-Received: by 2002:a17:906:4e99:: with SMTP id v25mr10462164eju.106.1573240071629; Fri, 08 Nov 2019 11:07:51 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1573240071; cv=none; d=google.com; s=arc-20160816; b=xjRKd18IxVTF3EcxJAjI70LZHYm3coOf5gVVb7TbMR7kr4vzR6aR927kPhRYJHCPF4 cvO+U3cWHXC035CUmH5OJDuUHm5Biy71KI/u6BXPg3PiXii4IDkheFWY2y3kUU6OPChg hg+Oeav/53kdlrpz20XUSNOF08mI3ADlbJojGGTIybm415bXuzIs+5as4xqCYvaiHE9J I2oULpyDGLPqTvvNI6qB+QVq+eDcQ9HOSJ2j5Hspg90xDWNIGfTAGuall1tYAYFsU4ol AqHy97zRDY0Pi824tH2+m7mRYZCa7chvNhAz4AiuNfKdtdVTpSMTfwiqUJq5Wrktx2fE iShg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=H1ZcaJ0vU4WLqDakv2TBSFJboT8r3JmY5gfeKdTY04w=; b=Q5dGLqA5DEoOFYgISuG8z8FMghLDA02y6dEs3cCZX9M+S8QPQBrSQDEX9ucPEPpum7 C6DFnN9fCqbtqqXWVH7vbjwgvXEZBKGxE/STkZCGL5EDWmreabCY6YxeleoNG/cwTXQH 5ZDmxb9Ri++hxWhGka1MfYkoKXQyTCJ2BHiNAIxNzYMhlMxkCCw0Nhb5tfCj6T6ZUCqH N5n4jZLQXCnHa4djYVaUk0AqGrHUlmlDzc0b4/AS1Kad5pKMy5SlUJYxtkkjkMX1KhkV TvsOESn085LX6TgRC5AZi6o0LMGz9AxKPo4yqP2AjcprstHDWRGEWFCUfVNKtPV2egoU ezAw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="Tcc3Wxj/"; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id r18si4679052edw.65.2019.11.08.11.07.51; Fri, 08 Nov 2019 11:07:51 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="Tcc3Wxj/"; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2391472AbfKHTHl (ORCPT + 26 others); Fri, 8 Nov 2019 14:07:41 -0500 Received: from mail.kernel.org ([198.145.29.99]:38416 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2390951AbfKHTHi (ORCPT ); Fri, 8 Nov 2019 14:07:38 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 9CE792196F; Fri, 8 Nov 2019 19:07:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1573240058; bh=+f5fV1K5SfaR6N41ceXQ6zF7T0/XN+l1jzOcTOiNBzU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Tcc3Wxj/8N8OPmshwW5hEujXctSpTLizCwfFrfJJMQ7BchLHjbmZ8+COwDQO2tsrA 0Y/8NVBu6/C311Ciu/ZX5n74MSyjztdKU2W9aaZ86Q7G5lWxam4aaD22O21XGDfBaj e4ey7PJ1TRa7m2g+6Giq7bRtGldekKGKuGBXWYfE= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Daniel Baluta , Mark Brown , Sasha Levin Subject: [PATCH 5.3 032/140] ASoC: simple_card_utils.h: Fix potential multiple redefinition error Date: Fri, 8 Nov 2019 19:49:20 +0100 Message-Id: <20191108174906.376128216@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191108174900.189064908@linuxfoundation.org> References: <20191108174900.189064908@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Daniel Baluta [ Upstream commit af6219590b541418d3192e9bfa03989834ca0e78 ] asoc_simple_debug_info and asoc_simple_debug_dai must be static otherwise we might a compilation error if the compiler decides not to inline the given function. Fixes: 0580dde59438686d ("ASoC: simple-card-utils: add asoc_simple_debug_info()") Signed-off-by: Daniel Baluta Link: https://lore.kernel.org/r/20191009153615.32105-3-daniel.baluta@nxp.com Signed-off-by: Mark Brown Signed-off-by: Sasha Levin --- include/sound/simple_card_utils.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) -- 2.20.1 diff --git a/include/sound/simple_card_utils.h b/include/sound/simple_card_utils.h index 985a5f583de4c..31f76b6abf712 100644 --- a/include/sound/simple_card_utils.h +++ b/include/sound/simple_card_utils.h @@ -135,9 +135,9 @@ int asoc_simple_init_priv(struct asoc_simple_priv *priv, struct link_info *li); #ifdef DEBUG -inline void asoc_simple_debug_dai(struct asoc_simple_priv *priv, - char *name, - struct asoc_simple_dai *dai) +static inline void asoc_simple_debug_dai(struct asoc_simple_priv *priv, + char *name, + struct asoc_simple_dai *dai) { struct device *dev = simple_priv_to_dev(priv); @@ -167,7 +167,7 @@ inline void asoc_simple_debug_dai(struct asoc_simple_priv *priv, dev_dbg(dev, "%s clk %luHz\n", name, clk_get_rate(dai->clk)); } -inline void asoc_simple_debug_info(struct asoc_simple_priv *priv) +static inline void asoc_simple_debug_info(struct asoc_simple_priv *priv) { struct snd_soc_card *card = simple_priv_to_card(priv); struct device *dev = simple_priv_to_dev(priv);