From patchwork Wed Mar 30 20:42:27 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rikard Falkeborn X-Patchwork-Id: 12796339 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (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 47DD3C433F5 for ; Wed, 30 Mar 2022 20:43:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:Cc :To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=Jd6RqmHz24Qe5ZaNvIrioUYDSDUn/nHpm4+qPYubXZw=; b=SSCabTwwDg++bw 6IyHuS3w+xmiRrKouEIzNLAnwUQaV6RzjHTVNs08atR2StqASI/eimmjMOw77CRscrdiMiOoulvA3 Qk4VRtLj1YYMu4vO8E67tHdhuVk19psDrcZeP0PzO+XVR4GaBUOvpjMeCwGED55hzDRUVT2sMU08X vKAhSJq/99I25axVUCTaJEK32Y0uNa/Eu2eOP7euT9I9y5nWaPu8ryNIceOiYyOqcpb6WEKEUr2rJ RmdeQrEZ2xriqsHF/vr83BsHYeh+8OcEjRvRFtXM4xuyAm3y2djHjG4LASXp0ISD0vzkOPT9Orb55 4K4tcOepATBytKVX52TQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nZf9N-00HT2O-C1; Wed, 30 Mar 2022 20:42:41 +0000 Received: from mail-lj1-x22a.google.com ([2a00:1450:4864:20::22a]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nZf9K-00HT1p-EH; Wed, 30 Mar 2022 20:42:39 +0000 Received: by mail-lj1-x22a.google.com with SMTP id v12so16614489ljd.3; Wed, 30 Mar 2022 13:42:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=ICtX8vJXHq3AHfULAa1Lf6IAnjSqmJ3fVv5dGbQwOvQ=; b=TmG125jUIg3Tal8JAqGpY1kVFpBd80svhIAJgBA+U5h1DvQ/UbfOsbOAH24UWI/y3J wZ2l9kUhJreEkDzFc68E1WjyKxnxeZ2H55dxbIve5ixPtq58ejQhcInNC3LrFjWbyDLI DE16c9zjzgbDX5CQaG+WSx5fV3hx7GC1BjeHBEFJNaxYIE/LnEiosr0Ip1h0uo8+K0Vn bAx6eO27KQqwtaUqWgowkVTMOir9tVcmT0j9cUbgKHM8rPps+lCEp5jgaQI4i3PTjmwS oUAFhPeQiZVXpFse7AToqMFVGmt8LUcXgekSdzl03aoI77Txe+NSt2IdUDmxXwdhOYLo eFhg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=ICtX8vJXHq3AHfULAa1Lf6IAnjSqmJ3fVv5dGbQwOvQ=; b=dqof3Uqarr8BFvE77HPmV7uWuGk71K94HCw5l4iUYeBhPaJSaEpxODdjndd6wKYO3X E6XD4EMBXQeXoF3ll9Qep9MWCjfH2qXk+AXnnTk3rqio6GE88TVO6CcVuxtgsD/7x3AY sjKR65ATihKCqiBW7IUReG+9TX3auLkFuuq6+D6EG9n/g1JThmw0XmJAfv2zydssma0N aJ8UvoCyc/RBStCt+XW2+V+IlrZfWwK2wnp/rLpVp5hVHZhG0uh55CAknssLKC/nGzG3 Hwu2sVkkV+U5BFUFgKY11a4+d8KCuyljfq7Q6zKEhri0hNa+8r7lIqA5iiBtmSKcNTnt BHug== X-Gm-Message-State: AOAM531gADT8LXMMVQPQdbJP3Dl7RA0Zfb6mU/rE8u/IhentA2d9H5Av xMCp7eS7t+pG+odJloZU8Rg= X-Google-Smtp-Source: ABdhPJw1zU3I66y4H0SMYqrMyMfkJ/7RIzrRskwK10mMYT+5jMdZe1M3rv4gzdHPdGKJFOo2EWCTvw== X-Received: by 2002:a2e:a4a3:0:b0:24a:c0bf:3d32 with SMTP id g3-20020a2ea4a3000000b0024ac0bf3d32mr8381816ljm.161.1648672955447; Wed, 30 Mar 2022 13:42:35 -0700 (PDT) Received: from localhost.localdomain (h-82-196-111-188.NA.cust.bahnhof.se. [82.196.111.188]) by smtp.gmail.com with ESMTPSA id i1-20020a2e8641000000b00247d94a6ac5sm2532997ljj.2.2022.03.30.13.42.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 30 Mar 2022 13:42:34 -0700 (PDT) From: Rikard Falkeborn To: Krzysztof Kozlowski , Sylwester Nawrocki , Liam Girdwood , Mark Brown Cc: Jaroslav Kysela , Takashi Iwai , =?utf-8?q?Andreas_F=C3=A4rber?= , Manivannan Sadhasivam , alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-actions@lists.infradead.org, Kuninori Morimoto , Rikard Falkeborn Subject: [PATCH] ASoC: samsung: Constify snd_soc_dapm_{route,widget} structs Date: Wed, 30 Mar 2022 22:42:27 +0200 Message-Id: <20220330204227.25081-1-rikard.falkeborn@gmail.com> X-Mailer: git-send-email 2.35.1 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220330_134238_508228_C2326239 X-CRM114-Status: GOOD ( 10.68 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org These structs only have their address assigned to the dapm_{routes,widget} fields in the snd_soc_card struct, both which are pointers to const data. Make them const to allow the compiler to put them in read-only memory. Signed-off-by: Rikard Falkeborn Reviewed-by: Krzysztof Kozlowski --- sound/soc/samsung/bells.c | 4 ++-- sound/soc/samsung/littlemill.c | 4 ++-- sound/soc/samsung/lowland.c | 4 ++-- sound/soc/samsung/speyside.c | 4 ++-- sound/soc/samsung/tobermory.c | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/sound/soc/samsung/bells.c b/sound/soc/samsung/bells.c index 8b83f39c3ac9..76998a4a4cad 100644 --- a/sound/soc/samsung/bells.c +++ b/sound/soc/samsung/bells.c @@ -386,11 +386,11 @@ static struct snd_soc_codec_conf bells_codec_conf[] = { }, }; -static struct snd_soc_dapm_widget bells_widgets[] = { +static const struct snd_soc_dapm_widget bells_widgets[] = { SND_SOC_DAPM_MIC("DMIC", NULL), }; -static struct snd_soc_dapm_route bells_routes[] = { +static const struct snd_soc_dapm_route bells_routes[] = { { "Sub CLK_SYS", NULL, "OPCLK" }, { "CLKIN", NULL, "OPCLK" }, diff --git a/sound/soc/samsung/littlemill.c b/sound/soc/samsung/littlemill.c index 34067cc314ff..26c42892c059 100644 --- a/sound/soc/samsung/littlemill.c +++ b/sound/soc/samsung/littlemill.c @@ -228,7 +228,7 @@ static const struct snd_kcontrol_new controls[] = { SOC_DAPM_PIN_SWITCH("WM1250 Output"), }; -static struct snd_soc_dapm_widget widgets[] = { +static const struct snd_soc_dapm_widget widgets[] = { SND_SOC_DAPM_HP("Headphone", NULL), SND_SOC_DAPM_MIC("AMIC", NULL), @@ -239,7 +239,7 @@ static struct snd_soc_dapm_widget widgets[] = { SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMD), }; -static struct snd_soc_dapm_route audio_paths[] = { +static const struct snd_soc_dapm_route audio_paths[] = { { "Headphone", NULL, "HPOUT1L" }, { "Headphone", NULL, "HPOUT1R" }, diff --git a/sound/soc/samsung/lowland.c b/sound/soc/samsung/lowland.c index 7b12ccd2a9b2..8e4579fdcd7b 100644 --- a/sound/soc/samsung/lowland.c +++ b/sound/soc/samsung/lowland.c @@ -140,7 +140,7 @@ static const struct snd_kcontrol_new controls[] = { SOC_DAPM_PIN_SWITCH("Headphone"), }; -static struct snd_soc_dapm_widget widgets[] = { +static const struct snd_soc_dapm_widget widgets[] = { SND_SOC_DAPM_HP("Headphone", NULL), SND_SOC_DAPM_MIC("Headset Mic", NULL), @@ -150,7 +150,7 @@ static struct snd_soc_dapm_widget widgets[] = { SND_SOC_DAPM_MIC("Main DMIC", NULL), }; -static struct snd_soc_dapm_route audio_paths[] = { +static const struct snd_soc_dapm_route audio_paths[] = { { "Sub IN1", NULL, "HPOUT2L" }, { "Sub IN2", NULL, "HPOUT2R" }, diff --git a/sound/soc/samsung/speyside.c b/sound/soc/samsung/speyside.c index 37b1f4f60b21..1ae1a5aae72f 100644 --- a/sound/soc/samsung/speyside.c +++ b/sound/soc/samsung/speyside.c @@ -261,7 +261,7 @@ static const struct snd_kcontrol_new controls[] = { SOC_DAPM_PIN_SWITCH("Headphone"), }; -static struct snd_soc_dapm_widget widgets[] = { +static const struct snd_soc_dapm_widget widgets[] = { SND_SOC_DAPM_HP("Headphone", NULL), SND_SOC_DAPM_MIC("Headset Mic", NULL), @@ -271,7 +271,7 @@ static struct snd_soc_dapm_widget widgets[] = { SND_SOC_DAPM_MIC("Main DMIC", NULL), }; -static struct snd_soc_dapm_route audio_paths[] = { +static const struct snd_soc_dapm_route audio_paths[] = { { "IN1RN", NULL, "MICB1" }, { "IN1RP", NULL, "MICB1" }, { "IN1RN", NULL, "MICB2" }, diff --git a/sound/soc/samsung/tobermory.c b/sound/soc/samsung/tobermory.c index 8d3149a47a4c..4a56abfc243e 100644 --- a/sound/soc/samsung/tobermory.c +++ b/sound/soc/samsung/tobermory.c @@ -130,7 +130,7 @@ static const struct snd_kcontrol_new controls[] = { SOC_DAPM_PIN_SWITCH("DMIC"), }; -static struct snd_soc_dapm_widget widgets[] = { +static const struct snd_soc_dapm_widget widgets[] = { SND_SOC_DAPM_HP("Headphone", NULL), SND_SOC_DAPM_MIC("Headset Mic", NULL), @@ -140,7 +140,7 @@ static struct snd_soc_dapm_widget widgets[] = { SND_SOC_DAPM_SPK("Main Speaker", NULL), }; -static struct snd_soc_dapm_route audio_paths[] = { +static const struct snd_soc_dapm_route audio_paths[] = { { "Headphone", NULL, "HPOUTL" }, { "Headphone", NULL, "HPOUTR" },