[PATCH] ASoC: ti: ams-delta: Allow it to be test compiled
The driver is now built only when MACH_AMS_DELTA is selected, which requires a very specific selection of ARCH settings. As a consequence, it gets very little attention from build-bots, if not none.
Drop the driver dependency on <asm/mach-types.h>, no longer required since conversion to snd_soc_register_card() and drop of machine_is_ams_delta(). With that in place, allow the driver to be built in any environment as long as COMPILE_TEST is selected. Take care of not selecting SND_SOC_OMAP_MCBSP if COMMON_CLK is not selected.
Signed-off-by: Janusz Krzysztofik jmkrzyszt@gmail.com --- sound/soc/ti/Kconfig | 5 +++-- sound/soc/ti/ams-delta.c | 2 -- 2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/sound/soc/ti/Kconfig b/sound/soc/ti/Kconfig index 593be22503b5..e22e41af3226 100644 --- a/sound/soc/ti/Kconfig +++ b/sound/soc/ti/Kconfig @@ -125,8 +125,9 @@ config SND_SOC_OMAP_ABE_TWL6040
config SND_SOC_OMAP_AMS_DELTA tristate "SoC Audio support for Amstrad E3 (Delta) videophone" - depends on MACH_AMS_DELTA && TTY - select SND_SOC_OMAP_MCBSP + depends on MACH_AMS_DELTA || COMPILE_TEST + depends on TTY + select SND_SOC_OMAP_MCBSP if COMMON_CLK select SND_SOC_CX20442 help Say Y or M if you want to add support for SoC audio device diff --git a/sound/soc/ti/ams-delta.c b/sound/soc/ti/ams-delta.c index 371943350fdf..7436cca2d2e0 100644 --- a/sound/soc/ti/ams-delta.c +++ b/sound/soc/ti/ams-delta.c @@ -16,8 +16,6 @@ #include <sound/soc.h> #include <sound/jack.h>
-#include <asm/mach-types.h> - #include <linux/platform_data/asoc-ti-mcbsp.h>
#include "omap-mcbsp.h"
Hi Janusz,
kernel test robot noticed the following build errors:
[auto build test ERROR on broonie-sound/for-next] [also build test ERROR on linus/master v6.6-rc4 next-20231006] [If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in https://git-scm.com/docs/git-format-patch#_base_tree_information]
url: https://github.com/intel-lab-lkp/linux/commits/Janusz-Krzysztofik/ASoC-ti-am... base: https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next patch link: https://lore.kernel.org/r/20231008135601.542356-1-jmkrzyszt%40gmail.com patch subject: [PATCH] ASoC: ti: ams-delta: Allow it to be test compiled config: sh-allmodconfig (https://download.01.org/0day-ci/archive/20231009/202310090122.Yp9JndiQ-lkp@i...) compiler: sh4-linux-gcc (GCC) 13.2.0 reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20231009/202310090122.Yp9JndiQ-lkp@i...)
If you fix the issue in a separate patch/commit (i.e. not just a new version of the same patch/commit), kindly add following tags | Reported-by: kernel test robot lkp@intel.com | Closes: https://lore.kernel.org/oe-kbuild-all/202310090122.Yp9JndiQ-lkp@intel.com/
All errors (new ones prefixed by >>):
sound/soc/ti/ams-delta.c:401:24: error: initialization of 'void (*)(struct tty_struct *, const u8 *, const u8 *, size_t)' {aka 'void (*)(struct tty_struct *, const unsigned char *, const unsigned char *, unsigned int)'} from incompatible pointer type 'void (*)(struct tty_struct *, const u8 *, const char *, int)' {aka 'void (*)(struct tty_struct *, const unsigned char *, const char *, int)'} [-Werror=incompatible-pointer-types]
401 | .receive_buf = cx81801_receive, | ^~~~~~~~~~~~~~~ sound/soc/ti/ams-delta.c:401:24: note: (near initialization for 'cx81801_ops.receive_buf') cc1: some warnings being treated as errors
vim +401 sound/soc/ti/ams-delta.c
6d7f68a1eab3d5 sound/soc/omap/ams-delta.c Janusz Krzysztofik 2009-07-29 393 6d7f68a1eab3d5 sound/soc/omap/ams-delta.c Janusz Krzysztofik 2009-07-29 394 static struct tty_ldisc_ops cx81801_ops = { 6d7f68a1eab3d5 sound/soc/omap/ams-delta.c Janusz Krzysztofik 2009-07-29 395 .name = "cx81801", fbadf70a8053b3 sound/soc/ti/ams-delta.c Jiri Slaby 2021-05-05 396 .num = N_V253, 6d7f68a1eab3d5 sound/soc/omap/ams-delta.c Janusz Krzysztofik 2009-07-29 397 .owner = THIS_MODULE, 6d7f68a1eab3d5 sound/soc/omap/ams-delta.c Janusz Krzysztofik 2009-07-29 398 .open = cx81801_open, 6d7f68a1eab3d5 sound/soc/omap/ams-delta.c Janusz Krzysztofik 2009-07-29 399 .close = cx81801_close, 6d7f68a1eab3d5 sound/soc/omap/ams-delta.c Janusz Krzysztofik 2009-07-29 400 .hangup = cx81801_hangup, 6d7f68a1eab3d5 sound/soc/omap/ams-delta.c Janusz Krzysztofik 2009-07-29 @401 .receive_buf = cx81801_receive, 6d7f68a1eab3d5 sound/soc/omap/ams-delta.c Janusz Krzysztofik 2009-07-29 402 .write_wakeup = cx81801_wakeup, 6d7f68a1eab3d5 sound/soc/omap/ams-delta.c Janusz Krzysztofik 2009-07-29 403 }; 6d7f68a1eab3d5 sound/soc/omap/ams-delta.c Janusz Krzysztofik 2009-07-29 404 6d7f68a1eab3d5 sound/soc/omap/ams-delta.c Janusz Krzysztofik 2009-07-29 405
Dnia niedziela, 8 października 2023 20:03:21 CEST kernel test robot pisze:
Hi Janusz,
kernel test robot noticed the following build errors:
[auto build test ERROR on broonie-sound/for-next] [also build test ERROR on linus/master v6.6-rc4 next-20231006] [If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in https://git-scm.com/docs/git-format-patch#_base_tree_information]
url: https://github.com/intel-lab-lkp/linux/commits/Janusz-Krzysztofik/ASoC-ti-am... base: https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next patch link: https://lore.kernel.org/r/20231008135601.542356-1-jmkrzyszt%40gmail.com patch subject: [PATCH] ASoC: ti: ams-delta: Allow it to be test compiled config: sh-allmodconfig (https://download.01.org/0day-ci/archive/20231009/202310090122.Yp9JndiQ-lkp@i...) compiler: sh4-linux-gcc (GCC) 13.2.0 reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20231009/202310090122.Yp9JndiQ-lkp@i...)
If you fix the issue in a separate patch/commit (i.e. not just a new version of the same patch/commit), kindly add following tags | Reported-by: kernel test robot lkp@intel.com | Closes: https://lore.kernel.org/oe-kbuild-all/202310090122.Yp9JndiQ-lkp@intel.com/
All errors (new ones prefixed by >>):
sound/soc/ti/ams-delta.c:401:24: error: initialization of 'void (*)(struct tty_struct *, const u8 *, const u8 *, size_t)' {aka 'void (*)(struct tty_struct *, const unsigned char *, const unsigned char *, unsigned int)'} from incompatible pointer type 'void (*)(struct tty_struct *, const u8 *, const char *, int)' {aka 'void (*)(struct tty_struct *, const unsigned char *, const char *, int)'} [-Werror=incompatible-pointer-types]
401 | .receive_buf = cx81801_receive, | ^~~~~~~~~~~~~~~sound/soc/ti/ams-delta.c:401:24: note: (near initialization for 'cx81801_ops.receive_buf') cc1: some warnings being treated as errors
This is the error I reported and fixed in the recent "[PATCH] ASoC: ti: ams-delta: Fix cx81801_receive() argument types". This change just exhibits that error, still present in trees without that fix.
Mark, if you are OK with this change, could you please give your ack, like you did for the fix?
Greg, since you already added that fix to your tty-linux tree, commit b3fa3cf02e3c, could you please also take this patch?
Thanks, Janusz
vim +401 sound/soc/ti/ams-delta.c
6d7f68a1eab3d5 sound/soc/omap/ams-delta.c Janusz Krzysztofik 2009-07-29 393 6d7f68a1eab3d5 sound/soc/omap/ams-delta.c Janusz Krzysztofik 2009-07-29 394 static struct tty_ldisc_ops cx81801_ops = { 6d7f68a1eab3d5 sound/soc/omap/ams-delta.c Janusz Krzysztofik 2009-07-29 395 .name = "cx81801", fbadf70a8053b3 sound/soc/ti/ams-delta.c Jiri Slaby 2021-05-05 396 .num = N_V253, 6d7f68a1eab3d5 sound/soc/omap/ams-delta.c Janusz Krzysztofik 2009-07-29 397 .owner = THIS_MODULE, 6d7f68a1eab3d5 sound/soc/omap/ams-delta.c Janusz Krzysztofik 2009-07-29 398 .open = cx81801_open, 6d7f68a1eab3d5 sound/soc/omap/ams-delta.c Janusz Krzysztofik 2009-07-29 399 .close = cx81801_close, 6d7f68a1eab3d5 sound/soc/omap/ams-delta.c Janusz Krzysztofik 2009-07-29 400 .hangup = cx81801_hangup, 6d7f68a1eab3d5 sound/soc/omap/ams-delta.c Janusz Krzysztofik 2009-07-29 @401 .receive_buf = cx81801_receive, 6d7f68a1eab3d5 sound/soc/omap/ams-delta.c Janusz Krzysztofik 2009-07-29 402 .write_wakeup = cx81801_wakeup, 6d7f68a1eab3d5 sound/soc/omap/ams-delta.c Janusz Krzysztofik 2009-07-29 403 }; 6d7f68a1eab3d5 sound/soc/omap/ams-delta.c Janusz Krzysztofik 2009-07-29 404 6d7f68a1eab3d5 sound/soc/omap/ams-delta.c Janusz Krzysztofik 2009-07-29 405
Hi Janusz,
kernel test robot noticed the following build errors:
[auto build test ERROR on broonie-sound/for-next] [also build test ERROR on linus/master v6.6-rc4 next-20231006] [If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in https://git-scm.com/docs/git-format-patch#_base_tree_information]
url: https://github.com/intel-lab-lkp/linux/commits/Janusz-Krzysztofik/ASoC-ti-am... base: https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next patch link: https://lore.kernel.org/r/20231008135601.542356-1-jmkrzyszt%40gmail.com patch subject: [PATCH] ASoC: ti: ams-delta: Allow it to be test compiled config: alpha-allyesconfig (https://download.01.org/0day-ci/archive/20231009/202310090325.xWWpQOHP-lkp@i...) compiler: alpha-linux-gcc (GCC) 13.2.0 reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20231009/202310090325.xWWpQOHP-lkp@i...)
If you fix the issue in a separate patch/commit (i.e. not just a new version of the same patch/commit), kindly add following tags | Reported-by: kernel test robot lkp@intel.com | Closes: https://lore.kernel.org/oe-kbuild-all/202310090325.xWWpQOHP-lkp@intel.com/
All errors (new ones prefixed by >>):
sound/soc/ti/ams-delta.c:401:24: error: initialization of 'void (*)(struct tty_struct *, const u8 *, const u8 *, size_t)' {aka 'void (*)(struct tty_struct *, const unsigned char *, const unsigned char *, long unsigned int)'} from incompatible pointer type 'void (*)(struct tty_struct *, const u8 *, const char *, int)' {aka 'void (*)(struct tty_struct *, const unsigned char *, const char *, int)'} [-Werror=incompatible-pointer-types]
401 | .receive_buf = cx81801_receive, | ^~~~~~~~~~~~~~~ sound/soc/ti/ams-delta.c:401:24: note: (near initialization for 'cx81801_ops.receive_buf') cc1: some warnings being treated as errors
vim +401 sound/soc/ti/ams-delta.c
6d7f68a1eab3d5 sound/soc/omap/ams-delta.c Janusz Krzysztofik 2009-07-29 393 6d7f68a1eab3d5 sound/soc/omap/ams-delta.c Janusz Krzysztofik 2009-07-29 394 static struct tty_ldisc_ops cx81801_ops = { 6d7f68a1eab3d5 sound/soc/omap/ams-delta.c Janusz Krzysztofik 2009-07-29 395 .name = "cx81801", fbadf70a8053b3 sound/soc/ti/ams-delta.c Jiri Slaby 2021-05-05 396 .num = N_V253, 6d7f68a1eab3d5 sound/soc/omap/ams-delta.c Janusz Krzysztofik 2009-07-29 397 .owner = THIS_MODULE, 6d7f68a1eab3d5 sound/soc/omap/ams-delta.c Janusz Krzysztofik 2009-07-29 398 .open = cx81801_open, 6d7f68a1eab3d5 sound/soc/omap/ams-delta.c Janusz Krzysztofik 2009-07-29 399 .close = cx81801_close, 6d7f68a1eab3d5 sound/soc/omap/ams-delta.c Janusz Krzysztofik 2009-07-29 400 .hangup = cx81801_hangup, 6d7f68a1eab3d5 sound/soc/omap/ams-delta.c Janusz Krzysztofik 2009-07-29 @401 .receive_buf = cx81801_receive, 6d7f68a1eab3d5 sound/soc/omap/ams-delta.c Janusz Krzysztofik 2009-07-29 402 .write_wakeup = cx81801_wakeup, 6d7f68a1eab3d5 sound/soc/omap/ams-delta.c Janusz Krzysztofik 2009-07-29 403 }; 6d7f68a1eab3d5 sound/soc/omap/ams-delta.c Janusz Krzysztofik 2009-07-29 404 6d7f68a1eab3d5 sound/soc/omap/ams-delta.c Janusz Krzysztofik 2009-07-29 405
On Sun, Oct 08, 2023 at 03:53:10PM +0200, Janusz Krzysztofik wrote:
The driver is now built only when MACH_AMS_DELTA is selected, which requires a very specific selection of ARCH settings. As a consequence, it gets very little attention from build-bots, if not none.
Acked-by: Mark Brown broonie@kernel.org
On Thursday, 19 October 2023 13:40:57 CEST Mark Brown wrote:
On Sun, Oct 08, 2023 at 03:53:10PM +0200, Janusz Krzysztofik wrote:
The driver is now built only when MACH_AMS_DELTA is selected, which requires a very specific selection of ARCH settings. As a consequence, it gets very little attention from build-bots, if not none.
Acked-by: Mark Brown broonie@kernel.org
Hi Mark,
Thanks for your Ack.
Since the fix required for successful compilation of the ams-delta ASoC driver already reached v6.6, my former suggestion to pass this change also via Greg's tty tree is probably no longer vital.
Thanks, Janusz
On Sun, 08 Oct 2023 15:53:10 +0200, Janusz Krzysztofik wrote:
The driver is now built only when MACH_AMS_DELTA is selected, which requires a very specific selection of ARCH settings. As a consequence, it gets very little attention from build-bots, if not none.
Drop the driver dependency on <asm/mach-types.h>, no longer required since conversion to snd_soc_register_card() and drop of machine_is_ams_delta(). With that in place, allow the driver to be built in any environment as long as COMPILE_TEST is selected. Take care of not selecting SND_SOC_OMAP_MCBSP if COMMON_CLK is not selected.
[...]
Applied to
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next
Thanks!
[1/1] ASoC: ti: ams-delta: Allow it to be test compiled commit: 7790bccd7bac3af28bf044e188215041eb142d56
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)
-
Janusz Krzysztofik -
kernel test robot -
Mark Brown