From: "Uwe Kleine-König" <u.kleine-koenig@pengutronix.de>
To: Mark Brown <broonie@kernel.org>
Cc: pierre-louis.bossart@linux.intel.com,
Cezary Rojewski <cezary.rojewski@intel.com>,
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 <linux@roeck-us.net>
Subject: [PATCH] ASoC: Intel: avs: Fix build error on arc, m68k and sparc
Date: Sun, 29 May 2022 08:05:03 +0200 [thread overview]
Message-ID: <20220529060503.av7cahnu3knhnord@pengutronix.de> (raw)
In-Reply-To: <20220529054807.uuqpsnt3w6dwlzuj@pengutronix.de>
[-- Attachment #1: Type: text/plain, Size: 1973 bytes --]
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 <u.kleine-koenig@pengutronix.de>
---
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(-)
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;
}
base-commit: beed983621fbdfd291e6e3a0cdc4d10517e60af8
--
2.36.1
--
Pengutronix e.K. | Uwe Kleine-König |
Industrial Linux Solutions | https://www.pengutronix.de/ |
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2022-05-29 6:06 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-05-16 10:11 [PATCH v3 00/15] ASoC: Intel: avs: Driver core and PCM operations Cezary Rojewski
2022-05-16 10:11 ` [PATCH v3 01/15] ASoC: Intel: avs: Account for libraries when booting basefw Cezary Rojewski
2022-05-16 10:11 ` [PATCH v3 02/15] ASoC: Intel: avs: Generic soc component driver Cezary Rojewski
2022-05-16 10:11 ` [PATCH v3 03/15] ASoC: Intel: avs: Generic PCM FE operations Cezary Rojewski
2022-05-16 10:11 ` [PATCH v3 04/15] ASoC: Intel: avs: non-HDA PCM BE operations Cezary Rojewski
2022-05-16 10:11 ` [PATCH v3 05/15] ASoC: Intel: avs: HDA " Cezary Rojewski
2022-05-16 10:11 ` [PATCH v3 06/15] ASoC: Intel: avs: Coredump and recovery flow Cezary Rojewski
2022-05-16 10:11 ` [PATCH v3 07/15] ASoC: Intel: avs: Prepare for firmware tracing Cezary Rojewski
2022-05-16 10:11 ` [PATCH v3 08/15] ASoC: Intel: avs: D0ix power state support Cezary Rojewski
2022-05-16 10:11 ` [PATCH v3 09/15] ASoC: Intel: avs: Event tracing Cezary Rojewski
2022-05-16 10:11 ` [PATCH v3 10/15] ASoC: Intel: avs: Replace link_mask usage with i2s_link_mask Cezary Rojewski
2022-05-16 10:11 ` [PATCH v3 11/15] ASoC: Intel: avs: Machine board registration Cezary Rojewski
2022-05-26 16:24 ` Guenter Roeck
2022-05-26 16:31 ` Cezary Rojewski
2022-05-26 17:09 ` Guenter Roeck
2022-05-26 17:44 ` Mark Brown
2022-05-29 5:48 ` Uwe Kleine-König
2022-05-29 6:05 ` Uwe Kleine-König [this message]
2022-05-29 6:21 ` [PATCH] ASoC: Intel: avs: Fix build error on arc, m68k and sparc Guenter Roeck
2022-05-29 13:24 ` [PATCH v3 11/15] ASoC: Intel: avs: Machine board registration Cezary Rojewski
2022-05-29 13:50 ` Uwe Kleine-König
2022-05-29 13:56 ` Cezary Rojewski
2022-05-29 14:12 ` [PATCH] ASoC: Intel: avs: Fix build error on arc, m68k and sparc Uwe Kleine-König
2022-05-30 13:29 ` Mark Brown
2022-05-30 20:19 ` Uwe Kleine-König
2022-05-31 10:41 ` Mark Brown
2022-05-30 13:29 ` [PATCH v3 11/15] ASoC: Intel: avs: Machine board registration Mark Brown
2022-05-16 10:11 ` [PATCH v3 12/15] ASoC: Intel: avs: PCI driver implementation Cezary Rojewski
2022-05-16 10:11 ` [PATCH v3 13/15] ASoC: Intel: avs: Power management Cezary Rojewski
2022-05-16 10:11 ` [PATCH v3 14/15] ASoC: Intel: avs: SKL-based platforms support Cezary Rojewski
2022-05-16 10:11 ` [PATCH v3 15/15] ASoC: Intel: avs: APL-based " Cezary Rojewski
2022-05-17 17:21 ` [PATCH v3 00/15] ASoC: Intel: avs: Driver core and PCM operations Mark Brown
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220529060503.av7cahnu3knhnord@pengutronix.de \
--to=u.kleine-koenig@pengutronix.de \
--cc=alsa-devel@alsa-project.org \
--cc=amadeuszx.slawinski@linux.intel.com \
--cc=broonie@kernel.org \
--cc=cezary.rojewski@intel.com \
--cc=cujomalainey@chromium.org \
--cc=hdegoede@redhat.com \
--cc=linux@roeck-us.net \
--cc=lma@semihalf.com \
--cc=pierre-louis.bossart@linux.intel.com \
--cc=rad@semihalf.com \
--cc=tiwai@suse.com \
--cc=upstream@semihalf.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).