Commit b7df4cc3 authored by Takashi Iwai's avatar Takashi Iwai

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: default avatarTakashi Iwai <tiwai@suse.de>
Reviewed-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-by: default avatarJaroslav Kysela <perex@perex.cz>
Link: https://lore.kernel.org/r/20240507135513.14919-10-tiwai@suse.de
parent c02ce173
...@@ -4,11 +4,11 @@ ...@@ -4,11 +4,11 @@
# #
obj-$(CONFIG_SND_ARMAACI) += snd-aaci.o 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 obj-$(CONFIG_SND_PXA2XX_LIB) += snd-pxa2xx-lib.o
snd-pxa2xx-lib-y := pxa2xx-pcm-lib.o snd-pxa2xx-lib-y := pxa2xx-pcm-lib.o
snd-pxa2xx-lib-$(CONFIG_SND_PXA2XX_LIB_AC97) += pxa2xx-ac97-lib.o snd-pxa2xx-lib-$(CONFIG_SND_PXA2XX_LIB_AC97) += pxa2xx-ac97-lib.o
obj-$(CONFIG_SND_PXA2XX_AC97) += snd-pxa2xx-ac97.o obj-$(CONFIG_SND_PXA2XX_AC97) += snd-pxa2xx-ac97.o
snd-pxa2xx-ac97-objs := pxa2xx-ac97.o snd-pxa2xx-ac97-y := pxa2xx-ac97.o
# SPDX-License-Identifier: GPL-2.0-only # 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 obj-$(CONFIG_SND_ATMEL_AC97C) += snd-atmel-ac97c.o
...@@ -4,9 +4,9 @@ ...@@ -4,9 +4,9 @@
# Copyright (c) 2001 by Jaroslav Kysela <perex@perex.cz> # Copyright (c) 2001 by Jaroslav Kysela <perex@perex.cz>
# #
snd-i2c-objs := i2c.o snd-i2c-y := i2c.o
snd-cs8427-objs := cs8427.o snd-cs8427-y := cs8427.o
snd-tea6330t-objs := tea6330t.o snd-tea6330t-y := tea6330t.o
obj-$(CONFIG_SND) += other/ obj-$(CONFIG_SND) += other/
......
...@@ -4,11 +4,11 @@ ...@@ -4,11 +4,11 @@
# Copyright (c) 2003 by Jaroslav Kysela <perex@perex.cz> # Copyright (c) 2003 by Jaroslav Kysela <perex@perex.cz>
# #
snd-ak4114-objs := ak4114.o snd-ak4114-y := ak4114.o
snd-ak4117-objs := ak4117.o snd-ak4117-y := ak4117.o
snd-ak4113-objs := ak4113.o snd-ak4113-y := ak4113.o
snd-ak4xxx-adda-objs := ak4xxx-adda.o snd-ak4xxx-adda-y := ak4xxx-adda.o
snd-pt2258-objs := pt2258.o snd-pt2258-y := pt2258.o
# Module Dependency # Module Dependency
obj-$(CONFIG_SND_PDAUDIOCF) += snd-ak4117.o obj-$(CONFIG_SND_PDAUDIOCF) += snd-ak4117.o
......
...@@ -3,8 +3,8 @@ ...@@ -3,8 +3,8 @@
# Makefile for ALSA # Makefile for ALSA
# #
snd-sgi-o2-objs := sgio2audio.o ad1843.o snd-sgi-o2-y := sgio2audio.o ad1843.o
snd-sgi-hal2-objs := hal2.o snd-sgi-hal2-y := hal2.o
# Toplevel Module Dependency # Toplevel Module Dependency
obj-$(CONFIG_SND_SGI_O2) += snd-sgi-o2.o obj-$(CONFIG_SND_SGI_O2) += snd-sgi-o2.o
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
# Makefile for ALSA # Makefile for ALSA
# #
snd-harmony-objs := harmony.o snd-harmony-y := harmony.o
# Toplevel Module Dependency # Toplevel Module Dependency
obj-$(CONFIG_SND_HARMONY) += snd-harmony.o obj-$(CONFIG_SND_HARMONY) += snd-harmony.o
...@@ -4,6 +4,6 @@ ...@@ -4,6 +4,6 @@
# Copyright (c) 2004 by Jaroslav Kysela <perex@perex.cz> # 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 obj-$(CONFIG_SND_PDAUDIOCF) += snd-pdaudiocf.o
...@@ -4,6 +4,6 @@ ...@@ -4,6 +4,6 @@
# Copyright (c) 2001 by Jaroslav Kysela <perex@perex.cz> # 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 obj-$(CONFIG_SND_VXPOCKET) += snd-vxpocket.o
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
# Copyright (c) 2001 by Jaroslav Kysela <perex@perex.cz> # 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 # Toplevel Module Dependency
obj-$(CONFIG_SND_POWERMAC) += snd-powermac.o obj-$(CONFIG_SND_POWERMAC) += snd-powermac.o
......
...@@ -3,8 +3,8 @@ ...@@ -3,8 +3,8 @@
# Makefile for ALSA # Makefile for ALSA
# #
snd-aica-objs := aica.o snd-aica-y := aica.o
snd-sh_dac_audio-objs := sh_dac_audio.o snd-sh_dac_audio-y := sh_dac_audio.o
# Toplevel Module Dependency # Toplevel Module Dependency
obj-$(CONFIG_SND_AICA) += snd-aica.o obj-$(CONFIG_SND_AICA) += snd-aica.o
......
...@@ -4,9 +4,9 @@ ...@@ -4,9 +4,9 @@
# Copyright (c) 2002 by David S. Miller <davem@redhat.com> # Copyright (c) 2002 by David S. Miller <davem@redhat.com>
# #
snd-sun-amd7930-objs := amd7930.o snd-sun-amd7930-y := amd7930.o
snd-sun-cs4231-objs := cs4231.o snd-sun-cs4231-y := cs4231.o
snd-sun-dbri-objs := dbri.o snd-sun-dbri-y := dbri.o
obj-$(CONFIG_SND_SUN_AMD7930) += snd-sun-amd7930.o obj-$(CONFIG_SND_SUN_AMD7930) += snd-sun-amd7930.o
obj-$(CONFIG_SND_SUN_CS4231) += snd-sun-cs4231.o obj-$(CONFIG_SND_SUN_CS4231) += snd-sun-cs4231.o
......
# SPDX-License-Identifier: GPL-2.0 # SPDX-License-Identifier: GPL-2.0
# Makefile for SPI drivers # Makefile for SPI drivers
snd-at73c213-objs := at73c213.o snd-at73c213-y := at73c213.o
obj-$(CONFIG_SND_AT73C213) += snd-at73c213.o obj-$(CONFIG_SND_AT73C213) += snd-at73c213.o
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
# Copyright (c) 2001 by Jaroslav Kysela <perex@perex.cz> # 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 # Toplevel Module Dependency
obj-$(CONFIG_SND_EMU10K1) += snd-util-mem.o obj-$(CONFIG_SND_EMU10K1) += snd-util-mem.o
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
# Copyright (c) 2001 by Jaroslav Kysela <perex@perex.cz> # 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 emux_effect.o emux_hwdep.o soundfont.o
snd-emux-synth-$(CONFIG_SND_PROC_FS) += emux_proc.o snd-emux-synth-$(CONFIG_SND_PROC_FS) += emux_proc.o
ifneq ($(CONFIG_SND_SEQUENCER_OSS),) ifneq ($(CONFIG_SND_SEQUENCER_OSS),)
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
obj-$(CONFIG_SND_VIRTIO) += virtio_snd.o obj-$(CONFIG_SND_VIRTIO) += virtio_snd.o
virtio_snd-objs := \ virtio_snd-y := \
virtio_card.o \ virtio_card.o \
virtio_chmap.o \ virtio_chmap.o \
virtio_ctl_msg.o \ virtio_ctl_msg.o \
......
# SPDX-License-Identifier: GPL-2.0-only # SPDX-License-Identifier: GPL-2.0-only
snd-hdmi-lpe-audio-objs += \ snd-hdmi-lpe-audio-y += \
intel_hdmi_audio.o intel_hdmi_audio.o
obj-$(CONFIG_HDMI_LPE_AUDIO) += snd-hdmi-lpe-audio.o obj-$(CONFIG_HDMI_LPE_AUDIO) += snd-hdmi-lpe-audio.o
# SPDX-License-Identifier: GPL-2.0 OR MIT # 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_cfg.o \
xen_snd_front_evtchnl.o \ xen_snd_front_evtchnl.o \
xen_snd_front_alsa.o xen_snd_front_alsa.o
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment