[PATCH v1] Revert "ASoC: Intel: Add rpl_nau8318_8825 driver"
This reverts commit 6b8b6892e43419f5339c47d307b1baac0eea036d.
Report from kernel test robot lkp@intel.com, that in broonie/ci.git file0yZ50U, it's redundant commit 6b8b6892e434 ("ASoC: Intel: Add rpl_nau8318_8825 driver") because commit 273bc8bf2227 ("ASoC: Intel: Add rpl_nau8318_8825 driver") was committed at 2023-08-14.
All errors (new ones prefixed by >>):
sound/soc/intel/common/soc-acpi-intel-rpl-match.c:369:41: error: redefinition of 'rpl_nau8318_amp'
static const struct snd_soc_acpi_codecs rpl_nau8318_amp = { ^ sound/soc/intel/common/soc-acpi-intel-rpl-match.c:359:41: note: previous definition is here static const struct snd_soc_acpi_codecs rpl_nau8318_amp = {
Reported-by: kernel test robot lkp@intel.com Closes: https://lore.kernel.org/oe-kbuild-all/202308221955.FkglAuTF-lkp@intel.com/ Signed-off-by: Ajye Huang ajye_huang@compal.corp-partner.google.com --- sound/soc/intel/common/soc-acpi-intel-rpl-match.c | 5 ----- 1 file changed, 5 deletions(-)
diff --git a/sound/soc/intel/common/soc-acpi-intel-rpl-match.c b/sound/soc/intel/common/soc-acpi-intel-rpl-match.c index 103490ac7c838..122673c1dae27 100644 --- a/sound/soc/intel/common/soc-acpi-intel-rpl-match.c +++ b/sound/soc/intel/common/soc-acpi-intel-rpl-match.c @@ -366,11 +366,6 @@ static const struct snd_soc_acpi_codecs rpl_rt1019p_amp = { .codecs = {"RTL1019"} };
-static const struct snd_soc_acpi_codecs rpl_nau8318_amp = { - .num_codecs = 1, - .codecs = {"NVTN2012"} -}; - struct snd_soc_acpi_mach snd_soc_acpi_intel_rpl_machines[] = { { .comp_ids = &rpl_rt5682_hp,
On Wed, Aug 23, 2023 at 12:07:55PM +0800, Ajye Huang wrote:
This reverts commit 6b8b6892e43419f5339c47d307b1baac0eea036d.
Report from kernel test robot lkp@intel.com, that in broonie/ci.git file0yZ50U, it's redundant commit 6b8b6892e434 ("ASoC: Intel: Add rpl_nau8318_8825 driver") because commit 273bc8bf2227 ("ASoC: Intel: Add rpl_nau8318_8825 driver") was committed at 2023-08-14.
6b8b6892e434 is not applied?
Please submit patches using subject lines reflecting the style for the subsystem, this makes it easier for people to identify relevant patches. Look at what existing commits in the area you're changing are doing and make sure your subject lines visually resemble what they're doing. There's no need to resubmit to fix this alone.
On Wed, Aug 23, 2023 at 8:01 PM Mark Brown broonie@kernel.org wrote:
6b8b6892e434 is not applied?
Please submit patches using subject lines reflecting the style for the subsystem, this makes it easier for people to identify relevant patches. Look at what existing commits in the area you're changing are doing and make sure your subject lines visually resemble what they're doing. There's no need to resubmit to fix this alone.
Dear Mark, Please allow me to explain in more detail. The 6b8b6892e434 should not be applied into file0yZ50U branch of broonie/ci.git. Because the original commit 273bc8bf2227 ("ASoC: Intel: Add rpl_nau8318_8825 driver") was applied on 2023-08-14. But two days ago, 6b8b6892e434 tried to commit THE SAME patch again on 2023-08-21, but it just only added a little part content from original 273bc8bf2227. +static const struct snd_soc_acpi_codecs rpl_nau8318_amp = { + .num_codecs = 1, + .codecs = {"NVTN2012"} +}; + It caused "rpl_nau8318_amp" to be redefined. This condition only happens at broonie/ci.git's file0yZ50U branch.
Could you check this one again? thanks.
On Wed, Aug 23, 2023 at 11:51 PM Mark Brown broonie@kernel.org wrote:
That's my CI tree, things in there aren't going anywhere unless they pass testing.
Hi, Mark,
Thank you for your explanation.
participants (2)
-
Ajye Huang -
Mark Brown