ALSA: misc: Use *-y instead of *-objs in Makefile

*-objs suffix is reserved rather for (user-space) host programs while
usually *-y suffix is used for kernel drivers (although *-objs works
for that purpose for now).

Let's correct the old usages of *-objs in Makefiles.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-by: Jaroslav Kysela <perex@perex.cz>
Link: https://lore.kernel.org/r/20240507135513.14919-10-tiwai@suse.de

diff --git a/sound/arm/Makefile b/sound/arm/Makefile
index 34c7694898779581e7ffeee20aaeef95eba6cea9..899edb4bb278dad0e7dd90fd11703f4dca6c3cb1 100644 (file)
--- a/sound/arm/Makefile
+++ b/sound/arm/Makefile
@@ -4,11 +4,11 @@
 #
 
 obj-$(CONFIG_SND_ARMAACI)      += snd-aaci.o
-snd-aaci-objs                  := aaci.o
+snd-aaci-y                     := aaci.o
 
 obj-$(CONFIG_SND_PXA2XX_LIB)   += snd-pxa2xx-lib.o
 snd-pxa2xx-lib-y               := pxa2xx-pcm-lib.o
 snd-pxa2xx-lib-$(CONFIG_SND_PXA2XX_LIB_AC97)   += pxa2xx-ac97-lib.o
 
 obj-$(CONFIG_SND_PXA2XX_AC97)  += snd-pxa2xx-ac97.o
-snd-pxa2xx-ac97-objs           := pxa2xx-ac97.o
+snd-pxa2xx-ac97-y              := pxa2xx-ac97.o

diff --git a/sound/atmel/Makefile b/sound/atmel/Makefile
index 57bc6f65be193a5cca0516f74d5a1314f7e48bc9..a8917d1854c7db6d548540265f086b0ad8f54982 100644 (file)
--- a/sound/atmel/Makefile
+++ b/sound/atmel/Makefile
@@ -1,4 +1,4 @@
 # SPDX-License-Identifier: GPL-2.0-only
-snd-atmel-ac97c-objs           := ac97c.o
+snd-atmel-ac97c-y              := ac97c.o
 
 obj-$(CONFIG_SND_ATMEL_AC97C)  += snd-atmel-ac97c.o

diff --git a/sound/i2c/Makefile b/sound/i2c/Makefile
index 09978855e08e060d5d25f3f651163a43eecf97f2..c827f9f70a339e24dea27e44875e1e9a78b22d0a 100644 (file)
--- a/sound/i2c/Makefile
+++ b/sound/i2c/Makefile
@@ -4,9 +4,9 @@
 # Copyright (c) 2001 by Jaroslav Kysela <perex@perex.cz>
 #
 
-snd-i2c-objs := i2c.o
-snd-cs8427-objs := cs8427.o
-snd-tea6330t-objs := tea6330t.o
+snd-i2c-y := i2c.o
+snd-cs8427-y := cs8427.o
+snd-tea6330t-y := tea6330t.o
 
 obj-$(CONFIG_SND) += other/
 

diff --git a/sound/i2c/other/Makefile b/sound/i2c/other/Makefile
index 1a4ce1236146665de8199014e1b9d4c63f29d5d6..0a2c0d147ab88350d86cbf59e9f5351e71b9550b 100644 (file)
--- a/sound/i2c/other/Makefile
+++ b/sound/i2c/other/Makefile
@@ -4,11 +4,11 @@
 # Copyright (c) 2003 by Jaroslav Kysela <perex@perex.cz>
 #
 
-snd-ak4114-objs := ak4114.o
-snd-ak4117-objs := ak4117.o
-snd-ak4113-objs := ak4113.o
-snd-ak4xxx-adda-objs := ak4xxx-adda.o
-snd-pt2258-objs := pt2258.o
+snd-ak4114-y := ak4114.o
+snd-ak4117-y := ak4117.o
+snd-ak4113-y := ak4113.o
+snd-ak4xxx-adda-y := ak4xxx-adda.o
+snd-pt2258-y := pt2258.o
 
 # Module Dependency
 obj-$(CONFIG_SND_PDAUDIOCF) += snd-ak4117.o

diff --git a/sound/mips/Makefile b/sound/mips/Makefile
index 7c86268b2bf3fe889997f4f64891f87f3a4c8d30..bfbf3bda487baccd008df69f091b7a7078788951 100644 (file)
--- a/sound/mips/Makefile
+++ b/sound/mips/Makefile
@@ -3,8 +3,8 @@
 # Makefile for ALSA
 #
 
-snd-sgi-o2-objs := sgio2audio.o ad1843.o
-snd-sgi-hal2-objs := hal2.o
+snd-sgi-o2-y := sgio2audio.o ad1843.o
+snd-sgi-hal2-y := hal2.o
 
 # Toplevel Module Dependency
 obj-$(CONFIG_SND_SGI_O2) += snd-sgi-o2.o

diff --git a/sound/parisc/Makefile b/sound/parisc/Makefile
index 10891c3b7d91431c4ced268b88d2dd12c9240f8e..84c71490fb72ceea9aeff3f510c6460017e39fb6 100644 (file)
--- a/sound/parisc/Makefile
+++ b/sound/parisc/Makefile
@@ -3,7 +3,7 @@
 # Makefile for ALSA
 #
 
-snd-harmony-objs := harmony.o
+snd-harmony-y := harmony.o
 
 # Toplevel Module Dependency
 obj-$(CONFIG_SND_HARMONY) += snd-harmony.o

diff --git a/sound/pcmcia/pdaudiocf/Makefile b/sound/pcmcia/pdaudiocf/Makefile
index ea0d67576df9ee02b8b190ec76433ed27f9902d9..34a288c1eebdb54b282868ec769b8cd6024b9141 100644 (file)
--- a/sound/pcmcia/pdaudiocf/Makefile
+++ b/sound/pcmcia/pdaudiocf/Makefile
@@ -4,6 +4,6 @@
 # Copyright (c) 2004 by Jaroslav Kysela <perex@perex.cz>
 #
 
-snd-pdaudiocf-objs := pdaudiocf.o pdaudiocf_core.o pdaudiocf_irq.o pdaudiocf_pcm.o
+snd-pdaudiocf-y := pdaudiocf.o pdaudiocf_core.o pdaudiocf_irq.o pdaudiocf_pcm.o
 
 obj-$(CONFIG_SND_PDAUDIOCF) += snd-pdaudiocf.o

diff --git a/sound/pcmcia/vx/Makefile b/sound/pcmcia/vx/Makefile
index b25006e4d25a8e53d05fc502495af78940470981..abd1875449461254dd7eacb47aefbff6c9eb1919 100644 (file)
--- a/sound/pcmcia/vx/Makefile
+++ b/sound/pcmcia/vx/Makefile
@@ -4,6 +4,6 @@
 # Copyright (c) 2001 by Jaroslav Kysela <perex@perex.cz>
 #
 
-snd-vxpocket-objs := vxpocket.o vxp_ops.o vxp_mixer.o
+snd-vxpocket-y := vxpocket.o vxp_ops.o vxp_mixer.o
 
 obj-$(CONFIG_SND_VXPOCKET) += snd-vxpocket.o

diff --git a/sound/ppc/Makefile b/sound/ppc/Makefile
index 0188ce3e30b8f69e407d10a52c928ed17ad40a3b..655bcffba843cf17a9b07e91c6c2ce31647426b2 100644 (file)
--- a/sound/ppc/Makefile
+++ b/sound/ppc/Makefile
@@ -4,7 +4,7 @@
 # Copyright (c) 2001 by Jaroslav Kysela <perex@perex.cz>
 #
 
-snd-powermac-objs := powermac.o pmac.o awacs.o burgundy.o daca.o tumbler.o keywest.o beep.o
+snd-powermac-y := powermac.o pmac.o awacs.o burgundy.o daca.o tumbler.o keywest.o beep.o
 
 # Toplevel Module Dependency
 obj-$(CONFIG_SND_POWERMAC)     += snd-powermac.o

diff --git a/sound/sh/Makefile b/sound/sh/Makefile
index c0bbc500c17c737708c0a48b1ac1d6b54c65bf72..6871dece28a550226d8718d1c235e08963927b68 100644 (file)
--- a/sound/sh/Makefile
+++ b/sound/sh/Makefile
@@ -3,8 +3,8 @@
 # Makefile for ALSA
 #
 
-snd-aica-objs := aica.o
-snd-sh_dac_audio-objs := sh_dac_audio.o
+snd-aica-y := aica.o
+snd-sh_dac_audio-y := sh_dac_audio.o
 
 # Toplevel Module Dependency
 obj-$(CONFIG_SND_AICA) += snd-aica.o

diff --git a/sound/sparc/Makefile b/sound/sparc/Makefile
index e1f596571d7ff9872769929476faac624dbab8db..0a03123933c66cbbd2b6a8231f63ea35921f1916 100644 (file)
--- a/sound/sparc/Makefile
+++ b/sound/sparc/Makefile
@@ -4,9 +4,9 @@
 # Copyright (c) 2002 by David S. Miller <davem@redhat.com>
 #
 
-snd-sun-amd7930-objs := amd7930.o
-snd-sun-cs4231-objs := cs4231.o
-snd-sun-dbri-objs := dbri.o
+snd-sun-amd7930-y := amd7930.o
+snd-sun-cs4231-y := cs4231.o
+snd-sun-dbri-y := dbri.o
 
 obj-$(CONFIG_SND_SUN_AMD7930) += snd-sun-amd7930.o
 obj-$(CONFIG_SND_SUN_CS4231) += snd-sun-cs4231.o

diff --git a/sound/spi/Makefile b/sound/spi/Makefile
index a3834919b0f6e3cb159c308cb3edfda7e967ca24..d6a198a4491741bf24876ce37425b1b1184261c8 100644 (file)
--- a/sound/spi/Makefile
+++ b/sound/spi/Makefile
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0
 # Makefile for SPI drivers
 
-snd-at73c213-objs              := at73c213.o
+snd-at73c213-y         := at73c213.o
 
 obj-$(CONFIG_SND_AT73C213)     += snd-at73c213.o

diff --git a/sound/synth/Makefile b/sound/synth/Makefile
index b9f71d5dbc8c0b74c1c90829ac0edead02bb3f75..369f3be2cd17656d3469eff1034747b361621117 100644 (file)
--- a/sound/synth/Makefile
+++ b/sound/synth/Makefile
@@ -4,7 +4,7 @@
 # Copyright (c) 2001 by Jaroslav Kysela <perex@perex.cz>
 #
 
-snd-util-mem-objs := util_mem.o
+snd-util-mem-y := util_mem.o
 
 # Toplevel Module Dependency
 obj-$(CONFIG_SND_EMU10K1) += snd-util-mem.o

diff --git a/sound/synth/emux/Makefile b/sound/synth/emux/Makefile
index ed28c81ac12e11c1eb70fc89e151c8d37f10ab55..59357da6d1ef8fbe20d5982dbbd6875900c06aaa 100644 (file)
--- a/sound/synth/emux/Makefile
+++ b/sound/synth/emux/Makefile
@@ -4,7 +4,7 @@
 # Copyright (c) 2001 by Jaroslav Kysela <perex@perex.cz>
 #
 
-snd-emux-synth-objs := emux.o emux_synth.o emux_seq.o emux_nrpn.o \
+snd-emux-synth-y := emux.o emux_synth.o emux_seq.o emux_nrpn.o \
                       emux_effect.o emux_hwdep.o soundfont.o
 snd-emux-synth-$(CONFIG_SND_PROC_FS) += emux_proc.o
 ifneq ($(CONFIG_SND_SEQUENCER_OSS),)

diff --git a/sound/virtio/Makefile b/sound/virtio/Makefile
index a839f8c8b5e6478c9f7b6ec3c8b60e6be4750ecb..3ca41b3c8b95bffc615d4cfa75a601b6a3183401 100644 (file)
--- a/sound/virtio/Makefile
+++ b/sound/virtio/Makefile
@@ -2,7 +2,7 @@
 
 obj-$(CONFIG_SND_VIRTIO) += virtio_snd.o
 
-virtio_snd-objs := \
+virtio_snd-y := \
        virtio_card.o \
        virtio_chmap.o \
        virtio_ctl_msg.o \

diff --git a/sound/x86/Makefile b/sound/x86/Makefile
index 6b5ffb329d472824c355fe081f3cd5f5e2ca68d1..44d2a339615d9bd597d9d6066d68d22e5ac7b2de 100644 (file)
--- a/sound/x86/Makefile
+++ b/sound/x86/Makefile
@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: GPL-2.0-only
-snd-hdmi-lpe-audio-objs += \
+snd-hdmi-lpe-audio-y += \
        intel_hdmi_audio.o
 
 obj-$(CONFIG_HDMI_LPE_AUDIO) += snd-hdmi-lpe-audio.o

diff --git a/sound/xen/Makefile b/sound/xen/Makefile
index 24031775b7153292d138a272e998c068c6be8364..5dab1616eac099dd1fc11c260f26b6c00440e335 100644 (file)
--- a/sound/xen/Makefile
+++ b/sound/xen/Makefile
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0 OR MIT
 
-snd_xen_front-objs := xen_snd_front.o \
+snd_xen_front-y := xen_snd_front.o \
                      xen_snd_front_cfg.o \
                      xen_snd_front_evtchnl.o \
                      xen_snd_front_alsa.o