Skip to contentSkip to conversation

ASoC: eukrea-tlv320: Remove include line of fsl_ssi.h

PATCH Superseded Nicolin Chen 2 participants 4 messages Dec 2, 2017 – Dec 4, 2017

Subsystems (2)

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 9/9 ASoC: eukrea-tlv320: Remove include line of fsl_ssi.h

The machine driver links both imx-ssi (legacy non-DT driver) and fsl_ssi (up-to-date DT based driver). So It also includes both imx-ssi.h and fsl_ssi.h header files. This creates a limitation for two header files -- they can't define anything with identical names.

Since the eukrea-tlv320 machine driver now does not really need anything being defined in the fsl_ssi header file, and it's also going to take some time to clean up two SSI drivers, this patch takes a quick way to remove the #include fsl_ssi.h line for now. It can be added back once the header files are done refactoring.

The eukrea-tlv320 driver is still compiled successfully without any erorr using imx_v6_v6_defconfig, after removing it.

---
 sound/soc/fsl/eukrea-tlv320.c | 1 -
 1 file changed, 1 deletion(-)
sound/soc/fsl/eukrea-tlv320.c +0 -1
index 84ef638..191426a 100644
@@ -29,7 +29,6 @@
 
 #include "../codecs/tlv320aic23.h"
 #include "imx-ssi.h"
-#include "fsl_ssi.h"
 #include "imx-audmux.h"
 
 #define CODEC_CLOCK 12000000
Signature · 1 line
2.7.4
#1 lore raw

[PATCH 9/9] ASoC: eukrea-tlv320: Remove include line of fsl_ssi.h

Please ignore the "9/9" in the tag...I forgot to clean it. It would be removed after getting applied though...

#2 lore raw
In reply to Nicolin Chen
Quoted 2 lines · Nicolin Chen

The eukrea-tlv320 driver is still compiled successfully without any erorr using imx_v6_v6_defconfig, after removing it.

A typo here, should be imx_v6_v7_defconfig. Sending a v2 anyway.

Please ignore this version. Thanks.

maintainer
#3 lore raw

Applied "ASoC: eukrea-tlv320: Remove include line of fsl_ssi.h" to the asoc tree

In reply to Nicolin Chen

The patch

ASoC: eukrea-tlv320: Remove include line of fsl_ssi.h

has been applied to the asoc tree at

https://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

Quoted 1 line

From 8f1a1df58e011e54ffcc2acd09249579e9467544 Mon Sep 17 00:00:00 2001

From: Nicolin Chen <[email protected]>
Date: Fri, 1 Dec 2017 22:32:35 -0800
Subject: [PATCH] ASoC: eukrea-tlv320: Remove include line of fsl_ssi.h

The machine driver links both imx-ssi (legacy non-DT driver) and fsl_ssi (up-to-date DT based driver). So It also includes both imx-ssi.h and fsl_ssi.h header files. This creates a limitation for two header files -- they can't define anything with identical names.

Since the eukrea-tlv320 machine driver now does not really need anything being defined in the fsl_ssi header file, and it's also going to take some time to clean up two SSI drivers, this patch takes a quick way to remove the #include fsl_ssi.h line for now. It can be added back once the header files are done refactoring.

The eukrea-tlv320 driver is still compiled successfully without any erorr using imx_v6_v7_defconfig, after removing it.

---
 sound/soc/fsl/eukrea-tlv320.c | 1 -
 1 file changed, 1 deletion(-)
sound/soc/fsl/eukrea-tlv320.c +0 -1
index 84ef6385736c..191426a6d9ad 100644
@@ -29,7 +29,6 @@
 
 #include "../codecs/tlv320aic23.h"
 #include "imx-ssi.h"
-#include "fsl_ssi.h"
 #include "imx-audmux.h"
 
 #define CODEC_CLOCK 12000000
Signature · 1 line
2.15.0