From patchwork Sun May 29 06:05:03 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= X-Patchwork-Id: 12864123 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 5852DC433EF for ; Sun, 29 May 2022 06:06:26 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id AB0FC18ED; Sun, 29 May 2022 08:05:34 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz AB0FC18ED DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1653804384; bh=2Pp4RfRSiZFFeBldeG/sWA8r5tNyuW5QfKXZin9/xNM=; h=Date:From:To:Subject:References:In-Reply-To:Cc:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=Hr+kpR7czBmO4t83q2Hxonb2Jcnuuu/0kUm6r7eHAOHx8M1LFQAOlgXrS+w0PNFE5 irgXI/u4VDYhO5ej5xxcLcJCh3n9mRJHmEKBN5YKF0kboJEEi1j+RjiinrKWp7YSEP I1Nq7FowudHjcjq9h26VuOgtPucvnpu/EgIUF5R4= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 31515F80245; Sun, 29 May 2022 08:05:34 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 56777F8024C; Sun, 29 May 2022 08:05:32 +0200 (CEST) Received: from metis.ext.pengutronix.de (metis.ext.pengutronix.de [IPv6:2001:67c:670:201:290:27ff:fe1d:cc33]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id 54EBFF8010B for ; Sun, 29 May 2022 08:05:23 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 54EBFF8010B Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1nvC37-0005FG-O6; Sun, 29 May 2022 08:05:13 +0200 Received: from [2a0a:edc0:0:900:1d::77] (helo=ptz.office.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtp (Exim 4.94.2) (envelope-from ) id 1nvC30-005CXz-Vi; Sun, 29 May 2022 08:05:05 +0200 Received: from ukl by ptz.office.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1nvC2z-00Coe8-2E; Sun, 29 May 2022 08:05:05 +0200 Date: Sun, 29 May 2022 08:05:03 +0200 From: Uwe =?utf-8?q?Kleine-K=C3=B6nig?= To: Mark Brown Subject: [PATCH] ASoC: Intel: avs: Fix build error on arc, m68k and sparc Message-ID: <20220529060503.av7cahnu3knhnord@pengutronix.de> References: <20220516101116.190192-1-cezary.rojewski@intel.com> <20220516101116.190192-12-cezary.rojewski@intel.com> <20220526162443.GA60418@roeck-us.net> <20220529054807.uuqpsnt3w6dwlzuj@pengutronix.de> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20220529054807.uuqpsnt3w6dwlzuj@pengutronix.de> X-SA-Exim-Connect-IP: 2a0a:edc0:0:c01:1d::a2 X-SA-Exim-Mail-From: ukl@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: alsa-devel@alsa-project.org Cc: pierre-louis.bossart@linux.intel.com, Cezary Rojewski , upstream@semihalf.com, rad@semihalf.com, alsa-devel@alsa-project.org, tiwai@suse.com, hdegoede@redhat.com, lma@semihalf.com, amadeuszx.slawinski@linux.intel.com, cujomalainey@chromium.org, Guenter Roeck X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.15 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: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: "Alsa-devel" On some platforms (i.e. arc, m68k and sparc) __fls returns an int (while on most platforms it returns an unsigned long). This triggers a format warning on these few platforms as the driver uses %ld to print a warning. Replace it by fls (and %d) which returns an int everywhere and which is already used in the if condition triggering the warning. Fixes: beed983621fb ("ASoC: Intel: avs: Machine board registration") Signed-off-by: Uwe Kleine-König Reviewed-by: Guenter Roeck --- Hello again On Sun, May 29, 2022 at 07:48:18AM +0200, Uwe Kleine-König wrote: > Tell me if you don't want to squash this into beed983621fb and prefer a > formal patch. I just realized this isn't a problem in next only any more, but the commit is already in Linus Torvald's tree. So I guess this isn't fixed by a fixup of said commit and here comes a proper patch. sound/soc/intel/avs/board_selection.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) base-commit: beed983621fbdfd291e6e3a0cdc4d10517e60af8 diff --git a/sound/soc/intel/avs/board_selection.c b/sound/soc/intel/avs/board_selection.c index 80cb0164678a..f189f71b8e1e 100644 --- a/sound/soc/intel/avs/board_selection.c +++ b/sound/soc/intel/avs/board_selection.c @@ -325,8 +325,8 @@ static int avs_register_i2s_board(struct avs_dev *adev, struct snd_soc_acpi_mach num_ssps = adev->hw_cfg.i2s_caps.ctrl_count; if (fls(mach->mach_params.i2s_link_mask) > num_ssps) { - dev_err(adev->dev, "Platform supports %d SSPs but board %s requires SSP%ld\n", - num_ssps, mach->drv_name, __fls(mach->mach_params.i2s_link_mask)); + dev_err(adev->dev, "Platform supports %d SSPs but board %s requires SSP%d\n", + num_ssps, mach->drv_name, fls(mach->mach_params.i2s_link_mask)); return -ENODEV; }