[PATCH] ASoC: rt5645: Constify ACPI device ids

[PATCH] ASoC: rt5645: Constify ACPI device ids

[Mathias Krause]

Constify the ACPI device ID array, no need to have it writable at
runtime. Also drop the unused RT5645_INIT_REG_LEN define.

Signed-off-by: Mathias Krause <minipli@googlemail.com>
Cc: Bard Liao <bardliao@realtek.com>
Cc: Oder Chiou <oder_chiou@realtek.com>
Cc: John Lin <john.lin@realtek.com>
---
 sound/soc/codecs/rt5645.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/sound/soc/codecs/rt5645.c b/sound/soc/codecs/rt5645.c
index ef76940f9dcb..38a0b60a7f6e 100644
--- a/sound/soc/codecs/rt5645.c
+++ b/sound/soc/codecs/rt5645.c
@@ -64,7 +64,6 @@ static const struct reg_sequence init_list[] = {
 	{RT5645_PR_BASE + 0x21,	0x4040},
 	{RT5645_PR_BASE + 0x23,	0x0004},
 };
-#define RT5645_INIT_REG_LEN ARRAY_SIZE(init_list)
 
 static const struct reg_sequence rt5650_init_list[] = {
 	{0xf6,	0x0100},
@@ -3326,7 +3325,7 @@ static const struct i2c_device_id rt5645_i2c_id[] = {
 MODULE_DEVICE_TABLE(i2c, rt5645_i2c_id);
 
 #ifdef CONFIG_ACPI
-static struct acpi_device_id rt5645_acpi_match[] = {
+static const struct acpi_device_id rt5645_acpi_match[] = {
 	{ "10EC5645", 0 },
 	{ "10EC5650", 0 },
 	{},
-- 
1.7.10.4

Re: [PATCH] ASoC: rt5645: Constify ACPI device ids

[Mark Brown]

[-- Attachment #1.1: Type: text/plain, Size: 309 bytes --]

On Sat, Jan 02, 2016 at 11:23:56PM +0100, Mathias Krause wrote:
> Constify the ACPI device ID array, no need to have it writable at
> runtime. Also drop the unused RT5645_INIT_REG_LEN define.

Please don't mix multiple unrelated changes in a single patch,
especially when there's no content overlap at all :(

[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 473 bytes --]

[-- Attachment #2: Type: text/plain, Size: 0 bytes --]

Applied "ASoC: rt5645: Constify ACPI device ids" to the asoc tree

[Mark Brown]

The patch

   ASoC: rt5645: Constify ACPI device ids

has been applied to the asoc tree at

   git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git 

All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.  

You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying
to this mail.

Thanks,
Mark

>From e2973769372a3de1c20249206db5ee93287a2230 Mon Sep 17 00:00:00 2001
From: Mathias Krause <minipli@googlemail.com>
Date: Sat, 2 Jan 2016 23:23:56 +0100
Subject: [PATCH] ASoC: rt5645: Constify ACPI device ids

Constify the ACPI device ID array, no need to have it writable at
runtime. Also drop the unused RT5645_INIT_REG_LEN define.

Signed-off-by: Mathias Krause <minipli@googlemail.com>
Cc: Bard Liao <bardliao@realtek.com>
Cc: Oder Chiou <oder_chiou@realtek.com>
Cc: John Lin <john.lin@realtek.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
---
 sound/soc/codecs/rt5645.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/sound/soc/codecs/rt5645.c b/sound/soc/codecs/rt5645.c
index 57c8d9ecfde1..bd23496a56ff 100644
--- a/sound/soc/codecs/rt5645.c
+++ b/sound/soc/codecs/rt5645.c
@@ -64,7 +64,6 @@ static const struct reg_sequence init_list[] = {
 	{RT5645_PR_BASE + 0x21,	0x4040},
 	{RT5645_PR_BASE + 0x23,	0x0004},
 };
-#define RT5645_INIT_REG_LEN ARRAY_SIZE(init_list)
 
 static const struct reg_sequence rt5650_init_list[] = {
 	{0xf6,	0x0100},
@@ -3521,7 +3520,7 @@ static const struct i2c_device_id rt5645_i2c_id[] = {
 MODULE_DEVICE_TABLE(i2c, rt5645_i2c_id);
 
 #ifdef CONFIG_ACPI
-static struct acpi_device_id rt5645_acpi_match[] = {
+static const struct acpi_device_id rt5645_acpi_match[] = {
 	{ "10EC5645", 0 },
 	{ "10EC5650", 0 },
 	{},
-- 
2.6.2

Re: [PATCH] ASoC: rt5645: Constify ACPI device ids

[Mathias Krause]

On 4 January 2016 at 02:32, Mark Brown <broonie@kernel.org> wrote:
> On Sat, Jan 02, 2016 at 11:23:56PM +0100, Mathias Krause wrote:
>> Constify the ACPI device ID array, no need to have it writable at
>> runtime. Also drop the unused RT5645_INIT_REG_LEN define.
>
> Please don't mix multiple unrelated changes in a single patch,
> especially when there's no content overlap at all :(

I've seen you've applied the patch nonetheless. So I guess you don't
want me to split the patch any more?

Regards,
Mathias

Re: [PATCH] ASoC: rt5645: Constify ACPI device ids

[Mark Brown]

[-- Attachment #1.1: Type: text/plain, Size: 427 bytes --]

On Wed, Jan 06, 2016 at 09:01:28AM +0100, Mathias Krause wrote:
> On 4 January 2016 at 02:32, Mark Brown <broonie@kernel.org> wrote:

> > Please don't mix multiple unrelated changes in a single patch,
> > especially when there's no content overlap at all :(

> I've seen you've applied the patch nonetheless. So I guess you don't
> want me to split the patch any more?

No need to split this patch but in future don't do this.

[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 473 bytes --]

[-- Attachment #2: Type: text/plain, Size: 0 bytes --]