ASoC: sunxi: rename SND_SUN8I_ADDA_PR_REGMAP
diff mbox series

Message ID 20181102153406.1528053-1-arnd@arndb.de
State New
Headers show
Series
  • ASoC: sunxi: rename SND_SUN8I_ADDA_PR_REGMAP
Related show

Commit Message

Arnd Bergmann Nov. 2, 2018, 3:33 p.m. UTC
The newly added SND_SUN50I_CODEC_ANALOG driver selects a nonexisting
symbol SND_SUNXI_ADDA_PR_REGMAP, which was evidently intended to replace
SND_SUN8I_ADDA_PR_REGMAP, but since they are now mismatched, we can run
into link errors for some configurations:

sound/soc/sunxi/sun50i-codec-analog.o: In function `sun50i_codec_analog_probe':
sun50i-codec-analog.c:(.text+0x62): undefined reference to `sun8i_adda_pr_regmap_init'

The new name appears to be more sensible, and as the symbol is hidden,
there are no downsides in the rename, so use that consistently now.

Fixes: 42371f327df0 ("ASoC: sunxi: Add new driver for Allwinner A64 codec's analog path controls")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
 sound/soc/sunxi/Kconfig  | 4 ++--
 sound/soc/sunxi/Makefile | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

Comments

Vasily Khoruzhick Nov. 2, 2018, 4 p.m. UTC | #1
On Friday, November 2, 2018 8:33:40 AM PDT Arnd Bergmann wrote:
> The newly added SND_SUN50I_CODEC_ANALOG driver selects a nonexisting
> symbol SND_SUNXI_ADDA_PR_REGMAP, which was evidently intended to replace
> SND_SUN8I_ADDA_PR_REGMAP, but since they are now mismatched, we can run
> into link errors for some configurations:
> 
> sound/soc/sunxi/sun50i-codec-analog.o: In function
> `sun50i_codec_analog_probe': sun50i-codec-analog.c:(.text+0x62): undefined
> reference to `sun8i_adda_pr_regmap_init'
> 
> The new name appears to be more sensible, and as the symbol is hidden,
> there are no downsides in the rename, so use that consistently now.

Maxime asked it to be SND_SUN8I_ADDA_PR_REGMAP, and also it would be easier to 
fix it my renaming last remaining SND_SUNXI_ADDA_PR_REGMAP to 
SND_SUN8I_ADDA_PR_REGMAP.

> Fixes: 42371f327df0 ("ASoC: sunxi: Add new driver for Allwinner A64 codec's
> analog path controls") Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> ---
>  sound/soc/sunxi/Kconfig  | 4 ++--
>  sound/soc/sunxi/Makefile | 2 +-
>  2 files changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/sound/soc/sunxi/Kconfig b/sound/soc/sunxi/Kconfig
> index 66aad0d3f9c7..0f992bdf1a10 100644
> --- a/sound/soc/sunxi/Kconfig
> +++ b/sound/soc/sunxi/Kconfig
> @@ -23,7 +23,7 @@ config SND_SUN8I_CODEC
>  config SND_SUN8I_CODEC_ANALOG
>  	tristate "Allwinner sun8i Codec Analog Controls Support"
>  	depends on MACH_SUN8I || (ARM64 && ARCH_SUNXI) || COMPILE_TEST
> -	select SND_SUN8I_ADDA_PR_REGMAP
> +	select SND_SUNXI_ADDA_PR_REGMAP
>  	help
>  	  Say Y or M if you want to add support for the analog controls for
>  	  the codec embedded in newer Allwinner SoCs.
> @@ -54,7 +54,7 @@ config SND_SUN4I_SPDIF
>  	  Say Y or M to add support for the S/PDIF audio block in the Allwinner
>  	  A10 and affiliated SoCs.
> 
> -config SND_SUN8I_ADDA_PR_REGMAP
> +config SND_SUNXI_ADDA_PR_REGMAP
>  	tristate
>  	select REGMAP
> 
> diff --git a/sound/soc/sunxi/Makefile b/sound/soc/sunxi/Makefile
> index a86be340a076..c4dd2803a011 100644
> --- a/sound/soc/sunxi/Makefile
> +++ b/sound/soc/sunxi/Makefile
> @@ -5,4 +5,4 @@ obj-$(CONFIG_SND_SUN4I_SPDIF) += sun4i-spdif.o
>  obj-$(CONFIG_SND_SUN8I_CODEC_ANALOG) += sun8i-codec-analog.o
>  obj-$(CONFIG_SND_SUN50I_CODEC_ANALOG) += sun50i-codec-analog.o
>  obj-$(CONFIG_SND_SUN8I_CODEC) += sun8i-codec.o
> -obj-$(CONFIG_SND_SUN8I_ADDA_PR_REGMAP) += sun8i-adda-pr-regmap.o
> +obj-$(CONFIG_SND_SUNXI_ADDA_PR_REGMAP) += sun8i-adda-pr-regmap.o
Arnd Bergmann Nov. 2, 2018, 10:04 p.m. UTC | #2
On 11/2/18, Vasily Khoruzhick <anarsoul@gmail.com> wrote:
> On Friday, November 2, 2018 8:33:40 AM PDT Arnd Bergmann wrote:
>> The newly added SND_SUN50I_CODEC_ANALOG driver selects a nonexisting
>> symbol SND_SUNXI_ADDA_PR_REGMAP, which was evidently intended to replace
>> SND_SUN8I_ADDA_PR_REGMAP, but since they are now mismatched, we can run
>> into link errors for some configurations:
>>
>> sound/soc/sunxi/sun50i-codec-analog.o: In function
>> `sun50i_codec_analog_probe': sun50i-codec-analog.c:(.text+0x62):
>> undefined
>> reference to `sun8i_adda_pr_regmap_init'
>>
>> The new name appears to be more sensible, and as the symbol is hidden,
>> there are no downsides in the rename, so use that consistently now.
>
> Maxime asked it to be SND_SUN8I_ADDA_PR_REGMAP, and also it would be easier
> to
> fix it my renaming last remaining SND_SUNXI_ADDA_PR_REGMAP to
> SND_SUN8I_ADDA_PR_REGMAP.

Sure, I don't care either way. Please send a patch to do that then.

      Arnd
Vasily Khoruzhick Nov. 2, 2018, 10:06 p.m. UTC | #3
On Fri, Nov 2, 2018 at 3:04 PM Arnd Bergmann <arnd@arndb.de> wrote:
>
> On 11/2/18, Vasily Khoruzhick <anarsoul@gmail.com> wrote:
> > On Friday, November 2, 2018 8:33:40 AM PDT Arnd Bergmann wrote:
> >> The newly added SND_SUN50I_CODEC_ANALOG driver selects a nonexisting
> >> symbol SND_SUNXI_ADDA_PR_REGMAP, which was evidently intended to replace
> >> SND_SUN8I_ADDA_PR_REGMAP, but since they are now mismatched, we can run
> >> into link errors for some configurations:
> >>
> >> sound/soc/sunxi/sun50i-codec-analog.o: In function
> >> `sun50i_codec_analog_probe': sun50i-codec-analog.c:(.text+0x62):
> >> undefined
> >> reference to `sun8i_adda_pr_regmap_init'
> >>
> >> The new name appears to be more sensible, and as the symbol is hidden,
> >> there are no downsides in the rename, so use that consistently now.
> >
> > Maxime asked it to be SND_SUN8I_ADDA_PR_REGMAP, and also it would be easier
> > to
> > fix it my renaming last remaining SND_SUNXI_ADDA_PR_REGMAP to
> > SND_SUN8I_ADDA_PR_REGMAP.
>
> Sure, I don't care either way. Please send a patch to do that then.

Will do tonight.

>
>       Arnd
Borislav Petkov Nov. 22, 2018, 9:29 p.m. UTC | #4
On Fri, Nov 02, 2018 at 03:06:59PM -0700, Vasily Khoruzhick wrote:
> On Fri, Nov 2, 2018 at 3:04 PM Arnd Bergmann <arnd@arndb.de> wrote:
> >
> > On 11/2/18, Vasily Khoruzhick <anarsoul@gmail.com> wrote:
> > > On Friday, November 2, 2018 8:33:40 AM PDT Arnd Bergmann wrote:
> > >> The newly added SND_SUN50I_CODEC_ANALOG driver selects a nonexisting
> > >> symbol SND_SUNXI_ADDA_PR_REGMAP, which was evidently intended to replace
> > >> SND_SUN8I_ADDA_PR_REGMAP, but since they are now mismatched, we can run
> > >> into link errors for some configurations:
> > >>
> > >> sound/soc/sunxi/sun50i-codec-analog.o: In function
> > >> `sun50i_codec_analog_probe': sun50i-codec-analog.c:(.text+0x62):
> > >> undefined
> > >> reference to `sun8i_adda_pr_regmap_init'
> > >>
> > >> The new name appears to be more sensible, and as the symbol is hidden,
> > >> there are no downsides in the rename, so use that consistently now.
> > >
> > > Maxime asked it to be SND_SUN8I_ADDA_PR_REGMAP, and also it would be easier
> > > to
> > > fix it my renaming last remaining SND_SUNXI_ADDA_PR_REGMAP to
> > > SND_SUN8I_ADDA_PR_REGMAP.
> >
> > Sure, I don't care either way. Please send a patch to do that then.
> 
> Will do tonight.

Is that patch coming up or on its way somewhere?

I still hit randconfig build failures:

ERROR: "sun8i_adda_pr_regmap_init" [sound/soc/sunxi/sun50i-codec-analog.ko] undefined!
make[1]: *** [__modpost] Error 1
make: *** [modules] Error 2
Takashi Iwai Nov. 22, 2018, 10:20 p.m. UTC | #5
On Thu, 22 Nov 2018 22:29:05 +0100,
Borislav Petkov wrote:
> 
> On Fri, Nov 02, 2018 at 03:06:59PM -0700, Vasily Khoruzhick wrote:
> > On Fri, Nov 2, 2018 at 3:04 PM Arnd Bergmann <arnd@arndb.de> wrote:
> > >
> > > On 11/2/18, Vasily Khoruzhick <anarsoul@gmail.com> wrote:
> > > > On Friday, November 2, 2018 8:33:40 AM PDT Arnd Bergmann wrote:
> > > >> The newly added SND_SUN50I_CODEC_ANALOG driver selects a nonexisting
> > > >> symbol SND_SUNXI_ADDA_PR_REGMAP, which was evidently intended to replace
> > > >> SND_SUN8I_ADDA_PR_REGMAP, but since they are now mismatched, we can run
> > > >> into link errors for some configurations:
> > > >>
> > > >> sound/soc/sunxi/sun50i-codec-analog.o: In function
> > > >> `sun50i_codec_analog_probe': sun50i-codec-analog.c:(.text+0x62):
> > > >> undefined
> > > >> reference to `sun8i_adda_pr_regmap_init'
> > > >>
> > > >> The new name appears to be more sensible, and as the symbol is hidden,
> > > >> there are no downsides in the rename, so use that consistently now.
> > > >
> > > > Maxime asked it to be SND_SUN8I_ADDA_PR_REGMAP, and also it would be easier
> > > > to
> > > > fix it my renaming last remaining SND_SUNXI_ADDA_PR_REGMAP to
> > > > SND_SUN8I_ADDA_PR_REGMAP.
> > >
> > > Sure, I don't care either way. Please send a patch to do that then.
> > 
> > Will do tonight.
> 
> Is that patch coming up or on its way somewhere?
> 
> I still hit randconfig build failures:
> 
> ERROR: "sun8i_adda_pr_regmap_init" [sound/soc/sunxi/sun50i-codec-analog.ko] undefined!
> make[1]: *** [__modpost] Error 1
> make: *** [modules] Error 2

It's been in Mark's asoc tree.

Mark, could you send a pull request?  It might be too late for rc4,
but sooner, better.


thanks,

Takashi

Patch
diff mbox series

diff --git a/sound/soc/sunxi/Kconfig b/sound/soc/sunxi/Kconfig
index 66aad0d3f9c7..0f992bdf1a10 100644
--- a/sound/soc/sunxi/Kconfig
+++ b/sound/soc/sunxi/Kconfig
@@ -23,7 +23,7 @@  config SND_SUN8I_CODEC
 config SND_SUN8I_CODEC_ANALOG
 	tristate "Allwinner sun8i Codec Analog Controls Support"
 	depends on MACH_SUN8I || (ARM64 && ARCH_SUNXI) || COMPILE_TEST
-	select SND_SUN8I_ADDA_PR_REGMAP
+	select SND_SUNXI_ADDA_PR_REGMAP
 	help
 	  Say Y or M if you want to add support for the analog controls for
 	  the codec embedded in newer Allwinner SoCs.
@@ -54,7 +54,7 @@  config SND_SUN4I_SPDIF
 	  Say Y or M to add support for the S/PDIF audio block in the Allwinner
 	  A10 and affiliated SoCs.
 
-config SND_SUN8I_ADDA_PR_REGMAP
+config SND_SUNXI_ADDA_PR_REGMAP
 	tristate
 	select REGMAP
 
diff --git a/sound/soc/sunxi/Makefile b/sound/soc/sunxi/Makefile
index a86be340a076..c4dd2803a011 100644
--- a/sound/soc/sunxi/Makefile
+++ b/sound/soc/sunxi/Makefile
@@ -5,4 +5,4 @@  obj-$(CONFIG_SND_SUN4I_SPDIF) += sun4i-spdif.o
 obj-$(CONFIG_SND_SUN8I_CODEC_ANALOG) += sun8i-codec-analog.o
 obj-$(CONFIG_SND_SUN50I_CODEC_ANALOG) += sun50i-codec-analog.o
 obj-$(CONFIG_SND_SUN8I_CODEC) += sun8i-codec.o
-obj-$(CONFIG_SND_SUN8I_ADDA_PR_REGMAP) += sun8i-adda-pr-regmap.o
+obj-$(CONFIG_SND_SUNXI_ADDA_PR_REGMAP) += sun8i-adda-pr-regmap.o