[PATCH 00/17] ASoC: Intel: avs: Properly identify boards
Instead of using MODULE_ALIAS() to load boards, add proper device id table and use MODULE_DEVICE_TABLE() macro to create board alias.
Amadeusz Sławiński (17): ASoC: Intel: avs: da7219: Add proper id_table ASoC: Intel: avs: dmic: Add proper id_table ASoC: Intel: avs: es8336: Add proper id_table ASoC: Intel: avs: hdaudio: Add proper id_table ASoC: Intel: avs: i2s_test: Add proper id_table ASoC: Intel: avs: max98357a: Add proper id_table ASoC: Intel: avs: max98373: Add proper id_table ASoC: Intel: avs: max98927: Add proper id_table ASoC: Intel: avs: nau8825: Add proper id_table ASoC: Intel: avs: probe: Add proper id_table ASoC: Intel: avs: rt274: Add proper id_table ASoC: Intel: avs: rt286: Add proper id_table ASoC: Intel: avs: rt298: Add proper id_table ASoC: Intel: avs: rt5514: Add proper id_table ASoC: Intel: avs: rt5663: Add proper id_table ASoC: Intel: avs: rt5682: Add proper id_table ASoC: Intel: avs: ssm4567: Add proper id_table
sound/soc/intel/avs/boards/da7219.c | 10 +++++++++- sound/soc/intel/avs/boards/dmic.c | 10 +++++++++- sound/soc/intel/avs/boards/es8336.c | 10 +++++++++- sound/soc/intel/avs/boards/hdaudio.c | 10 +++++++++- sound/soc/intel/avs/boards/i2s_test.c | 10 +++++++++- sound/soc/intel/avs/boards/max98357a.c | 10 +++++++++- sound/soc/intel/avs/boards/max98373.c | 10 +++++++++- sound/soc/intel/avs/boards/max98927.c | 10 +++++++++- sound/soc/intel/avs/boards/nau8825.c | 10 +++++++++- sound/soc/intel/avs/boards/probe.c | 10 +++++++++- sound/soc/intel/avs/boards/rt274.c | 10 +++++++++- sound/soc/intel/avs/boards/rt286.c | 10 +++++++++- sound/soc/intel/avs/boards/rt298.c | 10 +++++++++- sound/soc/intel/avs/boards/rt5514.c | 10 +++++++++- sound/soc/intel/avs/boards/rt5663.c | 10 +++++++++- sound/soc/intel/avs/boards/rt5682.c | 10 +++++++++- sound/soc/intel/avs/boards/ssm4567.c | 10 +++++++++- 17 files changed, 153 insertions(+), 17 deletions(-)
base-commit: ed2232d49187cebc007ecf4e6374069b11ab3219
Add id_table and use it instead of alias to load module.
Suggested-by: Krzysztof Kozlowski krzk@kernel.org Reviewed-by: Cezary Rojewski cezary.rojewski@intel.com Signed-off-by: Amadeusz Sławiński amadeuszx.slawinski@linux.intel.com --- sound/soc/intel/avs/boards/da7219.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/sound/soc/intel/avs/boards/da7219.c b/sound/soc/intel/avs/boards/da7219.c index 6060894954df..c018f84fe025 100644 --- a/sound/soc/intel/avs/boards/da7219.c +++ b/sound/soc/intel/avs/boards/da7219.c @@ -277,16 +277,24 @@ static int avs_da7219_probe(struct platform_device *pdev) return devm_snd_soc_register_card(dev, card); }
+static const struct platform_device_id avs_da7219_driver_ids[] = { + { + .name = "avs_da7219", + }, + {}, +}; +MODULE_DEVICE_TABLE(platform, avs_da7219_driver_ids); + static struct platform_driver avs_da7219_driver = { .probe = avs_da7219_probe, .driver = { .name = "avs_da7219", .pm = &snd_soc_pm_ops, }, + .id_table = avs_da7219_driver_ids, };
module_platform_driver(avs_da7219_driver);
MODULE_AUTHOR("Cezary Rojewski cezary.rojewski@intel.com"); MODULE_LICENSE("GPL"); -MODULE_ALIAS("platform:avs_da7219");
Add id_table and use it instead of alias to load module.
Suggested-by: Krzysztof Kozlowski krzk@kernel.org Reviewed-by: Cezary Rojewski cezary.rojewski@intel.com Signed-off-by: Amadeusz Sławiński amadeuszx.slawinski@linux.intel.com --- sound/soc/intel/avs/boards/dmic.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/sound/soc/intel/avs/boards/dmic.c b/sound/soc/intel/avs/boards/dmic.c index c270646faf86..ba2bc7f689eb 100644 --- a/sound/soc/intel/avs/boards/dmic.c +++ b/sound/soc/intel/avs/boards/dmic.c @@ -77,15 +77,23 @@ static int avs_dmic_probe(struct platform_device *pdev) return devm_snd_soc_register_card(dev, card); }
+static const struct platform_device_id avs_dmic_driver_ids[] = { + { + .name = "avs_dmic", + }, + {}, +}; +MODULE_DEVICE_TABLE(platform, avs_dmic_driver_ids); + static struct platform_driver avs_dmic_driver = { .probe = avs_dmic_probe, .driver = { .name = "avs_dmic", .pm = &snd_soc_pm_ops, }, + .id_table = avs_dmic_driver_ids, };
module_platform_driver(avs_dmic_driver);
MODULE_LICENSE("GPL"); -MODULE_ALIAS("platform:avs_dmic");
Add id_table and use it instead of alias to load module.
Suggested-by: Krzysztof Kozlowski krzk@kernel.org Reviewed-by: Cezary Rojewski cezary.rojewski@intel.com Signed-off-by: Amadeusz Sławiński amadeuszx.slawinski@linux.intel.com --- sound/soc/intel/avs/boards/es8336.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/sound/soc/intel/avs/boards/es8336.c b/sound/soc/intel/avs/boards/es8336.c index f972ef64d284..1090082e7d5b 100644 --- a/sound/soc/intel/avs/boards/es8336.c +++ b/sound/soc/intel/avs/boards/es8336.c @@ -307,15 +307,23 @@ static int avs_es8336_probe(struct platform_device *pdev) return devm_snd_soc_register_card(dev, card); }
+static const struct platform_device_id avs_es8336_driver_ids[] = { + { + .name = "avs_es8336", + }, + {}, +}; +MODULE_DEVICE_TABLE(platform, avs_es8336_driver_ids); + static struct platform_driver avs_es8336_driver = { .probe = avs_es8336_probe, .driver = { .name = "avs_es8336", .pm = &snd_soc_pm_ops, }, + .id_table = avs_es8336_driver_ids, };
module_platform_driver(avs_es8336_driver);
MODULE_LICENSE("GPL"); -MODULE_ALIAS("platform:avs_es8336");
Add id_table and use it instead of alias to load module.
Suggested-by: Krzysztof Kozlowski krzk@kernel.org Reviewed-by: Cezary Rojewski cezary.rojewski@intel.com Signed-off-by: Amadeusz Sławiński amadeuszx.slawinski@linux.intel.com --- sound/soc/intel/avs/boards/hdaudio.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/sound/soc/intel/avs/boards/hdaudio.c b/sound/soc/intel/avs/boards/hdaudio.c index 8876558f19a1..844a918f9a81 100644 --- a/sound/soc/intel/avs/boards/hdaudio.c +++ b/sound/soc/intel/avs/boards/hdaudio.c @@ -218,12 +218,21 @@ static int avs_hdaudio_probe(struct platform_device *pdev) return devm_snd_soc_register_card(dev, card); }
+static const struct platform_device_id avs_hdaudio_driver_ids[] = { + { + .name = "avs_hdaudio", + }, + {}, +}; +MODULE_DEVICE_TABLE(platform, avs_hdaudio_driver_ids); + static struct platform_driver avs_hdaudio_driver = { .probe = avs_hdaudio_probe, .driver = { .name = "avs_hdaudio", .pm = &snd_soc_pm_ops, }, + .id_table = avs_hdaudio_driver_ids, };
module_platform_driver(avs_hdaudio_driver) @@ -231,4 +240,3 @@ module_platform_driver(avs_hdaudio_driver) MODULE_DESCRIPTION("Intel HD-Audio machine driver"); MODULE_AUTHOR("Cezary Rojewski cezary.rojewski@intel.com"); MODULE_LICENSE("GPL"); -MODULE_ALIAS("platform:avs_hdaudio");
Add id_table and use it instead of alias to load module.
Suggested-by: Krzysztof Kozlowski krzk@kernel.org Reviewed-by: Cezary Rojewski cezary.rojewski@intel.com Signed-off-by: Amadeusz Sławiński amadeuszx.slawinski@linux.intel.com --- sound/soc/intel/avs/boards/i2s_test.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/sound/soc/intel/avs/boards/i2s_test.c b/sound/soc/intel/avs/boards/i2s_test.c index 3d03e1eed3a9..28f254eb0d03 100644 --- a/sound/soc/intel/avs/boards/i2s_test.c +++ b/sound/soc/intel/avs/boards/i2s_test.c @@ -185,15 +185,23 @@ static int avs_i2s_test_probe(struct platform_device *pdev) return devm_snd_soc_register_card(dev, card); }
+static const struct platform_device_id avs_i2s_test_driver_ids[] = { + { + .name = "avs_i2s_test", + }, + {}, +}; +MODULE_DEVICE_TABLE(platform, avs_i2s_test_driver_ids); + static struct platform_driver avs_i2s_test_driver = { .probe = avs_i2s_test_probe, .driver = { .name = "avs_i2s_test", .pm = &snd_soc_pm_ops, }, + .id_table = avs_i2s_test_driver_ids, };
module_platform_driver(avs_i2s_test_driver);
MODULE_LICENSE("GPL"); -MODULE_ALIAS("platform:avs_i2s_test");
Add id_table and use it instead of alias to load module.
Suggested-by: Krzysztof Kozlowski krzk@kernel.org Reviewed-by: Cezary Rojewski cezary.rojewski@intel.com Signed-off-by: Amadeusz Sławiński amadeuszx.slawinski@linux.intel.com --- sound/soc/intel/avs/boards/max98357a.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/sound/soc/intel/avs/boards/max98357a.c b/sound/soc/intel/avs/boards/max98357a.c index 6ba7b6564279..a83b95f25129 100644 --- a/sound/soc/intel/avs/boards/max98357a.c +++ b/sound/soc/intel/avs/boards/max98357a.c @@ -135,15 +135,23 @@ static int avs_max98357a_probe(struct platform_device *pdev) return devm_snd_soc_register_card(dev, card); }
+static const struct platform_device_id avs_max98357a_driver_ids[] = { + { + .name = "avs_max98357a", + }, + {}, +}; +MODULE_DEVICE_TABLE(platform, avs_max98357a_driver_ids); + static struct platform_driver avs_max98357a_driver = { .probe = avs_max98357a_probe, .driver = { .name = "avs_max98357a", .pm = &snd_soc_pm_ops, }, + .id_table = avs_max98357a_driver_ids, };
module_platform_driver(avs_max98357a_driver)
MODULE_LICENSE("GPL"); -MODULE_ALIAS("platform:avs_max98357a");
Add id_table and use it instead of alias to load module.
Suggested-by: Krzysztof Kozlowski krzk@kernel.org Reviewed-by: Cezary Rojewski cezary.rojewski@intel.com Signed-off-by: Amadeusz Sławiński amadeuszx.slawinski@linux.intel.com --- sound/soc/intel/avs/boards/max98373.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/sound/soc/intel/avs/boards/max98373.c b/sound/soc/intel/avs/boards/max98373.c index cc7dfdf72083..3b980a025e6f 100644 --- a/sound/soc/intel/avs/boards/max98373.c +++ b/sound/soc/intel/avs/boards/max98373.c @@ -192,15 +192,23 @@ static int avs_max98373_probe(struct platform_device *pdev) return devm_snd_soc_register_card(dev, card); }
+static const struct platform_device_id avs_max98373_driver_ids[] = { + { + .name = "avs_max98373", + }, + {}, +}; +MODULE_DEVICE_TABLE(platform, avs_max98373_driver_ids); + static struct platform_driver avs_max98373_driver = { .probe = avs_max98373_probe, .driver = { .name = "avs_max98373", .pm = &snd_soc_pm_ops, }, + .id_table = avs_max98373_driver_ids, };
module_platform_driver(avs_max98373_driver)
MODULE_LICENSE("GPL"); -MODULE_ALIAS("platform:avs_max98373");
Add id_table and use it instead of alias to load module.
Suggested-by: Krzysztof Kozlowski krzk@kernel.org Reviewed-by: Cezary Rojewski cezary.rojewski@intel.com Signed-off-by: Amadeusz Sławiński amadeuszx.slawinski@linux.intel.com --- sound/soc/intel/avs/boards/max98927.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/sound/soc/intel/avs/boards/max98927.c b/sound/soc/intel/avs/boards/max98927.c index fb0175f37d61..86dd2b228df3 100644 --- a/sound/soc/intel/avs/boards/max98927.c +++ b/sound/soc/intel/avs/boards/max98927.c @@ -189,15 +189,23 @@ static int avs_max98927_probe(struct platform_device *pdev) return devm_snd_soc_register_card(dev, card); }
+static const struct platform_device_id avs_max98927_driver_ids[] = { + { + .name = "avs_max98927", + }, + {}, +}; +MODULE_DEVICE_TABLE(platform, avs_max98927_driver_ids); + static struct platform_driver avs_max98927_driver = { .probe = avs_max98927_probe, .driver = { .name = "avs_max98927", .pm = &snd_soc_pm_ops, }, + .id_table = avs_max98927_driver_ids, };
module_platform_driver(avs_max98927_driver)
MODULE_LICENSE("GPL"); -MODULE_ALIAS("platform:avs_max98927");
Add id_table and use it instead of alias to load module.
Suggested-by: Krzysztof Kozlowski krzk@kernel.org Reviewed-by: Cezary Rojewski cezary.rojewski@intel.com Signed-off-by: Amadeusz Sławiński amadeuszx.slawinski@linux.intel.com --- sound/soc/intel/avs/boards/nau8825.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/sound/soc/intel/avs/boards/nau8825.c b/sound/soc/intel/avs/boards/nau8825.c index d98b5deb78c9..1c1e2083f474 100644 --- a/sound/soc/intel/avs/boards/nau8825.c +++ b/sound/soc/intel/avs/boards/nau8825.c @@ -294,15 +294,23 @@ static int avs_nau8825_probe(struct platform_device *pdev) return devm_snd_soc_register_card(dev, card); }
+static const struct platform_device_id avs_nau8825_driver_ids[] = { + { + .name = "avs_nau8825", + }, + {}, +}; +MODULE_DEVICE_TABLE(platform, avs_nau8825_driver_ids); + static struct platform_driver avs_nau8825_driver = { .probe = avs_nau8825_probe, .driver = { .name = "avs_nau8825", .pm = &snd_soc_pm_ops, }, + .id_table = avs_nau8825_driver_ids, };
module_platform_driver(avs_nau8825_driver)
MODULE_LICENSE("GPL"); -MODULE_ALIAS("platform:avs_nau8825");
Add id_table and use it instead of alias to load module.
Suggested-by: Krzysztof Kozlowski krzk@kernel.org Reviewed-by: Cezary Rojewski cezary.rojewski@intel.com Signed-off-by: Amadeusz Sławiński amadeuszx.slawinski@linux.intel.com --- sound/soc/intel/avs/boards/probe.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/sound/soc/intel/avs/boards/probe.c b/sound/soc/intel/avs/boards/probe.c index 411acaee74f9..a9469b5ecb40 100644 --- a/sound/soc/intel/avs/boards/probe.c +++ b/sound/soc/intel/avs/boards/probe.c @@ -50,15 +50,23 @@ static int avs_probe_mb_probe(struct platform_device *pdev) return devm_snd_soc_register_card(dev, card); }
+static const struct platform_device_id avs_probe_mb_driver_ids[] = { + { + .name = "avs_probe_mb", + }, + {}, +}; +MODULE_DEVICE_TABLE(platform, avs_probe_mb_driver_ids); + static struct platform_driver avs_probe_mb_driver = { .probe = avs_probe_mb_probe, .driver = { .name = "avs_probe_mb", .pm = &snd_soc_pm_ops, }, + .id_table = avs_probe_mb_driver_ids, };
module_platform_driver(avs_probe_mb_driver);
MODULE_LICENSE("GPL"); -MODULE_ALIAS("platform:avs_probe_mb");
Add id_table and use it instead of alias to load module.
Suggested-by: Krzysztof Kozlowski krzk@kernel.org Reviewed-by: Cezary Rojewski cezary.rojewski@intel.com Signed-off-by: Amadeusz Sławiński amadeuszx.slawinski@linux.intel.com --- sound/soc/intel/avs/boards/rt274.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/sound/soc/intel/avs/boards/rt274.c b/sound/soc/intel/avs/boards/rt274.c index 157183b1de24..bfcb8845fd15 100644 --- a/sound/soc/intel/avs/boards/rt274.c +++ b/sound/soc/intel/avs/boards/rt274.c @@ -257,15 +257,23 @@ static int avs_rt274_probe(struct platform_device *pdev) return devm_snd_soc_register_card(dev, card); }
+static const struct platform_device_id avs_rt274_driver_ids[] = { + { + .name = "avs_rt274", + }, + {}, +}; +MODULE_DEVICE_TABLE(platform, avs_rt274_driver_ids); + static struct platform_driver avs_rt274_driver = { .probe = avs_rt274_probe, .driver = { .name = "avs_rt274", .pm = &snd_soc_pm_ops, }, + .id_table = avs_rt274_driver_ids, };
module_platform_driver(avs_rt274_driver);
MODULE_LICENSE("GPL"); -MODULE_ALIAS("platform:avs_rt274");
Add id_table and use it instead of alias to load module.
Suggested-by: Krzysztof Kozlowski krzk@kernel.org Reviewed-by: Cezary Rojewski cezary.rojewski@intel.com Signed-off-by: Amadeusz Sławiński amadeuszx.slawinski@linux.intel.com --- sound/soc/intel/avs/boards/rt286.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/sound/soc/intel/avs/boards/rt286.c b/sound/soc/intel/avs/boards/rt286.c index 131237471e3e..28d7d86b1cc9 100644 --- a/sound/soc/intel/avs/boards/rt286.c +++ b/sound/soc/intel/avs/boards/rt286.c @@ -228,15 +228,23 @@ static int avs_rt286_probe(struct platform_device *pdev) return devm_snd_soc_register_card(dev, card); }
+static const struct platform_device_id avs_rt286_driver_ids[] = { + { + .name = "avs_rt286", + }, + {}, +}; +MODULE_DEVICE_TABLE(platform, avs_rt286_driver_ids); + static struct platform_driver avs_rt286_driver = { .probe = avs_rt286_probe, .driver = { .name = "avs_rt286", .pm = &snd_soc_pm_ops, }, + .id_table = avs_rt286_driver_ids, };
module_platform_driver(avs_rt286_driver);
MODULE_LICENSE("GPL"); -MODULE_ALIAS("platform:avs_rt286");
Add id_table and use it instead of alias to load module.
Suggested-by: Krzysztof Kozlowski krzk@kernel.org Reviewed-by: Cezary Rojewski cezary.rojewski@intel.com Signed-off-by: Amadeusz Sławiński amadeuszx.slawinski@linux.intel.com --- sound/soc/intel/avs/boards/rt298.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/sound/soc/intel/avs/boards/rt298.c b/sound/soc/intel/avs/boards/rt298.c index ea32a7690c8a..80f490b9e118 100644 --- a/sound/soc/intel/avs/boards/rt298.c +++ b/sound/soc/intel/avs/boards/rt298.c @@ -247,15 +247,23 @@ static int avs_rt298_probe(struct platform_device *pdev) return devm_snd_soc_register_card(dev, card); }
+static const struct platform_device_id avs_rt298_driver_ids[] = { + { + .name = "avs_rt298", + }, + {}, +}; +MODULE_DEVICE_TABLE(platform, avs_rt298_driver_ids); + static struct platform_driver avs_rt298_driver = { .probe = avs_rt298_probe, .driver = { .name = "avs_rt298", .pm = &snd_soc_pm_ops, }, + .id_table = avs_rt298_driver_ids, };
module_platform_driver(avs_rt298_driver);
MODULE_LICENSE("GPL"); -MODULE_ALIAS("platform:avs_rt298");
Add id_table and use it instead of alias to load module.
Suggested-by: Krzysztof Kozlowski krzk@kernel.org Reviewed-by: Cezary Rojewski cezary.rojewski@intel.com Signed-off-by: Amadeusz Sławiński amadeuszx.slawinski@linux.intel.com --- sound/soc/intel/avs/boards/rt5514.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/sound/soc/intel/avs/boards/rt5514.c b/sound/soc/intel/avs/boards/rt5514.c index ad486a52e5e3..60105f453ae2 100644 --- a/sound/soc/intel/avs/boards/rt5514.c +++ b/sound/soc/intel/avs/boards/rt5514.c @@ -173,15 +173,23 @@ static int avs_rt5514_probe(struct platform_device *pdev) return devm_snd_soc_register_card(dev, card); }
+static const struct platform_device_id avs_rt5514_driver_ids[] = { + { + .name = "avs_rt5514", + }, + {}, +}; +MODULE_DEVICE_TABLE(platform, avs_rt5514_driver_ids); + static struct platform_driver avs_rt5514_driver = { .probe = avs_rt5514_probe, .driver = { .name = "avs_rt5514", .pm = &snd_soc_pm_ops, }, + .id_table = avs_rt5514_driver_ids, };
module_platform_driver(avs_rt5514_driver);
MODULE_LICENSE("GPL"); -MODULE_ALIAS("platform:avs_rt5514");
Add id_table and use it instead of alias to load module.
Suggested-by: Krzysztof Kozlowski krzk@kernel.org Reviewed-by: Cezary Rojewski cezary.rojewski@intel.com Signed-off-by: Amadeusz Sławiński amadeuszx.slawinski@linux.intel.com --- sound/soc/intel/avs/boards/rt5663.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/sound/soc/intel/avs/boards/rt5663.c b/sound/soc/intel/avs/boards/rt5663.c index 3effd789a45e..b4762c2a7bf2 100644 --- a/sound/soc/intel/avs/boards/rt5663.c +++ b/sound/soc/intel/avs/boards/rt5663.c @@ -246,15 +246,23 @@ static int avs_rt5663_probe(struct platform_device *pdev) return devm_snd_soc_register_card(dev, card); }
+static const struct platform_device_id avs_rt5663_driver_ids[] = { + { + .name = "avs_rt5663", + }, + {}, +}; +MODULE_DEVICE_TABLE(platform, avs_rt5663_driver_ids); + static struct platform_driver avs_rt5663_driver = { .probe = avs_rt5663_probe, .driver = { .name = "avs_rt5663", .pm = &snd_soc_pm_ops, }, + .id_table = avs_rt5663_driver_ids, };
module_platform_driver(avs_rt5663_driver);
MODULE_LICENSE("GPL"); -MODULE_ALIAS("platform:avs_rt5663");
Add id_table and use it instead of alias to load module.
Suggested-by: Krzysztof Kozlowski krzk@kernel.org Reviewed-by: Cezary Rojewski cezary.rojewski@intel.com Signed-off-by: Amadeusz Sławiński amadeuszx.slawinski@linux.intel.com --- sound/soc/intel/avs/boards/rt5682.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/sound/soc/intel/avs/boards/rt5682.c b/sound/soc/intel/avs/boards/rt5682.c index 84e850c0b085..243f979fda98 100644 --- a/sound/soc/intel/avs/boards/rt5682.c +++ b/sound/soc/intel/avs/boards/rt5682.c @@ -322,16 +322,24 @@ static int avs_rt5682_probe(struct platform_device *pdev) return devm_snd_soc_register_card(dev, card); }
+static const struct platform_device_id avs_rt5682_driver_ids[] = { + { + .name = "avs_rt5682", + }, + {}, +}; +MODULE_DEVICE_TABLE(platform, avs_rt5682_driver_ids); + static struct platform_driver avs_rt5682_driver = { .probe = avs_rt5682_probe, .driver = { .name = "avs_rt5682", .pm = &snd_soc_pm_ops, }, + .id_table = avs_rt5682_driver_ids, };
module_platform_driver(avs_rt5682_driver)
MODULE_AUTHOR("Cezary Rojewski cezary.rojewski@intel.com"); MODULE_LICENSE("GPL"); -MODULE_ALIAS("platform:avs_rt5682");
Add id_table and use it instead of alias to load module.
Suggested-by: Krzysztof Kozlowski krzk@kernel.org Reviewed-by: Cezary Rojewski cezary.rojewski@intel.com Signed-off-by: Amadeusz Sławiński amadeuszx.slawinski@linux.intel.com --- sound/soc/intel/avs/boards/ssm4567.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/sound/soc/intel/avs/boards/ssm4567.c b/sound/soc/intel/avs/boards/ssm4567.c index 6bcab9deae5c..4a0e136835ff 100644 --- a/sound/soc/intel/avs/boards/ssm4567.c +++ b/sound/soc/intel/avs/boards/ssm4567.c @@ -181,15 +181,23 @@ static int avs_ssm4567_probe(struct platform_device *pdev) return devm_snd_soc_register_card(dev, card); }
+static const struct platform_device_id avs_ssm4567_driver_ids[] = { + { + .name = "avs_ssm4567", + }, + {}, +}; +MODULE_DEVICE_TABLE(platform, avs_ssm4567_driver_ids); + static struct platform_driver avs_ssm4567_driver = { .probe = avs_ssm4567_probe, .driver = { .name = "avs_ssm4567", .pm = &snd_soc_pm_ops, }, + .id_table = avs_ssm4567_driver_ids, };
module_platform_driver(avs_ssm4567_driver)
MODULE_LICENSE("GPL"); -MODULE_ALIAS("platform:avs_ssm4567");
On 02/11/2023 13:46, Amadeusz Sławiński wrote:
Instead of using MODULE_ALIAS() to load boards, add proper device id table and use MODULE_DEVICE_TABLE() macro to create board alias.
Amadeusz Sławiński (17): ASoC: Intel: avs: da7219: Add proper id_table ASoC: Intel: avs: dmic: Add proper id_table ASoC: Intel: avs: es8336: Add proper id_table ASoC: Intel: avs: hdaudio: Add proper id_table ASoC: Intel: avs: i2s_test: Add proper id_table ASoC: Intel: avs: max98357a: Add proper id_table ASoC: Intel: avs: max98373: Add proper id_table ASoC: Intel: avs: max98927: Add proper id_table ASoC: Intel: avs: nau8825: Add proper id_table ASoC: Intel: avs: probe: Add proper id_table ASoC: Intel: avs: rt274: Add proper id_table ASoC: Intel: avs: rt286: Add proper id_table ASoC: Intel: avs: rt298: Add proper id_table ASoC: Intel: avs: rt5514: Add proper id_table ASoC: Intel: avs: rt5663: Add proper id_table ASoC: Intel: avs: rt5682: Add proper id_table ASoC: Intel: avs: ssm4567: Add proper id_table
For entire series:
Reviewed-by: Krzysztof Kozlowski krzysztof.kozlowski@linaro.org
Best regards, Krzysztof
On Thu, 02 Nov 2023 13:46:55 +0100, Amadeusz Sławiński wrote:
Instead of using MODULE_ALIAS() to load boards, add proper device id table and use MODULE_DEVICE_TABLE() macro to create board alias.
Amadeusz Sławiński (17): ASoC: Intel: avs: da7219: Add proper id_table ASoC: Intel: avs: dmic: Add proper id_table ASoC: Intel: avs: es8336: Add proper id_table ASoC: Intel: avs: hdaudio: Add proper id_table ASoC: Intel: avs: i2s_test: Add proper id_table ASoC: Intel: avs: max98357a: Add proper id_table ASoC: Intel: avs: max98373: Add proper id_table ASoC: Intel: avs: max98927: Add proper id_table ASoC: Intel: avs: nau8825: Add proper id_table ASoC: Intel: avs: probe: Add proper id_table ASoC: Intel: avs: rt274: Add proper id_table ASoC: Intel: avs: rt286: Add proper id_table ASoC: Intel: avs: rt298: Add proper id_table ASoC: Intel: avs: rt5514: Add proper id_table ASoC: Intel: avs: rt5663: Add proper id_table ASoC: Intel: avs: rt5682: Add proper id_table ASoC: Intel: avs: ssm4567: Add proper id_table
[...]
Applied to
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next
Thanks!
[01/17] ASoC: Intel: avs: da7219: Add proper id_table commit: 59fff33e9d923779b68fe46f39262256caba71d6 [02/17] ASoC: Intel: avs: dmic: Add proper id_table commit: deb8dcad7bc3505881e2c0680d8f01f23fcbba98 [03/17] ASoC: Intel: avs: es8336: Add proper id_table commit: 9441450e171fc90aa3fceadae9728acf8bd0726a [04/17] ASoC: Intel: avs: hdaudio: Add proper id_table commit: 9a872caede56d20564caf30d7ea7cf61b66f4060 [05/17] ASoC: Intel: avs: i2s_test: Add proper id_table commit: 8267213c54db078db091b778e904ec1af8fc6ee6 [06/17] ASoC: Intel: avs: max98357a: Add proper id_table commit: f1e9f4f5e9e5506edbd17b33065ec8c8a9e6caab [07/17] ASoC: Intel: avs: max98373: Add proper id_table commit: 8e660f303230741ecaab561a30e123e7dc76abda [08/17] ASoC: Intel: avs: max98927: Add proper id_table commit: c3ff01859c31408eadfd607352d4f87e52096371 [09/17] ASoC: Intel: avs: nau8825: Add proper id_table commit: c94643c2b416afc473541943291e61c453846a6d [10/17] ASoC: Intel: avs: probe: Add proper id_table commit: 4a5403e3a75ddc24941f754c14c3299cc0e28fe8 [11/17] ASoC: Intel: avs: rt274: Add proper id_table commit: 54c830fd4e38261adffa51bb22c44a2e33d803ba [12/17] ASoC: Intel: avs: rt286: Add proper id_table commit: 027ab0cab18071fa3476ffe7bb69ade551515ce6 [13/17] ASoC: Intel: avs: rt298: Add proper id_table commit: 3d4021f30abdb7cef51a901adc0dfc4d4ee98e9d [14/17] ASoC: Intel: avs: rt5514: Add proper id_table commit: 389f3c6c7ed89d53ecd83e629b7e529630cdb96c [15/17] ASoC: Intel: avs: rt5663: Add proper id_table commit: 5f249523d3fcf1fe28e567a17a3053ea7ff899a0 [16/17] ASoC: Intel: avs: rt5682: Add proper id_table commit: ba096fc618254918056061ecef32aa77c2fcaf84 [17/17] ASoC: Intel: avs: ssm4567: Add proper id_table commit: ca5abf5d2e1c3860382e0e33599e969cb9c9b42b
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 (3)
-
Amadeusz Sławiński -
Krzysztof Kozlowski -
Mark Brown