[alsa-devel] [PATCH 0/7 linux-next] sound: constify of_device_id array
This small patchset adds const to of_device_id arrays in sound branch.
Fabian Frederick (7): ALSA: aoa: constify of_device_id array ASoC: fsl: constify of_device_id array ASoC: kirkwood: constify of_device_id array ASoC: rt5631: constify of_device_id array ASoC: ak4554: constify of_device_id array ASoC: fsi: constify of_device_id array ASoC: rsnd: constify of_device_id array
sound/aoa/soundbus/i2sbus/core.c | 2 +- sound/soc/codecs/ak4554.c | 2 +- sound/soc/codecs/rt5631.c | 2 +- sound/soc/fsl/mpc5200_psc_ac97.c | 2 +- sound/soc/fsl/mpc5200_psc_i2s.c | 2 +- sound/soc/fsl/pcm030-audio-fabric.c | 2 +- sound/soc/kirkwood/kirkwood-i2s.c | 2 +- sound/soc/sh/fsi.c | 4 ++-- sound/soc/sh/rcar/core.c | 2 +- 9 files changed, 10 insertions(+), 10 deletions(-)
of_device_id is always used as const. (See driver.of_match_table and open firmware functions)
Signed-off-by: Fabian Frederick fabf@skynet.be --- sound/aoa/soundbus/i2sbus/core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sound/aoa/soundbus/i2sbus/core.c b/sound/aoa/soundbus/i2sbus/core.c index b9737fa..1cbf210 100644 --- a/sound/aoa/soundbus/i2sbus/core.c +++ b/sound/aoa/soundbus/i2sbus/core.c @@ -31,7 +31,7 @@ module_param(force, int, 0444); MODULE_PARM_DESC(force, "Force loading i2sbus even when" " no layout-id property is present");
-static struct of_device_id i2sbus_match[] = { +static const struct of_device_id i2sbus_match[] = { { .name = "i2s" }, { } };
At Wed, 18 Mar 2015 17:48:56 +0100, Fabian Frederick wrote:
of_device_id is always used as const. (See driver.of_match_table and open firmware functions)
Signed-off-by: Fabian Frederick fabf@skynet.be
Thanks, applied this one. The rest ASoC patches are left to Mark.
Takashi
sound/aoa/soundbus/i2sbus/core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sound/aoa/soundbus/i2sbus/core.c b/sound/aoa/soundbus/i2sbus/core.c index b9737fa..1cbf210 100644 --- a/sound/aoa/soundbus/i2sbus/core.c +++ b/sound/aoa/soundbus/i2sbus/core.c @@ -31,7 +31,7 @@ module_param(force, int, 0444); MODULE_PARM_DESC(force, "Force loading i2sbus even when" " no layout-id property is present");
-static struct of_device_id i2sbus_match[] = { +static const struct of_device_id i2sbus_match[] = { { .name = "i2s" }, { } }; -- 1.9.1
Alsa-devel mailing list Alsa-devel@alsa-project.org http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
of_device_id is always used as const. (See driver.of_match_table and open firmware functions)
Signed-off-by: Fabian Frederick fabf@skynet.be --- sound/soc/fsl/mpc5200_psc_ac97.c | 2 +- sound/soc/fsl/mpc5200_psc_i2s.c | 2 +- sound/soc/fsl/pcm030-audio-fabric.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/sound/soc/fsl/mpc5200_psc_ac97.c b/sound/soc/fsl/mpc5200_psc_ac97.c index 08d2a80..0bab760 100644 --- a/sound/soc/fsl/mpc5200_psc_ac97.c +++ b/sound/soc/fsl/mpc5200_psc_ac97.c @@ -326,7 +326,7 @@ static int psc_ac97_of_remove(struct platform_device *op) }
/* Match table for of_platform binding */ -static struct of_device_id psc_ac97_match[] = { +static const struct of_device_id psc_ac97_match[] = { { .compatible = "fsl,mpc5200-psc-ac97", }, { .compatible = "fsl,mpc5200b-psc-ac97", }, {} diff --git a/sound/soc/fsl/mpc5200_psc_i2s.c b/sound/soc/fsl/mpc5200_psc_i2s.c index 51fb0c0..d823294 100644 --- a/sound/soc/fsl/mpc5200_psc_i2s.c +++ b/sound/soc/fsl/mpc5200_psc_i2s.c @@ -217,7 +217,7 @@ static int psc_i2s_of_remove(struct platform_device *op) }
/* Match table for of_platform binding */ -static struct of_device_id psc_i2s_match[] = { +static const struct of_device_id psc_i2s_match[] = { { .compatible = "fsl,mpc5200-psc-i2s", }, { .compatible = "fsl,mpc5200b-psc-i2s", }, {} diff --git a/sound/soc/fsl/pcm030-audio-fabric.c b/sound/soc/fsl/pcm030-audio-fabric.c index c44459d..ec73122 100644 --- a/sound/soc/fsl/pcm030-audio-fabric.c +++ b/sound/soc/fsl/pcm030-audio-fabric.c @@ -113,7 +113,7 @@ static int pcm030_fabric_remove(struct platform_device *op) return ret; }
-static struct of_device_id pcm030_audio_match[] = { +static const struct of_device_id pcm030_audio_match[] = { { .compatible = "phytec,pcm030-audio-fabric", }, {} };
of_device_id is always used as const. (See driver.of_match_table and open firmware functions)
Signed-off-by: Fabian Frederick fabf@skynet.be --- sound/soc/kirkwood/kirkwood-i2s.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sound/soc/kirkwood/kirkwood-i2s.c b/sound/soc/kirkwood/kirkwood-i2s.c index d194830..3a36d60 100644 --- a/sound/soc/kirkwood/kirkwood-i2s.c +++ b/sound/soc/kirkwood/kirkwood-i2s.c @@ -643,7 +643,7 @@ static int kirkwood_i2s_dev_remove(struct platform_device *pdev) }
#ifdef CONFIG_OF -static struct of_device_id mvebu_audio_of_match[] = { +static const struct of_device_id mvebu_audio_of_match[] = { { .compatible = "marvell,kirkwood-audio" }, { .compatible = "marvell,dove-audio" }, { .compatible = "marvell,armada370-audio" },
On Wed, Mar 18, 2015 at 05:48:58PM +0100, Fabian Frederick wrote:
of_device_id is always used as const. (See driver.of_match_table and open firmware functions)
Applied, thanks.
of_device_id is always used as const. (See driver.of_match_table and open firmware functions)
Signed-off-by: Fabian Frederick fabf@skynet.be --- sound/soc/codecs/rt5631.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sound/soc/codecs/rt5631.c b/sound/soc/codecs/rt5631.c index c618527..2c10d77 100644 --- a/sound/soc/codecs/rt5631.c +++ b/sound/soc/codecs/rt5631.c @@ -1675,7 +1675,7 @@ static const struct i2c_device_id rt5631_i2c_id[] = { MODULE_DEVICE_TABLE(i2c, rt5631_i2c_id);
#ifdef CONFIG_OF -static struct of_device_id rt5631_i2c_dt_ids[] = { +static const struct of_device_id rt5631_i2c_dt_ids[] = { { .compatible = "realtek,rt5631"}, { .compatible = "realtek,alc5631"}, { }
On Wed, Mar 18, 2015 at 05:48:59PM +0100, Fabian Frederick wrote:
of_device_id is always used as const. (See driver.of_match_table and open firmware functions)
Applied, thanks.
of_device_id is always used as const. (See driver.of_match_table and open firmware functions)
Signed-off-by: Fabian Frederick fabf@skynet.be --- sound/soc/codecs/ak4554.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sound/soc/codecs/ak4554.c b/sound/soc/codecs/ak4554.c index 16ce9f9..298dedc 100644 --- a/sound/soc/codecs/ak4554.c +++ b/sound/soc/codecs/ak4554.c @@ -84,7 +84,7 @@ static int ak4554_soc_remove(struct platform_device *pdev) return 0; }
-static struct of_device_id ak4554_of_match[] = { +static const struct of_device_id ak4554_of_match[] = { { .compatible = "asahi-kasei,ak4554" }, {}, };
On Wed, Mar 18, 2015 at 05:49:00PM +0100, Fabian Frederick wrote:
of_device_id is always used as const. (See driver.of_match_table and open firmware functions)
Applied, thanks.
of_device_id is always used as const. (See driver.of_match_table and open firmware functions)
Signed-off-by: Fabian Frederick fabf@skynet.be --- sound/soc/sh/fsi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/sound/soc/sh/fsi.c b/sound/soc/sh/fsi.c index bb20550..b593e28 100644 --- a/sound/soc/sh/fsi.c +++ b/sound/soc/sh/fsi.c @@ -1882,7 +1882,7 @@ static void fsi_handler_init(struct fsi_priv *fsi, } }
-static struct of_device_id fsi_of_match[]; +static const struct of_device_id fsi_of_match[]; static int fsi_probe(struct platform_device *pdev) { struct fsi_master *master; @@ -2100,7 +2100,7 @@ static struct fsi_core fsi2_core = { .b_mclk = B_MST_CTLR, };
-static struct of_device_id fsi_of_match[] = { +static const struct of_device_id fsi_of_match[] = { { .compatible = "renesas,sh_fsi", .data = &fsi1_core}, { .compatible = "renesas,sh_fsi2", .data = &fsi2_core}, {},
of_device_id is always used as const. (See driver.of_match_table and open firmware functions)
Signed-off-by: Fabian Frederick fabf@skynet.be --- sound/soc/sh/rcar/core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sound/soc/sh/rcar/core.c b/sound/soc/sh/rcar/core.c index be03474..e9bac7c 100644 --- a/sound/soc/sh/rcar/core.c +++ b/sound/soc/sh/rcar/core.c @@ -107,7 +107,7 @@ static struct rsnd_of_data rsnd_of_data_gen2 = { .flags = RSND_GEN2, };
-static struct of_device_id rsnd_of_match[] = { +static const struct of_device_id rsnd_of_match[] = { { .compatible = "renesas,rcar_sound-gen1", .data = &rsnd_of_data_gen1 }, { .compatible = "renesas,rcar_sound-gen2", .data = &rsnd_of_data_gen2 }, {},
participants (3)
-
Fabian Frederick -
Mark Brown -
Takashi Iwai