[PATCH -next 0/5] sound: Remove redundant of_match_ptr() macro
Since these sound drivers depend on CONFIG_OF, there is no need to wrap the macro of_match_ptr() here.
Ruan Jinjie (5): ASoC: atmel: Remove redundant of_match_ptr() ASoC: atmel: tse850-pcm5142: Remove redundant of_match_ptr() ASoC: sunxi: sun4i-spdif: Remove redundant of_match_ptr() ASoC: ssm3515: Remove redundant of_match_ptr() ALSA: Remove redundant of_match_ptr()
sound/drivers/serial-generic.c | 2 +- sound/soc/atmel/atmel-i2s.c | 2 +- sound/soc/atmel/atmel-pdmic.c | 2 +- sound/soc/atmel/mchp-i2s-mcc.c | 2 +- sound/soc/atmel/mchp-spdifrx.c | 2 +- sound/soc/atmel/mchp-spdiftx.c | 2 +- sound/soc/atmel/tse850-pcm5142.c | 2 +- sound/soc/codecs/ssm3515.c | 2 +- sound/soc/sunxi/sun4i-spdif.c | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-)
The driver depends on CONFIG_OF, it is not necessary to use of_match_ptr() here.
Signed-off-by: Ruan Jinjie ruanjinjie@huawei.com --- sound/soc/atmel/atmel-i2s.c | 2 +- sound/soc/atmel/atmel-pdmic.c | 2 +- sound/soc/atmel/mchp-i2s-mcc.c | 2 +- sound/soc/atmel/mchp-spdifrx.c | 2 +- sound/soc/atmel/mchp-spdiftx.c | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/sound/soc/atmel/atmel-i2s.c b/sound/soc/atmel/atmel-i2s.c index 69a88dc65165..4febd4d3d0fa 100644 --- a/sound/soc/atmel/atmel-i2s.c +++ b/sound/soc/atmel/atmel-i2s.c @@ -730,7 +730,7 @@ static void atmel_i2s_remove(struct platform_device *pdev) static struct platform_driver atmel_i2s_driver = { .driver = { .name = "atmel_i2s", - .of_match_table = of_match_ptr(atmel_i2s_dt_ids), + .of_match_table = atmel_i2s_dt_ids, }, .probe = atmel_i2s_probe, .remove_new = atmel_i2s_remove, diff --git a/sound/soc/atmel/atmel-pdmic.c b/sound/soc/atmel/atmel-pdmic.c index efcbdd1a629f..0db7815d230c 100644 --- a/sound/soc/atmel/atmel-pdmic.c +++ b/sound/soc/atmel/atmel-pdmic.c @@ -690,7 +690,7 @@ static int atmel_pdmic_probe(struct platform_device *pdev) static struct platform_driver atmel_pdmic_driver = { .driver = { .name = "atmel-pdmic", - .of_match_table = of_match_ptr(atmel_pdmic_of_match), + .of_match_table = atmel_pdmic_of_match, .pm = &snd_soc_pm_ops, }, .probe = atmel_pdmic_probe, diff --git a/sound/soc/atmel/mchp-i2s-mcc.c b/sound/soc/atmel/mchp-i2s-mcc.c index 7c83d48ca1a0..4b8a63295f89 100644 --- a/sound/soc/atmel/mchp-i2s-mcc.c +++ b/sound/soc/atmel/mchp-i2s-mcc.c @@ -1098,7 +1098,7 @@ static void mchp_i2s_mcc_remove(struct platform_device *pdev) static struct platform_driver mchp_i2s_mcc_driver = { .driver = { .name = "mchp_i2s_mcc", - .of_match_table = of_match_ptr(mchp_i2s_mcc_dt_ids), + .of_match_table = mchp_i2s_mcc_dt_ids, }, .probe = mchp_i2s_mcc_probe, .remove_new = mchp_i2s_mcc_remove, diff --git a/sound/soc/atmel/mchp-spdifrx.c b/sound/soc/atmel/mchp-spdifrx.c index ff6aba143aee..e97cd8f4a728 100644 --- a/sound/soc/atmel/mchp-spdifrx.c +++ b/sound/soc/atmel/mchp-spdifrx.c @@ -1197,7 +1197,7 @@ static struct platform_driver mchp_spdifrx_driver = { .remove_new = mchp_spdifrx_remove, .driver = { .name = "mchp_spdifrx", - .of_match_table = of_match_ptr(mchp_spdifrx_dt_ids), + .of_match_table = mchp_spdifrx_dt_ids, .pm = pm_ptr(&mchp_spdifrx_pm_ops), }, }; diff --git a/sound/soc/atmel/mchp-spdiftx.c b/sound/soc/atmel/mchp-spdiftx.c index 1d3e17119888..b1040576f71f 100644 --- a/sound/soc/atmel/mchp-spdiftx.c +++ b/sound/soc/atmel/mchp-spdiftx.c @@ -891,7 +891,7 @@ static struct platform_driver mchp_spdiftx_driver = { .remove_new = mchp_spdiftx_remove, .driver = { .name = "mchp_spdiftx", - .of_match_table = of_match_ptr(mchp_spdiftx_dt_ids), + .of_match_table = mchp_spdiftx_dt_ids, .pm = pm_ptr(&mchp_spdiftx_pm_ops) }, };
The driver depends on CONFIG_OF, it is not necessary to use of_match_ptr() here.
Signed-off-by: Ruan Jinjie ruanjinjie@huawei.com --- sound/soc/atmel/tse850-pcm5142.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sound/soc/atmel/tse850-pcm5142.c b/sound/soc/atmel/tse850-pcm5142.c index efead272d92b..c809b121037f 100644 --- a/sound/soc/atmel/tse850-pcm5142.c +++ b/sound/soc/atmel/tse850-pcm5142.c @@ -430,7 +430,7 @@ MODULE_DEVICE_TABLE(of, tse850_dt_ids); static struct platform_driver tse850_driver = { .driver = { .name = "axentia-tse850-pcm5142", - .of_match_table = of_match_ptr(tse850_dt_ids), + .of_match_table = tse850_dt_ids, }, .probe = tse850_probe, .remove_new = tse850_remove,
The driver depends on CONFIG_OF, it is not necessary to use of_match_ptr() here.
Signed-off-by: Ruan Jinjie ruanjinjie@huawei.com --- sound/soc/sunxi/sun4i-spdif.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sound/soc/sunxi/sun4i-spdif.c b/sound/soc/sunxi/sun4i-spdif.c index ff18d4113aac..c2b55d2e5fe1 100644 --- a/sound/soc/sunxi/sun4i-spdif.c +++ b/sound/soc/sunxi/sun4i-spdif.c @@ -718,7 +718,7 @@ static const struct dev_pm_ops sun4i_spdif_pm = { static struct platform_driver sun4i_spdif_driver = { .driver = { .name = "sun4i-spdif", - .of_match_table = of_match_ptr(sun4i_spdif_of_match), + .of_match_table = sun4i_spdif_of_match, .pm = &sun4i_spdif_pm, }, .probe = sun4i_spdif_probe,
Dne petek, 11. avgust 2023 ob 09:14:24 CEST je Ruan Jinjie napisal(a):
The driver depends on CONFIG_OF, it is not necessary to use of_match_ptr() here.
Signed-off-by: Ruan Jinjie ruanjinjie@huawei.com
Acked-by: Jernej Skrabec jernej.skrabec@gmail.com
Best regards, Jernej
sound/soc/sunxi/sun4i-spdif.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sound/soc/sunxi/sun4i-spdif.c b/sound/soc/sunxi/sun4i-spdif.c index ff18d4113aac..c2b55d2e5fe1 100644 --- a/sound/soc/sunxi/sun4i-spdif.c +++ b/sound/soc/sunxi/sun4i-spdif.c @@ -718,7 +718,7 @@ static const struct dev_pm_ops sun4i_spdif_pm = { static struct platform_driver sun4i_spdif_driver = { .driver = { .name = "sun4i-spdif",
.of_match_table = of_match_ptr(sun4i_spdif_of_match),
.of_match_table = sun4i_spdif_of_match,
The driver depends on CONFIG_OF, it is not necessary to use of_match_ptr() here.
Signed-off-by: Ruan Jinjie ruanjinjie@huawei.com --- sound/soc/codecs/ssm3515.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sound/soc/codecs/ssm3515.c b/sound/soc/codecs/ssm3515.c index 008cb3eb5758..8c6665677a17 100644 --- a/sound/soc/codecs/ssm3515.c +++ b/sound/soc/codecs/ssm3515.c @@ -437,7 +437,7 @@ MODULE_DEVICE_TABLE(of, ssm3515_of_match); static struct i2c_driver ssm3515_i2c_driver = { .driver = { .name = "ssm3515", - .of_match_table = of_match_ptr(ssm3515_of_match), + .of_match_table = ssm3515_of_match, }, .probe = ssm3515_i2c_probe, };
The driver depends on CONFIG_OF, it is not necessary to use of_match_ptr() here.
Signed-off-by: Ruan Jinjie ruanjinjie@huawei.com --- sound/drivers/serial-generic.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sound/drivers/serial-generic.c b/sound/drivers/serial-generic.c index b0262541802a..c8db6c75d133 100644 --- a/sound/drivers/serial-generic.c +++ b/sound/drivers/serial-generic.c @@ -366,7 +366,7 @@ MODULE_DEVICE_TABLE(of, snd_serial_generic_dt_ids); static struct serdev_device_driver snd_serial_generic_driver = { .driver = { .name = "snd-serial-generic", - .of_match_table = of_match_ptr(snd_serial_generic_dt_ids), + .of_match_table = snd_serial_generic_dt_ids, }, .probe = snd_serial_generic_probe, };
On Fri, 11 Aug 2023 09:14:26 +0200, Ruan Jinjie wrote:
The driver depends on CONFIG_OF, it is not necessary to use of_match_ptr() here.
Signed-off-by: Ruan Jinjie ruanjinjie@huawei.com
Reviewed-by: Takashi Iwai tiwai@suse.de
thanks,
Takashi
sound/drivers/serial-generic.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sound/drivers/serial-generic.c b/sound/drivers/serial-generic.c index b0262541802a..c8db6c75d133 100644 --- a/sound/drivers/serial-generic.c +++ b/sound/drivers/serial-generic.c @@ -366,7 +366,7 @@ MODULE_DEVICE_TABLE(of, snd_serial_generic_dt_ids); static struct serdev_device_driver snd_serial_generic_driver = { .driver = { .name = "snd-serial-generic",
.of_match_table = of_match_ptr(snd_serial_generic_dt_ids),
.of_match_table = snd_serial_generic_dt_ids,};
2.34.1
On Fri, 11 Aug 2023 09:14:21 +0200, Ruan Jinjie wrote:
Since these sound drivers depend on CONFIG_OF, there is no need to wrap the macro of_match_ptr() here.
Ruan Jinjie (5): ASoC: atmel: Remove redundant of_match_ptr() ASoC: atmel: tse850-pcm5142: Remove redundant of_match_ptr() ASoC: sunxi: sun4i-spdif: Remove redundant of_match_ptr() ASoC: ssm3515: Remove redundant of_match_ptr() ALSA: Remove redundant of_match_ptr()
Judging from the proportion, I guess those go through ASoC tree?
Takashi
On Fri, 11 Aug 2023 15:14:21 +0800, Ruan Jinjie wrote:
Since these sound drivers depend on CONFIG_OF, there is no need to wrap the macro of_match_ptr() here.
Ruan Jinjie (5): ASoC: atmel: Remove redundant of_match_ptr() ASoC: atmel: tse850-pcm5142: Remove redundant of_match_ptr() ASoC: sunxi: sun4i-spdif: Remove redundant of_match_ptr() ASoC: ssm3515: Remove redundant of_match_ptr() ALSA: Remove redundant of_match_ptr()
[...]
Applied to
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next
Thanks!
[1/5] ASoC: atmel: Remove redundant of_match_ptr() commit: 67ed781228bdcca7a0d2058cf62d0c1860898330 [2/5] ASoC: atmel: tse850-pcm5142: Remove redundant of_match_ptr() commit: f83e34034fcc5fd0551d9257b710b61d999a8174 [3/5] ASoC: sunxi: sun4i-spdif: Remove redundant of_match_ptr() commit: 29546c3af6319a8a5308d4add1226343031da65b [4/5] ASoC: ssm3515: Remove redundant of_match_ptr() commit: 6136b6a281b40cb795a76f1769eeb7ef5026b86f [5/5] ALSA: Remove redundant of_match_ptr() commit: f479832b42df596775c1e787e02c7277bfba6a4a
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
participants (4)
-
Jernej Škrabec -
Mark Brown -
Ruan Jinjie -
Takashi Iwai