* [PATCH 0/9] ALSA: Use *-y instead of *-objs in Makefile
@ 2024-05-07 13:55 Takashi Iwai
2024-05-07 13:55 ` [PATCH 1/9] ALSA: core: " Takashi Iwai
` (10 more replies)
0 siblings, 11 replies; 19+ messages in thread
From: Takashi Iwai @ 2024-05-07 13:55 UTC (permalink / raw)
To: linux-sound; +Cc: Andy Shevchenko, Takashi Iwai
Hi,
this is a series of trivial cleanup patches for Makefile in sound/*
(modulo ASoC -- which will be submitted later in a separate series).
As Andy suggested in a patch review, *-objs suffix in Makefile is
basically a mis-use nowadays for kernel driver modules. They should
be replaced with *-y suffix instead. This is a result of systematic
conversions, separated per directory.
Takashi
===
Takashi Iwai (9):
ALSA: core: Use *-y instead of *-objs in Makefile
ALSA: pci: Use *-y instead of *-objs in Makefile
ALSA: hda: Use *-y instead of *-objs in Makefile
ALSA: isa: Use *-y instead of *-objs in Makefile
ALSA: usb: Use *-y instead of *-objs in Makefile
ALSA: drivers: Use *-y instead of *-objs in Makefile
ALSA: firewire: Use *-y instead of *-objs in Makefile
ALSA: aoa: Use *-y instead of *-objs in Makefile
ALSA: misc: Use *-y instead of *-objs in Makefile
sound/Makefile | 2 +-
sound/aoa/codecs/Makefile | 6 ++--
sound/aoa/core/Makefile | 2 +-
sound/aoa/fabrics/Makefile | 2 +-
sound/aoa/soundbus/Makefile | 2 +-
sound/aoa/soundbus/i2sbus/Makefile | 2 +-
sound/arm/Makefile | 4 +--
sound/atmel/Makefile | 2 +-
sound/core/Makefile | 18 +++++------
sound/core/oss/Makefile | 2 +-
sound/core/seq/Makefile | 14 ++++----
sound/core/seq/oss/Makefile | 2 +-
sound/drivers/Makefile | 18 +++++------
sound/drivers/mpu401/Makefile | 4 +--
sound/drivers/opl3/Makefile | 2 +-
sound/drivers/opl4/Makefile | 4 +--
sound/drivers/pcsp/Makefile | 2 +-
sound/drivers/vx/Makefile | 2 +-
sound/firewire/Makefile | 4 +--
sound/firewire/bebob/Makefile | 2 +-
sound/firewire/dice/Makefile | 2 +-
sound/firewire/digi00x/Makefile | 2 +-
sound/firewire/fireface/Makefile | 2 +-
sound/firewire/fireworks/Makefile | 2 +-
sound/firewire/motu/Makefile | 2 +-
sound/firewire/oxfw/Makefile | 2 +-
sound/firewire/tascam/Makefile | 2 +-
sound/hda/Makefile | 8 ++---
sound/hda/ext/Makefile | 2 +-
sound/i2c/Makefile | 6 ++--
sound/i2c/other/Makefile | 10 +++---
sound/isa/Makefile | 18 +++++------
sound/isa/ad1816a/Makefile | 2 +-
sound/isa/ad1848/Makefile | 2 +-
sound/isa/cs423x/Makefile | 4 +--
sound/isa/es1688/Makefile | 4 +--
sound/isa/galaxy/Makefile | 4 +--
sound/isa/gus/Makefile | 12 +++----
sound/isa/msnd/Makefile | 6 ++--
sound/isa/opti9xx/Makefile | 8 ++---
sound/isa/sb/Makefile | 18 +++++------
sound/isa/wavefront/Makefile | 2 +-
sound/isa/wss/Makefile | 2 +-
sound/mips/Makefile | 4 +--
sound/parisc/Makefile | 2 +-
sound/pci/Makefile | 48 +++++++++++++--------------
sound/pci/ali5451/Makefile | 2 +-
sound/pci/asihpi/Makefile | 2 +-
sound/pci/au88x0/Makefile | 6 ++--
sound/pci/aw2/Makefile | 2 +-
sound/pci/ca0106/Makefile | 2 +-
sound/pci/ctxfi/Makefile | 2 +-
sound/pci/echoaudio/Makefile | 28 ++++++++--------
sound/pci/emu10k1/Makefile | 6 ++--
sound/pci/hda/Makefile | 52 +++++++++++++++---------------
sound/pci/ice1712/Makefile | 6 ++--
sound/pci/korg1212/Makefile | 2 +-
sound/pci/lx6464es/Makefile | 2 +-
sound/pci/mixart/Makefile | 2 +-
sound/pci/nm256/Makefile | 2 +-
sound/pci/oxygen/Makefile | 8 ++---
sound/pci/pcxhr/Makefile | 2 +-
sound/pci/riptide/Makefile | 2 +-
sound/pci/rme9652/Makefile | 6 ++--
sound/pci/trident/Makefile | 2 +-
sound/pci/vx222/Makefile | 2 +-
sound/pci/ymfpci/Makefile | 2 +-
sound/pcmcia/pdaudiocf/Makefile | 2 +-
sound/pcmcia/vx/Makefile | 2 +-
sound/ppc/Makefile | 2 +-
sound/sh/Makefile | 4 +--
sound/sparc/Makefile | 6 ++--
sound/spi/Makefile | 2 +-
sound/synth/Makefile | 2 +-
sound/synth/emux/Makefile | 2 +-
sound/usb/6fire/Makefile | 2 +-
sound/usb/Makefile | 4 +--
sound/usb/hiface/Makefile | 2 +-
sound/usb/misc/Makefile | 2 +-
sound/usb/usx2y/Makefile | 4 +--
sound/virtio/Makefile | 2 +-
sound/x86/Makefile | 2 +-
sound/xen/Makefile | 2 +-
83 files changed, 227 insertions(+), 227 deletions(-)
--
2.43.0
^ permalink raw reply [flat|nested] 19+ messages in thread
* [PATCH 1/9] ALSA: core: Use *-y instead of *-objs in Makefile
2024-05-07 13:55 [PATCH 0/9] ALSA: Use *-y instead of *-objs in Makefile Takashi Iwai
@ 2024-05-07 13:55 ` Takashi Iwai
2024-05-07 13:55 ` [PATCH 2/9] ALSA: pci: " Takashi Iwai
` (9 subsequent siblings)
10 siblings, 0 replies; 19+ messages in thread
From: Takashi Iwai @ 2024-05-07 13:55 UTC (permalink / raw)
To: linux-sound; +Cc: Andy Shevchenko, Takashi Iwai
*-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>
---
sound/Makefile | 2 +-
sound/core/Makefile | 18 +++++++++---------
sound/core/oss/Makefile | 2 +-
sound/core/seq/Makefile | 14 +++++++-------
sound/core/seq/oss/Makefile | 2 +-
5 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/sound/Makefile b/sound/Makefile
index 04ef04b1168f..5942311a4232 100644
--- a/sound/Makefile
+++ b/sound/Makefile
@@ -17,4 +17,4 @@ ifeq ($(CONFIG_SND),y)
obj-y += last.o
endif
-soundcore-objs := sound_core.o
+soundcore-y := sound_core.o
diff --git a/sound/core/Makefile b/sound/core/Makefile
index b8aa886198ab..31a0623cc89d 100644
--- a/sound/core/Makefile
+++ b/sound/core/Makefile
@@ -24,18 +24,18 @@ snd-pcm-$(CONFIG_SND_PCM_IEC958) += pcm_iec958.o
CFLAGS_pcm_lib.o := -I$(src)
CFLAGS_pcm_native.o := -I$(src)
-snd-pcm-dmaengine-objs := pcm_dmaengine.o
+snd-pcm-dmaengine-y := pcm_dmaengine.o
-snd-ctl-led-objs := control_led.o
-snd-rawmidi-objs := rawmidi.o
-snd-ump-objs := ump.o
+snd-ctl-led-y := control_led.o
+snd-rawmidi-y := rawmidi.o
+snd-ump-y := ump.o
snd-ump-$(CONFIG_SND_UMP_LEGACY_RAWMIDI) += ump_convert.o
-snd-timer-objs := timer.o
-snd-hrtimer-objs := hrtimer.o
-snd-hwdep-objs := hwdep.o
-snd-seq-device-objs := seq_device.o
+snd-timer-y := timer.o
+snd-hrtimer-y := hrtimer.o
+snd-hwdep-y := hwdep.o
+snd-seq-device-y := seq_device.o
-snd-compress-objs := compress_offload.o
+snd-compress-y := compress_offload.o
obj-$(CONFIG_SND) += snd.o
obj-$(CONFIG_SND_CTL_LED) += snd-ctl-led.o
diff --git a/sound/core/oss/Makefile b/sound/core/oss/Makefile
index ae25edcc3b42..d5f48ae6ba96 100644
--- a/sound/core/oss/Makefile
+++ b/sound/core/oss/Makefile
@@ -4,7 +4,7 @@
# Copyright (c) 1999 by Jaroslav Kysela <perex@perex.cz>
#
-snd-mixer-oss-objs := mixer_oss.o
+snd-mixer-oss-y := mixer_oss.o
snd-pcm-oss-y := pcm_oss.o
snd-pcm-oss-$(CONFIG_SND_PCM_OSS_PLUGINS) += pcm_plugin.o \
diff --git a/sound/core/seq/Makefile b/sound/core/seq/Makefile
index 990eec7c83ad..0904aa48d88b 100644
--- a/sound/core/seq/Makefile
+++ b/sound/core/seq/Makefile
@@ -4,17 +4,17 @@
# Copyright (c) 1999 by Jaroslav Kysela <perex@perex.cz>
#
-snd-seq-objs := seq.o seq_lock.o seq_clientmgr.o seq_memory.o seq_queue.o \
+snd-seq-y := seq.o seq_lock.o seq_clientmgr.o seq_memory.o seq_queue.o \
seq_fifo.o seq_prioq.o seq_timer.o \
seq_system.o seq_ports.o
snd-seq-$(CONFIG_SND_PROC_FS) += seq_info.o
snd-seq-$(CONFIG_SND_SEQ_UMP) += seq_ump_convert.o
-snd-seq-midi-objs := seq_midi.o
-snd-seq-midi-emul-objs := seq_midi_emul.o
-snd-seq-midi-event-objs := seq_midi_event.o
-snd-seq-dummy-objs := seq_dummy.o
-snd-seq-virmidi-objs := seq_virmidi.o
-snd-seq-ump-client-objs := seq_ump_client.o
+snd-seq-midi-y := seq_midi.o
+snd-seq-midi-emul-y := seq_midi_emul.o
+snd-seq-midi-event-y := seq_midi_event.o
+snd-seq-dummy-y := seq_dummy.o
+snd-seq-virmidi-y := seq_virmidi.o
+snd-seq-ump-client-y := seq_ump_client.o
obj-$(CONFIG_SND_SEQUENCER) += snd-seq.o
obj-$(CONFIG_SND_SEQUENCER_OSS) += oss/
diff --git a/sound/core/seq/oss/Makefile b/sound/core/seq/oss/Makefile
index f1a60878549a..4e4741834208 100644
--- a/sound/core/seq/oss/Makefile
+++ b/sound/core/seq/oss/Makefile
@@ -4,7 +4,7 @@
# Copyright (c) 1999 by Jaroslav Kysela <perex@perex.cz>
#
-snd-seq-oss-objs := seq_oss.o seq_oss_init.o seq_oss_timer.o seq_oss_ioctl.o \
+snd-seq-oss-y := seq_oss.o seq_oss_init.o seq_oss_timer.o seq_oss_ioctl.o \
seq_oss_event.o seq_oss_rw.o seq_oss_synth.o \
seq_oss_midi.o seq_oss_readq.o seq_oss_writeq.o
--
2.43.0
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [PATCH 2/9] ALSA: pci: Use *-y instead of *-objs in Makefile
2024-05-07 13:55 [PATCH 0/9] ALSA: Use *-y instead of *-objs in Makefile Takashi Iwai
2024-05-07 13:55 ` [PATCH 1/9] ALSA: core: " Takashi Iwai
@ 2024-05-07 13:55 ` Takashi Iwai
2024-05-07 13:55 ` [PATCH 3/9] ALSA: hda: " Takashi Iwai
` (8 subsequent siblings)
10 siblings, 0 replies; 19+ messages in thread
From: Takashi Iwai @ 2024-05-07 13:55 UTC (permalink / raw)
To: linux-sound; +Cc: Andy Shevchenko, Takashi Iwai
*-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>
---
sound/pci/Makefile | 48 ++++++++++++++++-----------------
sound/pci/ali5451/Makefile | 2 +-
sound/pci/asihpi/Makefile | 2 +-
sound/pci/au88x0/Makefile | 6 ++---
sound/pci/aw2/Makefile | 2 +-
sound/pci/ca0106/Makefile | 2 +-
sound/pci/ctxfi/Makefile | 2 +-
sound/pci/echoaudio/Makefile | 28 +++++++++----------
sound/pci/emu10k1/Makefile | 6 ++---
sound/pci/hda/Makefile | 52 ++++++++++++++++++------------------
sound/pci/ice1712/Makefile | 6 ++---
sound/pci/korg1212/Makefile | 2 +-
sound/pci/lx6464es/Makefile | 2 +-
sound/pci/mixart/Makefile | 2 +-
sound/pci/nm256/Makefile | 2 +-
sound/pci/oxygen/Makefile | 8 +++---
sound/pci/pcxhr/Makefile | 2 +-
sound/pci/riptide/Makefile | 2 +-
sound/pci/rme9652/Makefile | 6 ++---
sound/pci/trident/Makefile | 2 +-
sound/pci/vx222/Makefile | 2 +-
sound/pci/ymfpci/Makefile | 2 +-
22 files changed, 94 insertions(+), 94 deletions(-)
diff --git a/sound/pci/Makefile b/sound/pci/Makefile
index 04cac7469139..18b673018dfd 100644
--- a/sound/pci/Makefile
+++ b/sound/pci/Makefile
@@ -4,30 +4,30 @@
# Copyright (c) 2001 by Jaroslav Kysela <perex@perex.cz>
#
-snd-ad1889-objs := ad1889.o
-snd-als300-objs := als300.o
-snd-als4000-objs := als4000.o
-snd-atiixp-objs := atiixp.o
-snd-atiixp-modem-objs := atiixp_modem.o
-snd-azt3328-objs := azt3328.o
-snd-bt87x-objs := bt87x.o
-snd-cmipci-objs := cmipci.o
-snd-cs4281-objs := cs4281.o
-snd-cs5530-objs := cs5530.o
-snd-ens1370-objs := ens1370.o ak4531_codec.o
-snd-ens1371-objs := ens1371.o
-snd-es1938-objs := es1938.o
-snd-es1968-objs := es1968.o
-snd-fm801-objs := fm801.o
-snd-intel8x0-objs := intel8x0.o
-snd-intel8x0m-objs := intel8x0m.o
-snd-maestro3-objs := maestro3.o
-snd-rme32-objs := rme32.o
-snd-rme96-objs := rme96.o
-snd-sis7019-objs := sis7019.o
-snd-sonicvibes-objs := sonicvibes.o
-snd-via82xx-objs := via82xx.o
-snd-via82xx-modem-objs := via82xx_modem.o
+snd-ad1889-y := ad1889.o
+snd-als300-y := als300.o
+snd-als4000-y := als4000.o
+snd-atiixp-y := atiixp.o
+snd-atiixp-modem-y := atiixp_modem.o
+snd-azt3328-y := azt3328.o
+snd-bt87x-y := bt87x.o
+snd-cmipci-y := cmipci.o
+snd-cs4281-y := cs4281.o
+snd-cs5530-y := cs5530.o
+snd-ens1370-y := ens1370.o ak4531_codec.o
+snd-ens1371-y := ens1371.o
+snd-es1938-y := es1938.o
+snd-es1968-y := es1968.o
+snd-fm801-y := fm801.o
+snd-intel8x0-y := intel8x0.o
+snd-intel8x0m-y := intel8x0m.o
+snd-maestro3-y := maestro3.o
+snd-rme32-y := rme32.o
+snd-rme96-y := rme96.o
+snd-sis7019-y := sis7019.o
+snd-sonicvibes-y := sonicvibes.o
+snd-via82xx-y := via82xx.o
+snd-via82xx-modem-y := via82xx_modem.o
# Toplevel Module Dependency
obj-$(CONFIG_SND_AD1889) += snd-ad1889.o
diff --git a/sound/pci/ali5451/Makefile b/sound/pci/ali5451/Makefile
index 8156198fbaeb..e319a4c1d6b2 100644
--- a/sound/pci/ali5451/Makefile
+++ b/sound/pci/ali5451/Makefile
@@ -4,7 +4,7 @@
# Copyright (c) 2001 by Jaroslav Kysela <perex@perex.cz>
#
-snd-ali5451-objs := ali5451.o
+snd-ali5451-y := ali5451.o
# Toplevel Module Dependency
obj-$(CONFIG_SND_ALI5451) += snd-ali5451.o
diff --git a/sound/pci/asihpi/Makefile b/sound/pci/asihpi/Makefile
index 8351f8f5b523..d558a974fa7e 100644
--- a/sound/pci/asihpi/Makefile
+++ b/sound/pci/asihpi/Makefile
@@ -1,5 +1,5 @@
# SPDX-License-Identifier: GPL-2.0-only
-snd-asihpi-objs := asihpi.o hpioctl.o hpimsginit.o\
+snd-asihpi-y := asihpi.o hpioctl.o hpimsginit.o\
hpicmn.o hpifunc.o hpidebug.o hpidspcd.o\
hpios.o hpi6000.o hpi6205.o hpimsgx.o
diff --git a/sound/pci/au88x0/Makefile b/sound/pci/au88x0/Makefile
index 78ab11562f4d..5ec5abdee28d 100644
--- a/sound/pci/au88x0/Makefile
+++ b/sound/pci/au88x0/Makefile
@@ -1,7 +1,7 @@
# SPDX-License-Identifier: GPL-2.0
-snd-au8810-objs := au8810.o
-snd-au8820-objs := au8820.o
-snd-au8830-objs := au8830.o
+snd-au8810-y := au8810.o
+snd-au8820-y := au8820.o
+snd-au8830-y := au8830.o
obj-$(CONFIG_SND_AU8810) += snd-au8810.o
obj-$(CONFIG_SND_AU8820) += snd-au8820.o
diff --git a/sound/pci/aw2/Makefile b/sound/pci/aw2/Makefile
index f9045afb4cda..c246f7c7f2bf 100644
--- a/sound/pci/aw2/Makefile
+++ b/sound/pci/aw2/Makefile
@@ -1,4 +1,4 @@
# SPDX-License-Identifier: GPL-2.0-only
-snd-aw2-objs := aw2-alsa.o aw2-saa7146.o
+snd-aw2-y := aw2-alsa.o aw2-saa7146.o
obj-$(CONFIG_SND_AW2) += snd-aw2.o
diff --git a/sound/pci/ca0106/Makefile b/sound/pci/ca0106/Makefile
index 9e51d3df3ee8..693dc4d80925 100644
--- a/sound/pci/ca0106/Makefile
+++ b/sound/pci/ca0106/Makefile
@@ -1,5 +1,5 @@
# SPDX-License-Identifier: GPL-2.0-only
-snd-ca0106-objs := ca0106_main.o ca0106_mixer.o ca_midi.o
+snd-ca0106-y := ca0106_main.o ca0106_mixer.o ca_midi.o
snd-ca0106-$(CONFIG_SND_PROC_FS) += ca0106_proc.o
obj-$(CONFIG_SND_CA0106) += snd-ca0106.o
diff --git a/sound/pci/ctxfi/Makefile b/sound/pci/ctxfi/Makefile
index 70888706a0af..ff2b1cba3a3c 100644
--- a/sound/pci/ctxfi/Makefile
+++ b/sound/pci/ctxfi/Makefile
@@ -1,5 +1,5 @@
# SPDX-License-Identifier: GPL-2.0-only
-snd-ctxfi-objs := xfi.o ctatc.o ctvmem.o ctpcm.o ctmixer.o ctresource.o \
+snd-ctxfi-y := xfi.o ctatc.o ctvmem.o ctpcm.o ctmixer.o ctresource.o \
ctsrc.o ctamixer.o ctdaio.o ctimap.o cthardware.o cttimer.o \
cthw20k2.o cthw20k1.o
diff --git a/sound/pci/echoaudio/Makefile b/sound/pci/echoaudio/Makefile
index 4865b8fe7434..96667641c7cf 100644
--- a/sound/pci/echoaudio/Makefile
+++ b/sound/pci/echoaudio/Makefile
@@ -4,20 +4,20 @@
# Copyright (c) 2003 by Giuliano Pochini <pochini@shiny.it>
#
-snd-darla20-objs := darla20.o
-snd-gina20-objs := gina20.o
-snd-layla20-objs := layla20.o
-snd-darla24-objs := darla24.o
-snd-gina24-objs := gina24.o
-snd-layla24-objs := layla24.o
-snd-mona-objs := mona.o
-snd-mia-objs := mia.o
-snd-echo3g-objs := echo3g.o
-snd-indigo-objs := indigo.o
-snd-indigoio-objs := indigoio.o
-snd-indigodj-objs := indigodj.o
-snd-indigoiox-objs := indigoiox.o
-snd-indigodjx-objs := indigodjx.o
+snd-darla20-y := darla20.o
+snd-gina20-y := gina20.o
+snd-layla20-y := layla20.o
+snd-darla24-y := darla24.o
+snd-gina24-y := gina24.o
+snd-layla24-y := layla24.o
+snd-mona-y := mona.o
+snd-mia-y := mia.o
+snd-echo3g-y := echo3g.o
+snd-indigo-y := indigo.o
+snd-indigoio-y := indigoio.o
+snd-indigodj-y := indigodj.o
+snd-indigoiox-y := indigoiox.o
+snd-indigodjx-y := indigodjx.o
obj-$(CONFIG_SND_DARLA20) += snd-darla20.o
obj-$(CONFIG_SND_GINA20) += snd-gina20.o
diff --git a/sound/pci/emu10k1/Makefile b/sound/pci/emu10k1/Makefile
index 17d5527be319..1f325abcb3ef 100644
--- a/sound/pci/emu10k1/Makefile
+++ b/sound/pci/emu10k1/Makefile
@@ -4,12 +4,12 @@
# Copyright (c) 2001 by Jaroslav Kysela <perex@perex.cz>
#
-snd-emu10k1-objs := emu10k1.o emu10k1_main.o \
+snd-emu10k1-y := emu10k1.o emu10k1_main.o \
irq.o memory.o voice.o emumpu401.o emupcm.o io.o \
emumixer.o emufx.o timer.o p16v.o
snd-emu10k1-$(CONFIG_SND_PROC_FS) += emuproc.o
-snd-emu10k1-synth-objs := emu10k1_synth.o emu10k1_callback.o emu10k1_patch.o
-snd-emu10k1x-objs := emu10k1x.o
+snd-emu10k1-synth-y := emu10k1_synth.o emu10k1_callback.o emu10k1_patch.o
+snd-emu10k1x-y := emu10k1x.o
# Toplevel Module Dependency
obj-$(CONFIG_SND_EMU10K1) += snd-emu10k1.o
diff --git a/sound/pci/hda/Makefile b/sound/pci/hda/Makefile
index 13e04e1f65de..058ca0a289e4 100644
--- a/sound/pci/hda/Makefile
+++ b/sound/pci/hda/Makefile
@@ -1,6 +1,6 @@
# SPDX-License-Identifier: GPL-2.0
-snd-hda-intel-objs := hda_intel.o
-snd-hda-tegra-objs := hda_tegra.o
+snd-hda-intel-y := hda_intel.o
+snd-hda-tegra-y := hda_tegra.o
snd-hda-codec-y := hda_bind.o hda_codec.o hda_jack.o hda_auto_parser.o hda_sysfs.o
snd-hda-codec-y += hda_controller.o
@@ -13,32 +13,32 @@ snd-hda-codec-$(CONFIG_SND_HDA_INPUT_BEEP) += hda_beep.o
CFLAGS_hda_controller.o := -I$(src)
CFLAGS_hda_intel.o := -I$(src)
-snd-hda-codec-generic-objs := hda_generic.o
-snd-hda-codec-realtek-objs := patch_realtek.o
-snd-hda-codec-cmedia-objs := patch_cmedia.o
-snd-hda-codec-analog-objs := patch_analog.o
-snd-hda-codec-idt-objs := patch_sigmatel.o
-snd-hda-codec-si3054-objs := patch_si3054.o
-snd-hda-codec-cirrus-objs := patch_cirrus.o
-snd-hda-codec-cs8409-objs := patch_cs8409.o patch_cs8409-tables.o
-snd-hda-codec-ca0110-objs := patch_ca0110.o
-snd-hda-codec-ca0132-objs := patch_ca0132.o
-snd-hda-codec-conexant-objs := patch_conexant.o
-snd-hda-codec-via-objs := patch_via.o
-snd-hda-codec-hdmi-objs := patch_hdmi.o hda_eld.o
+snd-hda-codec-generic-y := hda_generic.o
+snd-hda-codec-realtek-y := patch_realtek.o
+snd-hda-codec-cmedia-y := patch_cmedia.o
+snd-hda-codec-analog-y := patch_analog.o
+snd-hda-codec-idt-y := patch_sigmatel.o
+snd-hda-codec-si3054-y := patch_si3054.o
+snd-hda-codec-cirrus-y := patch_cirrus.o
+snd-hda-codec-cs8409-y := patch_cs8409.o patch_cs8409-tables.o
+snd-hda-codec-ca0110-y := patch_ca0110.o
+snd-hda-codec-ca0132-y := patch_ca0132.o
+snd-hda-codec-conexant-y := patch_conexant.o
+snd-hda-codec-via-y := patch_via.o
+snd-hda-codec-hdmi-y := patch_hdmi.o hda_eld.o
# side codecs
-snd-hda-cirrus-scodec-objs := cirrus_scodec.o
-snd-hda-cirrus-scodec-test-objs := cirrus_scodec_test.o
-snd-hda-scodec-cs35l41-objs := cs35l41_hda.o cs35l41_hda_property.o
-snd-hda-scodec-cs35l41-i2c-objs := cs35l41_hda_i2c.o
-snd-hda-scodec-cs35l41-spi-objs := cs35l41_hda_spi.o
-snd-hda-scodec-cs35l56-objs := cs35l56_hda.o
-snd-hda-scodec-cs35l56-i2c-objs := cs35l56_hda_i2c.o
-snd-hda-scodec-cs35l56-spi-objs := cs35l56_hda_spi.o
-snd-hda-cs-dsp-ctls-objs := hda_cs_dsp_ctl.o
-snd-hda-scodec-component-objs := hda_component.o
-snd-hda-scodec-tas2781-i2c-objs := tas2781_hda_i2c.o
+snd-hda-cirrus-scodec-y := cirrus_scodec.o
+snd-hda-cirrus-scodec-test-y := cirrus_scodec_test.o
+snd-hda-scodec-cs35l41-y := cs35l41_hda.o cs35l41_hda_property.o
+snd-hda-scodec-cs35l41-i2c-y := cs35l41_hda_i2c.o
+snd-hda-scodec-cs35l41-spi-y := cs35l41_hda_spi.o
+snd-hda-scodec-cs35l56-y := cs35l56_hda.o
+snd-hda-scodec-cs35l56-i2c-y := cs35l56_hda_i2c.o
+snd-hda-scodec-cs35l56-spi-y := cs35l56_hda_spi.o
+snd-hda-cs-dsp-ctls-y := hda_cs_dsp_ctl.o
+snd-hda-scodec-component-y := hda_component.o
+snd-hda-scodec-tas2781-i2c-y := tas2781_hda_i2c.o
# common driver
obj-$(CONFIG_SND_HDA) := snd-hda-codec.o
diff --git a/sound/pci/ice1712/Makefile b/sound/pci/ice1712/Makefile
index 1196f22a9b45..f406a048374c 100644
--- a/sound/pci/ice1712/Makefile
+++ b/sound/pci/ice1712/Makefile
@@ -4,9 +4,9 @@
# Copyright (c) 2001 by Jaroslav Kysela <perex@perex.cz>
#
-snd-ice17xx-ak4xxx-objs := ak4xxx.o
-snd-ice1712-objs := ice1712.o delta.o hoontech.o ews.o
-snd-ice1724-objs := ice1724.o amp.o revo.o aureon.o vt1720_mobo.o pontis.o prodigy192.o prodigy_hifi.o juli.o phase.o wtm.o se.o maya44.o quartet.o psc724.o wm8766.o wm8776.o
+snd-ice17xx-ak4xxx-y := ak4xxx.o
+snd-ice1712-y := ice1712.o delta.o hoontech.o ews.o
+snd-ice1724-y := ice1724.o amp.o revo.o aureon.o vt1720_mobo.o pontis.o prodigy192.o prodigy_hifi.o juli.o phase.o wtm.o se.o maya44.o quartet.o psc724.o wm8766.o wm8776.o
# Toplevel Module Dependency
obj-$(CONFIG_SND_ICE1712) += snd-ice1712.o snd-ice17xx-ak4xxx.o
diff --git a/sound/pci/korg1212/Makefile b/sound/pci/korg1212/Makefile
index 42eb287c77af..ab0186ffbd58 100644
--- a/sound/pci/korg1212/Makefile
+++ b/sound/pci/korg1212/Makefile
@@ -4,7 +4,7 @@
# Copyright (c) 2001 by Jaroslav Kysela <perex@perex.cz>
#
-snd-korg1212-objs := korg1212.o
+snd-korg1212-y := korg1212.o
# Toplevel Module Dependency
obj-$(CONFIG_SND_KORG1212) += snd-korg1212.o
diff --git a/sound/pci/lx6464es/Makefile b/sound/pci/lx6464es/Makefile
index c295f68bac68..2b3047c7a388 100644
--- a/sound/pci/lx6464es/Makefile
+++ b/sound/pci/lx6464es/Makefile
@@ -1,3 +1,3 @@
# SPDX-License-Identifier: GPL-2.0-only
-snd-lx6464es-objs := lx6464es.o lx_core.o
+snd-lx6464es-y := lx6464es.o lx_core.o
obj-$(CONFIG_SND_LX6464ES) += snd-lx6464es.o
diff --git a/sound/pci/mixart/Makefile b/sound/pci/mixart/Makefile
index 16cfeb78a0b6..b803e5e72791 100644
--- a/sound/pci/mixart/Makefile
+++ b/sound/pci/mixart/Makefile
@@ -4,6 +4,6 @@
# Copyright (c) 2001 by Jaroslav Kysela <perex@perex.cz>
#
-snd-mixart-objs := mixart.o mixart_core.o mixart_hwdep.o mixart_mixer.o
+snd-mixart-y := mixart.o mixart_core.o mixart_hwdep.o mixart_mixer.o
obj-$(CONFIG_SND_MIXART) += snd-mixart.o
diff --git a/sound/pci/nm256/Makefile b/sound/pci/nm256/Makefile
index 3063766ac56b..7d55fe774d20 100644
--- a/sound/pci/nm256/Makefile
+++ b/sound/pci/nm256/Makefile
@@ -4,7 +4,7 @@
# Copyright (c) 2001 by Jaroslav Kysela <perex@perex.cz>
#
-snd-nm256-objs := nm256.o
+snd-nm256-y := nm256.o
# Toplevel Module Dependency
obj-$(CONFIG_SND_NM256) += snd-nm256.o
diff --git a/sound/pci/oxygen/Makefile b/sound/pci/oxygen/Makefile
index 0dfc4f840992..cc0c24694750 100644
--- a/sound/pci/oxygen/Makefile
+++ b/sound/pci/oxygen/Makefile
@@ -1,8 +1,8 @@
# SPDX-License-Identifier: GPL-2.0
-snd-oxygen-lib-objs := oxygen_io.o oxygen_lib.o oxygen_mixer.o oxygen_pcm.o
-snd-oxygen-objs := oxygen.o xonar_dg_mixer.o xonar_dg.o
-snd-se6x-objs := se6x.o
-snd-virtuoso-objs := virtuoso.o xonar_lib.o \
+snd-oxygen-lib-y := oxygen_io.o oxygen_lib.o oxygen_mixer.o oxygen_pcm.o
+snd-oxygen-y := oxygen.o xonar_dg_mixer.o xonar_dg.o
+snd-se6x-y := se6x.o
+snd-virtuoso-y := virtuoso.o xonar_lib.o \
xonar_pcm179x.o xonar_cs43xx.o xonar_wm87x6.o xonar_hdmi.o
obj-$(CONFIG_SND_OXYGEN_LIB) += snd-oxygen-lib.o
diff --git a/sound/pci/pcxhr/Makefile b/sound/pci/pcxhr/Makefile
index 5993d86cfb5d..0ea1e5ccb56f 100644
--- a/sound/pci/pcxhr/Makefile
+++ b/sound/pci/pcxhr/Makefile
@@ -1,3 +1,3 @@
# SPDX-License-Identifier: GPL-2.0-only
-snd-pcxhr-objs := pcxhr.o pcxhr_hwdep.o pcxhr_mixer.o pcxhr_core.o pcxhr_mix22.o
+snd-pcxhr-y := pcxhr.o pcxhr_hwdep.o pcxhr_mixer.o pcxhr_core.o pcxhr_mix22.o
obj-$(CONFIG_SND_PCXHR) += snd-pcxhr.o
diff --git a/sound/pci/riptide/Makefile b/sound/pci/riptide/Makefile
index 9a505bae243e..9b4e9595859a 100644
--- a/sound/pci/riptide/Makefile
+++ b/sound/pci/riptide/Makefile
@@ -1,4 +1,4 @@
# SPDX-License-Identifier: GPL-2.0-only
-snd-riptide-objs := riptide.o
+snd-riptide-y := riptide.o
obj-$(CONFIG_SND_RIPTIDE) += snd-riptide.o
diff --git a/sound/pci/rme9652/Makefile b/sound/pci/rme9652/Makefile
index a3351447ddc0..cc99ae892211 100644
--- a/sound/pci/rme9652/Makefile
+++ b/sound/pci/rme9652/Makefile
@@ -4,9 +4,9 @@
# Copyright (c) 2001 by Jaroslav Kysela <perex@perex.cz>
#
-snd-rme9652-objs := rme9652.o
-snd-hdsp-objs := hdsp.o
-snd-hdspm-objs := hdspm.o
+snd-rme9652-y := rme9652.o
+snd-hdsp-y := hdsp.o
+snd-hdspm-y := hdspm.o
# Toplevel Module Dependency
obj-$(CONFIG_SND_RME9652) += snd-rme9652.o
diff --git a/sound/pci/trident/Makefile b/sound/pci/trident/Makefile
index e8975bc37fcb..476d16abcfc9 100644
--- a/sound/pci/trident/Makefile
+++ b/sound/pci/trident/Makefile
@@ -4,7 +4,7 @@
# Copyright (c) 2001 by Jaroslav Kysela <perex@perex.cz>
#
-snd-trident-objs := trident.o trident_main.o trident_memory.o
+snd-trident-y := trident.o trident_main.o trident_memory.o
# Toplevel Module Dependency
obj-$(CONFIG_SND_TRIDENT) += snd-trident.o
diff --git a/sound/pci/vx222/Makefile b/sound/pci/vx222/Makefile
index dda900e45385..6889137eb438 100644
--- a/sound/pci/vx222/Makefile
+++ b/sound/pci/vx222/Makefile
@@ -4,6 +4,6 @@
# Copyright (c) 2001 by Jaroslav Kysela <perex@perex.cz>
#
-snd-vx222-objs := vx222.o vx222_ops.o
+snd-vx222-y := vx222.o vx222_ops.o
obj-$(CONFIG_SND_VX222) += snd-vx222.o
diff --git a/sound/pci/ymfpci/Makefile b/sound/pci/ymfpci/Makefile
index 40a1d83e1a9e..2d7856403371 100644
--- a/sound/pci/ymfpci/Makefile
+++ b/sound/pci/ymfpci/Makefile
@@ -4,7 +4,7 @@
# Copyright (c) 2001 by Jaroslav Kysela <perex@perex.cz>
#
-snd-ymfpci-objs := ymfpci.o ymfpci_main.o
+snd-ymfpci-y := ymfpci.o ymfpci_main.o
# Toplevel Module Dependency
obj-$(CONFIG_SND_YMFPCI) += snd-ymfpci.o
--
2.43.0
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [PATCH 3/9] ALSA: hda: Use *-y instead of *-objs in Makefile
2024-05-07 13:55 [PATCH 0/9] ALSA: Use *-y instead of *-objs in Makefile Takashi Iwai
2024-05-07 13:55 ` [PATCH 1/9] ALSA: core: " Takashi Iwai
2024-05-07 13:55 ` [PATCH 2/9] ALSA: pci: " Takashi Iwai
@ 2024-05-07 13:55 ` Takashi Iwai
2024-05-07 13:55 ` [PATCH 4/9] ALSA: isa: " Takashi Iwai
` (7 subsequent siblings)
10 siblings, 0 replies; 19+ messages in thread
From: Takashi Iwai @ 2024-05-07 13:55 UTC (permalink / raw)
To: linux-sound; +Cc: Andy Shevchenko, Takashi Iwai
*-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>
---
sound/hda/Makefile | 8 ++++----
sound/hda/ext/Makefile | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/sound/hda/Makefile b/sound/hda/Makefile
index 78f487a635f8..83cceafe0d4c 100644
--- a/sound/hda/Makefile
+++ b/sound/hda/Makefile
@@ -1,8 +1,8 @@
# SPDX-License-Identifier: GPL-2.0
-snd-hda-core-objs := hda_bus_type.o hdac_bus.o hdac_device.o hdac_sysfs.o \
+snd-hda-core-y := hda_bus_type.o hdac_bus.o hdac_device.o hdac_sysfs.o \
hdac_regmap.o hdac_controller.o hdac_stream.o array.o hdmi_chmap.o
-snd-hda-core-objs += trace.o
+snd-hda-core-y += trace.o
CFLAGS_trace.o := -I$(src)
# for sync with i915 gfx driver
@@ -14,9 +14,9 @@ obj-$(CONFIG_SND_HDA_CORE) += snd-hda-core.o
#extended hda
obj-$(CONFIG_SND_HDA_EXT_CORE) += ext/
-snd-intel-dspcfg-objs := intel-dsp-config.o
+snd-intel-dspcfg-y := intel-dsp-config.o
snd-intel-dspcfg-$(CONFIG_SND_INTEL_NHLT) += intel-nhlt.o
obj-$(CONFIG_SND_INTEL_DSP_CONFIG) += snd-intel-dspcfg.o
-snd-intel-sdw-acpi-objs := intel-sdw-acpi.o
+snd-intel-sdw-acpi-y := intel-sdw-acpi.o
obj-$(CONFIG_SND_INTEL_SOUNDWIRE_ACPI) += snd-intel-sdw-acpi.o
diff --git a/sound/hda/ext/Makefile b/sound/hda/ext/Makefile
index 154779bdc0ba..05883fb28d28 100644
--- a/sound/hda/ext/Makefile
+++ b/sound/hda/ext/Makefile
@@ -1,4 +1,4 @@
# SPDX-License-Identifier: GPL-2.0-only
-snd-hda-ext-core-objs := hdac_ext_bus.o hdac_ext_controller.o hdac_ext_stream.o
+snd-hda-ext-core-y := hdac_ext_bus.o hdac_ext_controller.o hdac_ext_stream.o
obj-$(CONFIG_SND_HDA_EXT_CORE) += snd-hda-ext-core.o
--
2.43.0
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [PATCH 4/9] ALSA: isa: Use *-y instead of *-objs in Makefile
2024-05-07 13:55 [PATCH 0/9] ALSA: Use *-y instead of *-objs in Makefile Takashi Iwai
` (2 preceding siblings ...)
2024-05-07 13:55 ` [PATCH 3/9] ALSA: hda: " Takashi Iwai
@ 2024-05-07 13:55 ` Takashi Iwai
2024-05-07 13:55 ` [PATCH 5/9] ALSA: usb: " Takashi Iwai
` (6 subsequent siblings)
10 siblings, 0 replies; 19+ messages in thread
From: Takashi Iwai @ 2024-05-07 13:55 UTC (permalink / raw)
To: linux-sound; +Cc: Andy Shevchenko, Takashi Iwai
*-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>
---
sound/isa/Makefile | 18 +++++++++---------
sound/isa/ad1816a/Makefile | 2 +-
sound/isa/ad1848/Makefile | 2 +-
sound/isa/cs423x/Makefile | 4 ++--
sound/isa/es1688/Makefile | 4 ++--
sound/isa/galaxy/Makefile | 4 ++--
sound/isa/gus/Makefile | 12 ++++++------
sound/isa/msnd/Makefile | 6 +++---
sound/isa/opti9xx/Makefile | 8 ++++----
sound/isa/sb/Makefile | 18 +++++++++---------
sound/isa/wavefront/Makefile | 2 +-
sound/isa/wss/Makefile | 2 +-
12 files changed, 41 insertions(+), 41 deletions(-)
diff --git a/sound/isa/Makefile b/sound/isa/Makefile
index 5eaddbf4a712..2135d68a15ac 100644
--- a/sound/isa/Makefile
+++ b/sound/isa/Makefile
@@ -4,15 +4,15 @@
# Copyright (c) 2001 by Jaroslav Kysela <perex@perex.cz>
#
-snd-adlib-objs := adlib.o
-snd-als100-objs := als100.o
-snd-azt2320-objs := azt2320.o
-snd-cmi8328-objs := cmi8328.o
-snd-cmi8330-objs := cmi8330.o
-snd-es18xx-objs := es18xx.o
-snd-opl3sa2-objs := opl3sa2.o
-snd-sc6000-objs := sc6000.o
-snd-sscape-objs := sscape.o
+snd-adlib-y := adlib.o
+snd-als100-y := als100.o
+snd-azt2320-y := azt2320.o
+snd-cmi8328-y := cmi8328.o
+snd-cmi8330-y := cmi8330.o
+snd-es18xx-y := es18xx.o
+snd-opl3sa2-y := opl3sa2.o
+snd-sc6000-y := sc6000.o
+snd-sscape-y := sscape.o
# Toplevel Module Dependency
obj-$(CONFIG_SND_ADLIB) += snd-adlib.o
diff --git a/sound/isa/ad1816a/Makefile b/sound/isa/ad1816a/Makefile
index 93def7f16933..573325228534 100644
--- a/sound/isa/ad1816a/Makefile
+++ b/sound/isa/ad1816a/Makefile
@@ -4,7 +4,7 @@
# Copyright (c) 2001 by Jaroslav Kysela <perex@perex.cz>
#
-snd-ad1816a-objs := ad1816a.o ad1816a_lib.o
+snd-ad1816a-y := ad1816a.o ad1816a_lib.o
# Toplevel Module Dependency
obj-$(CONFIG_SND_AD1816A) += snd-ad1816a.o
diff --git a/sound/isa/ad1848/Makefile b/sound/isa/ad1848/Makefile
index 4eab89bbc845..5fdfc1c9f059 100644
--- a/sound/isa/ad1848/Makefile
+++ b/sound/isa/ad1848/Makefile
@@ -4,7 +4,7 @@
# Copyright (c) 2001 by Jaroslav Kysela <perex@perex.cz>
#
-snd-ad1848-objs := ad1848.o
+snd-ad1848-y := ad1848.o
# Toplevel Module Dependency
obj-$(CONFIG_SND_AD1848) += snd-ad1848.o
diff --git a/sound/isa/cs423x/Makefile b/sound/isa/cs423x/Makefile
index 91c6b8d64424..013a777d23fa 100644
--- a/sound/isa/cs423x/Makefile
+++ b/sound/isa/cs423x/Makefile
@@ -4,8 +4,8 @@
# Copyright (c) 2001 by Jaroslav Kysela <perex@perex.cz>
#
-snd-cs4231-objs := cs4231.o
-snd-cs4236-objs := cs4236.o cs4236_lib.o
+snd-cs4231-y := cs4231.o
+snd-cs4236-y := cs4236.o cs4236_lib.o
# Toplevel Module Dependency
obj-$(CONFIG_SND_CS4231) += snd-cs4231.o
diff --git a/sound/isa/es1688/Makefile b/sound/isa/es1688/Makefile
index c683ac36c50e..7d6c44a8eaad 100644
--- a/sound/isa/es1688/Makefile
+++ b/sound/isa/es1688/Makefile
@@ -4,8 +4,8 @@
# Copyright (c) 2001 by Jaroslav Kysela <perex@perex.cz>
#
-snd-es1688-lib-objs := es1688_lib.o
-snd-es1688-objs := es1688.o
+snd-es1688-lib-y := es1688_lib.o
+snd-es1688-y := es1688.o
# Toplevel Module Dependency
obj-$(CONFIG_SND_ES1688) += snd-es1688.o snd-es1688-lib.o
diff --git a/sound/isa/galaxy/Makefile b/sound/isa/galaxy/Makefile
index ff861f238093..2dbd519860a6 100644
--- a/sound/isa/galaxy/Makefile
+++ b/sound/isa/galaxy/Makefile
@@ -4,8 +4,8 @@
# Copyright (c) 2001 by Jaroslav Kysela <perex@suse.cz>
#
-snd-azt1605-objs := azt1605.o
-snd-azt2316-objs := azt2316.o
+snd-azt1605-y := azt1605.o
+snd-azt2316-y := azt2316.o
obj-$(CONFIG_SND_AZT1605) += snd-azt1605.o
obj-$(CONFIG_SND_AZT2316) += snd-azt2316.o
diff --git a/sound/isa/gus/Makefile b/sound/isa/gus/Makefile
index c6f32ffd3420..4924c1904fa4 100644
--- a/sound/isa/gus/Makefile
+++ b/sound/isa/gus/Makefile
@@ -4,18 +4,18 @@
# Copyright (c) 2001 by Jaroslav Kysela <perex@perex.cz>
#
-snd-gus-lib-objs := gus_main.o \
+snd-gus-lib-y := gus_main.o \
gus_io.o gus_irq.o gus_timer.o \
gus_mem.o gus_mem_proc.o gus_dram.o gus_dma.o gus_volume.o \
gus_pcm.o gus_mixer.o \
gus_uart.o \
gus_reset.o
-snd-gusclassic-objs := gusclassic.o
-snd-gusextreme-objs := gusextreme.o
-snd-gusmax-objs := gusmax.o
-snd-interwave-objs := interwave.o
-snd-interwave-stb-objs := interwave-stb.o
+snd-gusclassic-y := gusclassic.o
+snd-gusextreme-y := gusextreme.o
+snd-gusmax-y := gusmax.o
+snd-interwave-y := interwave.o
+snd-interwave-stb-y := interwave-stb.o
# Toplevel Module Dependency
obj-$(CONFIG_SND_GUSCLASSIC) += snd-gusclassic.o snd-gus-lib.o
diff --git a/sound/isa/msnd/Makefile b/sound/isa/msnd/Makefile
index ec231a7b1d5e..5f8d6b472722 100644
--- a/sound/isa/msnd/Makefile
+++ b/sound/isa/msnd/Makefile
@@ -1,8 +1,8 @@
# SPDX-License-Identifier: GPL-2.0
-snd-msnd-lib-objs := msnd.o msnd_midi.o msnd_pinnacle_mixer.o
-snd-msnd-pinnacle-objs := msnd_pinnacle.o
-snd-msnd-classic-objs := msnd_classic.o
+snd-msnd-lib-y := msnd.o msnd_midi.o msnd_pinnacle_mixer.o
+snd-msnd-pinnacle-y := msnd_pinnacle.o
+snd-msnd-classic-y := msnd_classic.o
# Toplevel Module Dependency
obj-$(CONFIG_SND_MSND_PINNACLE) += snd-msnd-pinnacle.o snd-msnd-lib.o
diff --git a/sound/isa/opti9xx/Makefile b/sound/isa/opti9xx/Makefile
index a9dcdeb502bd..44a2fb220456 100644
--- a/sound/isa/opti9xx/Makefile
+++ b/sound/isa/opti9xx/Makefile
@@ -4,10 +4,10 @@
# Copyright (c) 2001 by Jaroslav Kysela <perex@perex.cz>
#
-snd-opti92x-ad1848-objs := opti92x-ad1848.o
-snd-opti92x-cs4231-objs := opti92x-cs4231.o
-snd-opti93x-objs := opti93x.o
-snd-miro-objs := miro.o
+snd-opti92x-ad1848-y := opti92x-ad1848.o
+snd-opti92x-cs4231-y := opti92x-cs4231.o
+snd-opti93x-y := opti93x.o
+snd-miro-y := miro.o
# Toplevel Module Dependency
obj-$(CONFIG_SND_OPTI92X_AD1848) += snd-opti92x-ad1848.o
diff --git a/sound/isa/sb/Makefile b/sound/isa/sb/Makefile
index f174a5b3c8e4..96a926feb17a 100644
--- a/sound/isa/sb/Makefile
+++ b/sound/isa/sb/Makefile
@@ -4,15 +4,15 @@
# Copyright (c) 2001 by Jaroslav Kysela <perex@perex.cz>
#
-snd-sb-common-objs := sb_common.o sb_mixer.o
-snd-sb8-dsp-objs := sb8_main.o sb8_midi.o
-snd-sb16-dsp-objs := sb16_main.o
-snd-sb16-csp-objs := sb16_csp.o
-snd-sb8-objs := sb8.o
-snd-sb16-objs := sb16.o
-snd-sbawe-objs := sbawe.o emu8000.o
-snd-emu8000-synth-objs := emu8000_synth.o emu8000_callback.o emu8000_patch.o emu8000_pcm.o
-snd-jazz16-objs := jazz16.o
+snd-sb-common-y := sb_common.o sb_mixer.o
+snd-sb8-dsp-y := sb8_main.o sb8_midi.o
+snd-sb16-dsp-y := sb16_main.o
+snd-sb16-csp-y := sb16_csp.o
+snd-sb8-y := sb8.o
+snd-sb16-y := sb16.o
+snd-sbawe-y := sbawe.o emu8000.o
+snd-emu8000-synth-y := emu8000_synth.o emu8000_callback.o emu8000_patch.o emu8000_pcm.o
+snd-jazz16-y := jazz16.o
# Toplevel Module Dependency
obj-$(CONFIG_SND_SB_COMMON) += snd-sb-common.o
diff --git a/sound/isa/wavefront/Makefile b/sound/isa/wavefront/Makefile
index b8406dce81f5..3ba85fb2e6cd 100644
--- a/sound/isa/wavefront/Makefile
+++ b/sound/isa/wavefront/Makefile
@@ -4,7 +4,7 @@
# Copyright (c) 2001 by Jaroslav Kysela <perex@perex.cz>
#
-snd-wavefront-objs := wavefront.o wavefront_fx.o wavefront_synth.o wavefront_midi.o
+snd-wavefront-y := wavefront.o wavefront_fx.o wavefront_synth.o wavefront_midi.o
# Toplevel Module Dependency
obj-$(CONFIG_SND_WAVEFRONT) += snd-wavefront.o
diff --git a/sound/isa/wss/Makefile b/sound/isa/wss/Makefile
index 34d0636b3dc3..f23e71d0d5d4 100644
--- a/sound/isa/wss/Makefile
+++ b/sound/isa/wss/Makefile
@@ -4,7 +4,7 @@
# Copyright (c) 2008 by Jaroslav Kysela <perex@perex.cz>
#
-snd-wss-lib-objs := wss_lib.o
+snd-wss-lib-y := wss_lib.o
# Toplevel Module Dependency
obj-$(CONFIG_SND_WSS_LIB) += snd-wss-lib.o
--
2.43.0
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [PATCH 5/9] ALSA: usb: Use *-y instead of *-objs in Makefile
2024-05-07 13:55 [PATCH 0/9] ALSA: Use *-y instead of *-objs in Makefile Takashi Iwai
` (3 preceding siblings ...)
2024-05-07 13:55 ` [PATCH 4/9] ALSA: isa: " Takashi Iwai
@ 2024-05-07 13:55 ` Takashi Iwai
2024-05-07 13:55 ` [PATCH 6/9] ALSA: drivers: " Takashi Iwai
` (5 subsequent siblings)
10 siblings, 0 replies; 19+ messages in thread
From: Takashi Iwai @ 2024-05-07 13:55 UTC (permalink / raw)
To: linux-sound; +Cc: Andy Shevchenko, Takashi Iwai
*-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>
---
sound/usb/6fire/Makefile | 2 +-
sound/usb/Makefile | 4 ++--
sound/usb/hiface/Makefile | 2 +-
sound/usb/misc/Makefile | 2 +-
sound/usb/usx2y/Makefile | 4 ++--
5 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/sound/usb/6fire/Makefile b/sound/usb/6fire/Makefile
index 7d353bbf7493..587f25c64e56 100644
--- a/sound/usb/6fire/Makefile
+++ b/sound/usb/6fire/Makefile
@@ -1,4 +1,4 @@
# SPDX-License-Identifier: GPL-2.0-only
-snd-usb-6fire-objs += chip.o comm.o midi.o control.o firmware.o pcm.o
+snd-usb-6fire-y += chip.o comm.o midi.o control.o firmware.o pcm.o
obj-$(CONFIG_SND_USB_6FIRE) += snd-usb-6fire.o
diff --git a/sound/usb/Makefile b/sound/usb/Makefile
index 8c657c2753c8..0532499dbc6d 100644
--- a/sound/usb/Makefile
+++ b/sound/usb/Makefile
@@ -3,7 +3,7 @@
# Makefile for ALSA
#
-snd-usb-audio-objs := card.o \
+snd-usb-audio-y := card.o \
clock.o \
endpoint.o \
format.o \
@@ -25,7 +25,7 @@ snd-usb-audio-objs := card.o \
snd-usb-audio-$(CONFIG_SND_USB_AUDIO_MIDI_V2) += midi2.o
snd-usb-audio-$(CONFIG_SND_USB_AUDIO_USE_MEDIA_CONTROLLER) += media.o
-snd-usbmidi-lib-objs := midi.o
+snd-usbmidi-lib-y := midi.o
# Toplevel Module Dependency
obj-$(CONFIG_SND_USB_AUDIO) += snd-usb-audio.o snd-usbmidi-lib.o
diff --git a/sound/usb/hiface/Makefile b/sound/usb/hiface/Makefile
index 8f3b24e7d6c2..997c1558d0cb 100644
--- a/sound/usb/hiface/Makefile
+++ b/sound/usb/hiface/Makefile
@@ -1,3 +1,3 @@
# SPDX-License-Identifier: GPL-2.0-only
-snd-usb-hiface-objs := chip.o pcm.o
+snd-usb-hiface-y := chip.o pcm.o
obj-$(CONFIG_SND_USB_HIFACE) += snd-usb-hiface.o
diff --git a/sound/usb/misc/Makefile b/sound/usb/misc/Makefile
index 068ecd7bc043..3e9f4adc28de 100644
--- a/sound/usb/misc/Makefile
+++ b/sound/usb/misc/Makefile
@@ -1,3 +1,3 @@
# SPDX-License-Identifier: GPL-2.0-only
-snd-ua101-objs := ua101.o
+snd-ua101-y := ua101.o
obj-$(CONFIG_SND_USB_UA101) += snd-ua101.o
diff --git a/sound/usb/usx2y/Makefile b/sound/usb/usx2y/Makefile
index cc4c2f1efab2..fc033aba03a4 100644
--- a/sound/usb/usx2y/Makefile
+++ b/sound/usb/usx2y/Makefile
@@ -1,6 +1,6 @@
# SPDX-License-Identifier: GPL-2.0
-snd-usb-usx2y-objs := usbusx2y.o usX2Yhwdep.o usx2yhwdeppcm.o
-snd-usb-us122l-objs := us122l.o
+snd-usb-usx2y-y := usbusx2y.o usX2Yhwdep.o usx2yhwdeppcm.o
+snd-usb-us122l-y := us122l.o
obj-$(CONFIG_SND_USB_USX2Y) += snd-usb-usx2y.o
obj-$(CONFIG_SND_USB_US122L) += snd-usb-us122l.o
--
2.43.0
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [PATCH 6/9] ALSA: drivers: Use *-y instead of *-objs in Makefile
2024-05-07 13:55 [PATCH 0/9] ALSA: Use *-y instead of *-objs in Makefile Takashi Iwai
` (4 preceding siblings ...)
2024-05-07 13:55 ` [PATCH 5/9] ALSA: usb: " Takashi Iwai
@ 2024-05-07 13:55 ` Takashi Iwai
2024-05-07 13:55 ` [PATCH 7/9] ALSA: firewire: " Takashi Iwai
` (4 subsequent siblings)
10 siblings, 0 replies; 19+ messages in thread
From: Takashi Iwai @ 2024-05-07 13:55 UTC (permalink / raw)
To: linux-sound; +Cc: Andy Shevchenko, Takashi Iwai
*-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>
---
sound/drivers/Makefile | 18 +++++++++---------
sound/drivers/mpu401/Makefile | 4 ++--
sound/drivers/opl3/Makefile | 2 +-
sound/drivers/opl4/Makefile | 4 ++--
sound/drivers/pcsp/Makefile | 2 +-
sound/drivers/vx/Makefile | 2 +-
6 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/sound/drivers/Makefile b/sound/drivers/Makefile
index 2c0c7092d396..a08bdd70ec9c 100644
--- a/sound/drivers/Makefile
+++ b/sound/drivers/Makefile
@@ -4,15 +4,15 @@
# Copyright (c) 2001 by Jaroslav Kysela <perex@perex.cz>
#
-snd-dummy-objs := dummy.o
-snd-aloop-objs := aloop.o
-snd-mtpav-objs := mtpav.o
-snd-mts64-objs := mts64.o
-snd-pcmtest-objs := pcmtest.o
-snd-portman2x4-objs := portman2x4.o
-snd-serial-u16550-objs := serial-u16550.o
-snd-serial-generic-objs := serial-generic.o
-snd-virmidi-objs := virmidi.o
+snd-dummy-y := dummy.o
+snd-aloop-y := aloop.o
+snd-mtpav-y := mtpav.o
+snd-mts64-y := mts64.o
+snd-pcmtest-y := pcmtest.o
+snd-portman2x4-y := portman2x4.o
+snd-serial-u16550-y := serial-u16550.o
+snd-serial-generic-y := serial-generic.o
+snd-virmidi-y := virmidi.o
# Toplevel Module Dependency
obj-$(CONFIG_SND_DUMMY) += snd-dummy.o
diff --git a/sound/drivers/mpu401/Makefile b/sound/drivers/mpu401/Makefile
index 3dfd5b374c4f..0a96e238ee92 100644
--- a/sound/drivers/mpu401/Makefile
+++ b/sound/drivers/mpu401/Makefile
@@ -4,8 +4,8 @@
# Copyright (c) 2001 by Jaroslav Kysela <perex@perex.cz>
#
-snd-mpu401-objs := mpu401.o
-snd-mpu401-uart-objs := mpu401_uart.o
+snd-mpu401-y := mpu401.o
+snd-mpu401-uart-y := mpu401_uart.o
obj-$(CONFIG_SND_MPU401_UART) += snd-mpu401-uart.o
diff --git a/sound/drivers/opl3/Makefile b/sound/drivers/opl3/Makefile
index 83bca9f1fbdf..cf4826308365 100644
--- a/sound/drivers/opl3/Makefile
+++ b/sound/drivers/opl3/Makefile
@@ -4,7 +4,7 @@
# Copyright (c) 2001 by Jaroslav Kysela <perex@perex.cz>
#
-snd-opl3-lib-objs := opl3_lib.o opl3_synth.o
+snd-opl3-lib-y := opl3_lib.o opl3_synth.o
snd-opl3-synth-y := opl3_seq.o opl3_midi.o opl3_drums.o
ifneq ($(CONFIG_SND_SEQUENCER_OSS),)
snd-opl3-synth-y += opl3_oss.o
diff --git a/sound/drivers/opl4/Makefile b/sound/drivers/opl4/Makefile
index 6e86a4092b4c..a841630b45c2 100644
--- a/sound/drivers/opl4/Makefile
+++ b/sound/drivers/opl4/Makefile
@@ -4,9 +4,9 @@
# Copyright (c) 2001 by Jaroslav Kysela <perex@perex.cz>
#
-snd-opl4-lib-objs := opl4_lib.o opl4_mixer.o
+snd-opl4-lib-y := opl4_lib.o opl4_mixer.o
snd-opl4-lib-$(CONFIG_SND_PROC_FS) += opl4_proc.o
-snd-opl4-synth-objs := opl4_seq.o opl4_synth.o yrw801.o
+snd-opl4-synth-y := opl4_seq.o opl4_synth.o yrw801.o
obj-$(CONFIG_SND_OPL4_LIB) += snd-opl4-lib.o
obj-$(CONFIG_SND_OPL4_LIB_SEQ) += snd-opl4-synth.o
diff --git a/sound/drivers/pcsp/Makefile b/sound/drivers/pcsp/Makefile
index 77dc0ee1b598..309c09497261 100644
--- a/sound/drivers/pcsp/Makefile
+++ b/sound/drivers/pcsp/Makefile
@@ -1,3 +1,3 @@
# SPDX-License-Identifier: GPL-2.0-only
-snd-pcsp-objs := pcsp.o pcsp_lib.o pcsp_mixer.o pcsp_input.o
+snd-pcsp-y := pcsp.o pcsp_lib.o pcsp_mixer.o pcsp_input.o
obj-$(CONFIG_SND_PCSP) += snd-pcsp.o
diff --git a/sound/drivers/vx/Makefile b/sound/drivers/vx/Makefile
index d9f9ac670378..ae1b3e09283f 100644
--- a/sound/drivers/vx/Makefile
+++ b/sound/drivers/vx/Makefile
@@ -4,6 +4,6 @@
# Copyright (c) 2001 by Jaroslav Kysela <perex@perex.cz>
#
-snd-vx-lib-objs := vx_core.o vx_hwdep.o vx_pcm.o vx_mixer.o vx_cmd.o vx_uer.o
+snd-vx-lib-y := vx_core.o vx_hwdep.o vx_pcm.o vx_mixer.o vx_cmd.o vx_uer.o
obj-$(CONFIG_SND_VX_LIB) += snd-vx-lib.o
--
2.43.0
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [PATCH 7/9] ALSA: firewire: Use *-y instead of *-objs in Makefile
2024-05-07 13:55 [PATCH 0/9] ALSA: Use *-y instead of *-objs in Makefile Takashi Iwai
` (5 preceding siblings ...)
2024-05-07 13:55 ` [PATCH 6/9] ALSA: drivers: " Takashi Iwai
@ 2024-05-07 13:55 ` Takashi Iwai
2024-05-08 9:59 ` Takashi Sakamoto
2024-05-07 13:55 ` [PATCH 8/9] ALSA: aoa: " Takashi Iwai
` (3 subsequent siblings)
10 siblings, 1 reply; 19+ messages in thread
From: Takashi Iwai @ 2024-05-07 13:55 UTC (permalink / raw)
To: linux-sound; +Cc: Andy Shevchenko, Takashi Iwai, Takashi Sakamoto
*-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.
Cc: Takashi Sakamoto <o-takashi@sakamocchi.jp>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
---
sound/firewire/Makefile | 4 ++--
sound/firewire/bebob/Makefile | 2 +-
sound/firewire/dice/Makefile | 2 +-
sound/firewire/digi00x/Makefile | 2 +-
sound/firewire/fireface/Makefile | 2 +-
sound/firewire/fireworks/Makefile | 2 +-
sound/firewire/motu/Makefile | 2 +-
sound/firewire/oxfw/Makefile | 2 +-
sound/firewire/tascam/Makefile | 2 +-
9 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/sound/firewire/Makefile b/sound/firewire/Makefile
index 44a7b510b75b..45018a5c224f 100644
--- a/sound/firewire/Makefile
+++ b/sound/firewire/Makefile
@@ -2,9 +2,9 @@
# To find a header included by define_trace.h.
CFLAGS_amdtp-stream.o := -I$(src)
-snd-firewire-lib-objs := lib.o iso-resources.o packets-buffer.o \
+snd-firewire-lib-y := lib.o iso-resources.o packets-buffer.o \
fcp.o cmp.o amdtp-stream.o amdtp-am824.o
-snd-isight-objs := isight.o
+snd-isight-y := isight.o
obj-$(CONFIG_SND_FIREWIRE_LIB) += snd-firewire-lib.o
obj-$(CONFIG_SND_DICE) += dice/
diff --git a/sound/firewire/bebob/Makefile b/sound/firewire/bebob/Makefile
index 14bc84c51ef5..b913e805bd7a 100644
--- a/sound/firewire/bebob/Makefile
+++ b/sound/firewire/bebob/Makefile
@@ -1,5 +1,5 @@
# SPDX-License-Identifier: GPL-2.0
-snd-bebob-objs := bebob_command.o bebob_stream.o bebob_proc.o bebob_midi.o \
+snd-bebob-y := bebob_command.o bebob_stream.o bebob_proc.o bebob_midi.o \
bebob_pcm.o bebob_hwdep.o bebob_terratec.o \
bebob_yamaha_terratec.o bebob_focusrite.o bebob_maudio.o \
bebob.o
diff --git a/sound/firewire/dice/Makefile b/sound/firewire/dice/Makefile
index bac8712f9014..36e25a3cf3c6 100644
--- a/sound/firewire/dice/Makefile
+++ b/sound/firewire/dice/Makefile
@@ -1,5 +1,5 @@
# SPDX-License-Identifier: GPL-2.0-only
-snd-dice-objs := dice-transaction.o dice-stream.o dice-proc.o dice-midi.o \
+snd-dice-y := dice-transaction.o dice-stream.o dice-proc.o dice-midi.o \
dice-pcm.o dice-hwdep.o dice.o dice-tcelectronic.o \
dice-alesis.o dice-extension.o dice-mytek.o dice-presonus.o \
dice-harman.o dice-focusrite.o dice-weiss.o
diff --git a/sound/firewire/digi00x/Makefile b/sound/firewire/digi00x/Makefile
index 8add0cd9af3a..6dc18bd2e186 100644
--- a/sound/firewire/digi00x/Makefile
+++ b/sound/firewire/digi00x/Makefile
@@ -1,5 +1,5 @@
# SPDX-License-Identifier: GPL-2.0-only
-snd-firewire-digi00x-objs := amdtp-dot.o digi00x-stream.o digi00x-proc.o \
+snd-firewire-digi00x-y := amdtp-dot.o digi00x-stream.o digi00x-proc.o \
digi00x-pcm.o digi00x-hwdep.o \
digi00x-transaction.o digi00x-midi.o digi00x.o
obj-$(CONFIG_SND_FIREWIRE_DIGI00X) += snd-firewire-digi00x.o
diff --git a/sound/firewire/fireface/Makefile b/sound/firewire/fireface/Makefile
index 3aef221ce4b0..b397d95877a0 100644
--- a/sound/firewire/fireface/Makefile
+++ b/sound/firewire/fireface/Makefile
@@ -1,5 +1,5 @@
# SPDX-License-Identifier: GPL-2.0-only
-snd-fireface-objs := ff.o ff-transaction.o ff-midi.o ff-proc.o amdtp-ff.o \
+snd-fireface-y := ff.o ff-transaction.o ff-midi.o ff-proc.o amdtp-ff.o \
ff-stream.o ff-pcm.o ff-hwdep.o ff-protocol-former.o \
ff-protocol-latter.o
obj-$(CONFIG_SND_FIREFACE) += snd-fireface.o
diff --git a/sound/firewire/fireworks/Makefile b/sound/firewire/fireworks/Makefile
index 3386121b2a04..baaf3066c9b1 100644
--- a/sound/firewire/fireworks/Makefile
+++ b/sound/firewire/fireworks/Makefile
@@ -1,5 +1,5 @@
# SPDX-License-Identifier: GPL-2.0-only
-snd-fireworks-objs := fireworks_transaction.o fireworks_command.o \
+snd-fireworks-y := fireworks_transaction.o fireworks_command.o \
fireworks_stream.o fireworks_proc.o fireworks_midi.o \
fireworks_pcm.o fireworks_hwdep.o fireworks.o
obj-$(CONFIG_SND_FIREWORKS) += snd-fireworks.o
diff --git a/sound/firewire/motu/Makefile b/sound/firewire/motu/Makefile
index 3bef2a0b1e2e..df0fe886dbc0 100644
--- a/sound/firewire/motu/Makefile
+++ b/sound/firewire/motu/Makefile
@@ -1,7 +1,7 @@
# SPDX-License-Identifier: GPL-2.0
CFLAGS_amdtp-motu.o := -I$(src)
-snd-firewire-motu-objs := motu.o amdtp-motu.o motu-transaction.o motu-stream.o \
+snd-firewire-motu-y := motu.o amdtp-motu.o motu-transaction.o motu-stream.o \
motu-proc.o motu-pcm.o motu-midi.o motu-hwdep.o \
motu-protocol-v2.o motu-protocol-v3.o \
motu-protocol-v1.o motu-register-dsp-message-parser.o \
diff --git a/sound/firewire/oxfw/Makefile b/sound/firewire/oxfw/Makefile
index 669d1e8238df..9ac8893a926f 100644
--- a/sound/firewire/oxfw/Makefile
+++ b/sound/firewire/oxfw/Makefile
@@ -1,4 +1,4 @@
# SPDX-License-Identifier: GPL-2.0-only
-snd-oxfw-objs := oxfw-command.o oxfw-stream.o oxfw-pcm.o oxfw-proc.o \
+snd-oxfw-y := oxfw-command.o oxfw-stream.o oxfw-pcm.o oxfw-proc.o \
oxfw-midi.o oxfw-hwdep.o oxfw-spkr.o oxfw-scs1x.o oxfw.o
obj-$(CONFIG_SND_OXFW) += snd-oxfw.o
diff --git a/sound/firewire/tascam/Makefile b/sound/firewire/tascam/Makefile
index a1d21f244d64..43fed14cf172 100644
--- a/sound/firewire/tascam/Makefile
+++ b/sound/firewire/tascam/Makefile
@@ -1,5 +1,5 @@
# SPDX-License-Identifier: GPL-2.0-only
-snd-firewire-tascam-objs := tascam-proc.o amdtp-tascam.o tascam-stream.o \
+snd-firewire-tascam-y := tascam-proc.o amdtp-tascam.o tascam-stream.o \
tascam-pcm.o tascam-hwdep.o tascam-transaction.o \
tascam-midi.o tascam.o
obj-$(CONFIG_SND_FIREWIRE_TASCAM) += snd-firewire-tascam.o
--
2.43.0
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [PATCH 8/9] ALSA: aoa: Use *-y instead of *-objs in Makefile
2024-05-07 13:55 [PATCH 0/9] ALSA: Use *-y instead of *-objs in Makefile Takashi Iwai
` (6 preceding siblings ...)
2024-05-07 13:55 ` [PATCH 7/9] ALSA: firewire: " Takashi Iwai
@ 2024-05-07 13:55 ` Takashi Iwai
2024-05-07 13:55 ` [PATCH 9/9] ALSA: misc: " Takashi Iwai
` (2 subsequent siblings)
10 siblings, 0 replies; 19+ messages in thread
From: Takashi Iwai @ 2024-05-07 13:55 UTC (permalink / raw)
To: linux-sound; +Cc: Andy Shevchenko, Takashi Iwai
*-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>
---
sound/aoa/codecs/Makefile | 6 +++---
sound/aoa/core/Makefile | 2 +-
sound/aoa/fabrics/Makefile | 2 +-
sound/aoa/soundbus/Makefile | 2 +-
sound/aoa/soundbus/i2sbus/Makefile | 2 +-
5 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/sound/aoa/codecs/Makefile b/sound/aoa/codecs/Makefile
index 95f4c3849d55..8feedc771bd9 100644
--- a/sound/aoa/codecs/Makefile
+++ b/sound/aoa/codecs/Makefile
@@ -1,7 +1,7 @@
# SPDX-License-Identifier: GPL-2.0
-snd-aoa-codec-onyx-objs := onyx.o
-snd-aoa-codec-tas-objs := tas.o
-snd-aoa-codec-toonie-objs := toonie.o
+snd-aoa-codec-onyx-y := onyx.o
+snd-aoa-codec-tas-y := tas.o
+snd-aoa-codec-toonie-y := toonie.o
obj-$(CONFIG_SND_AOA_ONYX) += snd-aoa-codec-onyx.o
obj-$(CONFIG_SND_AOA_TAS) += snd-aoa-codec-tas.o
diff --git a/sound/aoa/core/Makefile b/sound/aoa/core/Makefile
index 056d69683b1e..f586c340fe12 100644
--- a/sound/aoa/core/Makefile
+++ b/sound/aoa/core/Makefile
@@ -1,6 +1,6 @@
# SPDX-License-Identifier: GPL-2.0
obj-$(CONFIG_SND_AOA) += snd-aoa.o
-snd-aoa-objs := core.o \
+snd-aoa-y := core.o \
alsa.o \
gpio-pmf.o \
gpio-feature.o
diff --git a/sound/aoa/fabrics/Makefile b/sound/aoa/fabrics/Makefile
index 3f1d55f3f1fc..2c3bee6cfa2c 100644
--- a/sound/aoa/fabrics/Makefile
+++ b/sound/aoa/fabrics/Makefile
@@ -1,4 +1,4 @@
# SPDX-License-Identifier: GPL-2.0-only
-snd-aoa-fabric-layout-objs += layout.o
+snd-aoa-fabric-layout-y += layout.o
obj-$(CONFIG_SND_AOA_FABRIC_LAYOUT) += snd-aoa-fabric-layout.o
diff --git a/sound/aoa/soundbus/Makefile b/sound/aoa/soundbus/Makefile
index e0b61cf5518e..a10b102daf81 100644
--- a/sound/aoa/soundbus/Makefile
+++ b/sound/aoa/soundbus/Makefile
@@ -1,4 +1,4 @@
# SPDX-License-Identifier: GPL-2.0-only
obj-$(CONFIG_SND_AOA_SOUNDBUS) += snd-aoa-soundbus.o
-snd-aoa-soundbus-objs := core.o sysfs.o
+snd-aoa-soundbus-y := core.o sysfs.o
obj-$(CONFIG_SND_AOA_SOUNDBUS_I2S) += i2sbus/
diff --git a/sound/aoa/soundbus/i2sbus/Makefile b/sound/aoa/soundbus/i2sbus/Makefile
index 1b38c87fef09..1ddaa0e17d67 100644
--- a/sound/aoa/soundbus/i2sbus/Makefile
+++ b/sound/aoa/soundbus/i2sbus/Makefile
@@ -1,3 +1,3 @@
# SPDX-License-Identifier: GPL-2.0-only
obj-$(CONFIG_SND_AOA_SOUNDBUS_I2S) += snd-aoa-i2sbus.o
-snd-aoa-i2sbus-objs := core.o pcm.o control.o
+snd-aoa-i2sbus-y := core.o pcm.o control.o
--
2.43.0
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [PATCH 9/9] ALSA: misc: Use *-y instead of *-objs in Makefile
2024-05-07 13:55 [PATCH 0/9] ALSA: Use *-y instead of *-objs in Makefile Takashi Iwai
` (7 preceding siblings ...)
2024-05-07 13:55 ` [PATCH 8/9] ALSA: aoa: " Takashi Iwai
@ 2024-05-07 13:55 ` Takashi Iwai
2024-05-07 14:34 ` [PATCH 0/9] ALSA: " Jaroslav Kysela
2024-05-07 16:02 ` Andy Shevchenko
10 siblings, 0 replies; 19+ messages in thread
From: Takashi Iwai @ 2024-05-07 13:55 UTC (permalink / raw)
To: linux-sound; +Cc: Andy Shevchenko, Takashi Iwai
*-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>
---
sound/arm/Makefile | 4 ++--
sound/atmel/Makefile | 2 +-
sound/i2c/Makefile | 6 +++---
sound/i2c/other/Makefile | 10 +++++-----
sound/mips/Makefile | 4 ++--
sound/parisc/Makefile | 2 +-
sound/pcmcia/pdaudiocf/Makefile | 2 +-
sound/pcmcia/vx/Makefile | 2 +-
sound/ppc/Makefile | 2 +-
sound/sh/Makefile | 4 ++--
sound/sparc/Makefile | 6 +++---
sound/spi/Makefile | 2 +-
sound/synth/Makefile | 2 +-
sound/synth/emux/Makefile | 2 +-
sound/virtio/Makefile | 2 +-
sound/x86/Makefile | 2 +-
sound/xen/Makefile | 2 +-
17 files changed, 28 insertions(+), 28 deletions(-)
diff --git a/sound/arm/Makefile b/sound/arm/Makefile
index 34c769489877..899edb4bb278 100644
--- 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 57bc6f65be19..a8917d1854c7 100644
--- 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 09978855e08e..c827f9f70a33 100644
--- 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 1a4ce1236146..0a2c0d147ab8 100644
--- 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 7c86268b2bf3..bfbf3bda487b 100644
--- 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 10891c3b7d91..84c71490fb72 100644
--- 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 ea0d67576df9..34a288c1eebd 100644
--- 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 b25006e4d25a..abd187544946 100644
--- 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 0188ce3e30b8..655bcffba843 100644
--- 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 c0bbc500c17c..6871dece28a5 100644
--- 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 e1f596571d7f..0a03123933c6 100644
--- 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 a3834919b0f6..d6a198a44917 100644
--- 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 b9f71d5dbc8c..369f3be2cd17 100644
--- 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 ed28c81ac12e..59357da6d1ef 100644
--- 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 a839f8c8b5e6..3ca41b3c8b95 100644
--- 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 6b5ffb329d47..44d2a339615d 100644
--- 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 24031775b715..5dab1616eac0 100644
--- 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
--
2.43.0
^ permalink raw reply related [flat|nested] 19+ messages in thread
* Re: [PATCH 0/9] ALSA: Use *-y instead of *-objs in Makefile
2024-05-07 13:55 [PATCH 0/9] ALSA: Use *-y instead of *-objs in Makefile Takashi Iwai
` (8 preceding siblings ...)
2024-05-07 13:55 ` [PATCH 9/9] ALSA: misc: " Takashi Iwai
@ 2024-05-07 14:34 ` Jaroslav Kysela
2024-05-07 16:02 ` Andy Shevchenko
10 siblings, 0 replies; 19+ messages in thread
From: Jaroslav Kysela @ 2024-05-07 14:34 UTC (permalink / raw)
To: Takashi Iwai, linux-sound; +Cc: Andy Shevchenko
On 07. 05. 24 15:55, Takashi Iwai wrote:
> Hi,
>
> this is a series of trivial cleanup patches for Makefile in sound/*
> (modulo ASoC -- which will be submitted later in a separate series).
>
> As Andy suggested in a patch review, *-objs suffix in Makefile is
> basically a mis-use nowadays for kernel driver modules. They should
> be replaced with *-y suffix instead. This is a result of systematic
> conversions, separated per directory.
Reviewed-by: Jaroslav Kysela <perex@perex.cz>
Thanks,
Jaroslav
--
Jaroslav Kysela <perex@perex.cz>
Linux Sound Maintainer; ALSA Project; Red Hat, Inc.
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH 0/9] ALSA: Use *-y instead of *-objs in Makefile
2024-05-07 13:55 [PATCH 0/9] ALSA: Use *-y instead of *-objs in Makefile Takashi Iwai
` (9 preceding siblings ...)
2024-05-07 14:34 ` [PATCH 0/9] ALSA: " Jaroslav Kysela
@ 2024-05-07 16:02 ` Andy Shevchenko
2024-05-07 20:53 ` Andy Shevchenko
10 siblings, 1 reply; 19+ messages in thread
From: Andy Shevchenko @ 2024-05-07 16:02 UTC (permalink / raw)
To: Takashi Iwai; +Cc: linux-sound
On Tue, May 07, 2024 at 03:55:00PM +0200, Takashi Iwai wrote:
> Hi,
>
> this is a series of trivial cleanup patches for Makefile in sound/*
> (modulo ASoC -- which will be submitted later in a separate series).
>
> As Andy suggested in a patch review, *-objs suffix in Makefile is
> basically a mis-use nowadays for kernel driver modules. They should
> be replaced with *-y suffix instead. This is a result of systematic
> conversions, separated per directory.
I briefly looked at this and since it's a mechanical conversion I don't see
any issues, so
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
--
With Best Regards,
Andy Shevchenko
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH 0/9] ALSA: Use *-y instead of *-objs in Makefile
2024-05-07 16:02 ` Andy Shevchenko
@ 2024-05-07 20:53 ` Andy Shevchenko
2024-05-08 9:02 ` Takashi Iwai
0 siblings, 1 reply; 19+ messages in thread
From: Andy Shevchenko @ 2024-05-07 20:53 UTC (permalink / raw)
To: Takashi Iwai; +Cc: linux-sound
On Tue, May 07, 2024 at 07:02:35PM +0300, Andy Shevchenko wrote:
> On Tue, May 07, 2024 at 03:55:00PM +0200, Takashi Iwai wrote:
> > Hi,
> >
> > this is a series of trivial cleanup patches for Makefile in sound/*
> > (modulo ASoC -- which will be submitted later in a separate series).
> >
> > As Andy suggested in a patch review, *-objs suffix in Makefile is
> > basically a mis-use nowadays for kernel driver modules. They should
> > be replaced with *-y suffix instead. This is a result of systematic
> > conversions, separated per directory.
>
> I briefly looked at this and since it's a mechanical conversion I don't see
> any issues, so
>
> Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Btw, make W=1 nowadays enables modpost checks, which complain about absence of
MODULE_DESCRIPTION().
Example:
WARNING: modpost: missing MODULE_DESCRIPTION() in sound/core/snd-pcm-dmaengine.o
WARNING: modpost: missing MODULE_DESCRIPTION() in sound/soc/sof/intel/snd-sof-intel-atom.o
WARNING: modpost: missing MODULE_DESCRIPTION() in sound/soc/sof/intel/snd-sof-acpi-intel-byt.o
WARNING: modpost: missing MODULE_DESCRIPTION() in sound/soc/sof/intel/snd-sof-acpi-intel-bdw.o
WARNING: modpost: missing MODULE_DESCRIPTION() in sound/soc/sof/snd-sof-utils.o
WARNING: modpost: missing MODULE_DESCRIPTION() in sound/soc/sof/snd-sof-acpi.o
WARNING: modpost: missing MODULE_DESCRIPTION() in sound/ac97_bus.o
I'm not sure what the case now for ALSA, just FYI.
--
With Best Regards,
Andy Shevchenko
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH 0/9] ALSA: Use *-y instead of *-objs in Makefile
2024-05-07 20:53 ` Andy Shevchenko
@ 2024-05-08 9:02 ` Takashi Iwai
2024-05-09 16:10 ` Pierre-Louis Bossart
0 siblings, 1 reply; 19+ messages in thread
From: Takashi Iwai @ 2024-05-08 9:02 UTC (permalink / raw)
To: Andy Shevchenko
Cc: Takashi Iwai, linux-sound, Pierre-Louis Bossart, Liam Girdwood,
Peter Ujfalusi, Bard Liao, Ranjani Sridharan, Daniel Baluta,
sound-open-firmware
On Tue, 07 May 2024 22:53:46 +0200,
Andy Shevchenko wrote:
>
> On Tue, May 07, 2024 at 07:02:35PM +0300, Andy Shevchenko wrote:
> > On Tue, May 07, 2024 at 03:55:00PM +0200, Takashi Iwai wrote:
> > > Hi,
> > >
> > > this is a series of trivial cleanup patches for Makefile in sound/*
> > > (modulo ASoC -- which will be submitted later in a separate series).
> > >
> > > As Andy suggested in a patch review, *-objs suffix in Makefile is
> > > basically a mis-use nowadays for kernel driver modules. They should
> > > be replaced with *-y suffix instead. This is a result of systematic
> > > conversions, separated per directory.
> >
> > I briefly looked at this and since it's a mechanical conversion I don't see
> > any issues, so
> >
> > Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
>
> Btw, make W=1 nowadays enables modpost checks, which complain about absence of
> MODULE_DESCRIPTION().
>
> Example:
> WARNING: modpost: missing MODULE_DESCRIPTION() in sound/core/snd-pcm-dmaengine.o
> WARNING: modpost: missing MODULE_DESCRIPTION() in sound/soc/sof/intel/snd-sof-intel-atom.o
> WARNING: modpost: missing MODULE_DESCRIPTION() in sound/soc/sof/intel/snd-sof-acpi-intel-byt.o
> WARNING: modpost: missing MODULE_DESCRIPTION() in sound/soc/sof/intel/snd-sof-acpi-intel-bdw.o
> WARNING: modpost: missing MODULE_DESCRIPTION() in sound/soc/sof/snd-sof-utils.o
> WARNING: modpost: missing MODULE_DESCRIPTION() in sound/soc/sof/snd-sof-acpi.o
> WARNING: modpost: missing MODULE_DESCRIPTION() in sound/ac97_bus.o
>
> I'm not sure what the case now for ALSA, just FYI.
Indeed there are lots of code that miss MODULE_DESCRIPTION().
Through a quick grep, there are:
sound/ac97/bus.c
sound/ac97_bus.c
sound/core/pcm_dmaengine.c
sound/core/sound_kunit.c
sound/drivers/pcmtest.c
sound/oss/dmasound/dmasound_atari.c
sound/oss/dmasound/dmasound_core.c
sound/oss/dmasound/dmasound_paula.c
sound/pci/hda/cirrus_scodec_test.c
sound/soc/amd/acp/acp-i2s.c
sound/soc/amd/acp/acp-legacy-common.c
sound/soc/amd/acp/acp-pci.c
sound/soc/amd/acp/acp-pdm.c
sound/soc/amd/ps/ps-mach.c
sound/soc/amd/renoir/acp3x-rn.c
sound/soc/amd/yc/acp6x-mach.c
sound/soc/codecs/ab8500-codec.c
sound/soc/codecs/sigmadsp.c
sound/soc/codecs/wm_adsp.c
sound/soc/fsl/imx-pcm-dma.c
sound/soc/fsl/imx-pcm-fiq.c
sound/soc/mxs/mxs-pcm.c
sound/soc/qcom/common.c
sound/soc/qcom/qdsp6/q6dsp-common.c
sound/soc/qcom/sdw.c
sound/soc/soc-generic-dmaengine-pcm.c
sound/soc/soc-topology-test.c
sound/soc/sof/amd/pci-acp63.c
sound/soc/sof/amd/pci-rmb.c
sound/soc/sof/amd/pci-rn.c
sound/soc/sof/amd/pci-vangogh.c
sound/soc/sof/imx/imx-common.c
sound/soc/sof/imx/imx8.c
sound/soc/sof/imx/imx8m.c
sound/soc/sof/imx/imx8ulp.c
sound/soc/sof/intel/atom.c
sound/soc/sof/intel/bdw.c
sound/soc/sof/intel/byt.c
sound/soc/sof/intel/hda-codec.c
sound/soc/sof/intel/hda-ctrl.c
sound/soc/sof/intel/hda-mlink.c
sound/soc/sof/intel/hda.c
sound/soc/sof/intel/pci-apl.c
sound/soc/sof/intel/pci-cnl.c
sound/soc/sof/intel/pci-icl.c
sound/soc/sof/intel/pci-lnl.c
sound/soc/sof/intel/pci-mtl.c
sound/soc/sof/intel/pci-skl.c
sound/soc/sof/intel/pci-tgl.c
sound/soc/sof/intel/pci-tng.c
sound/soc/sof/mediatek/mt8186/mt8186.c
sound/soc/sof/mediatek/mt8195/mt8195.c
sound/soc/sof/mediatek/mtk-adsp-common.c
sound/soc/sof/sof-acpi-dev.c
sound/soc/sof/sof-of-dev.c
sound/soc/sof/sof-pci-dev.c
sound/soc/sof/sof-utils.c
sound/soc/sof/stream-ipc.c
sound/soc/ux500/ux500_msp_dai.c
sound/soc/ux500/ux500_msp_i2s.c
sound/soc/xilinx/xlnx_formatter_pcm.c
sound/soc/xilinx/xlnx_i2s.c
There are too many stuff in sound/soc/sof/* and I leave them to SOF
people (Cc'ed), while I'm going to submit the fix patches for the
rest.
thanks,
Takashi
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH 7/9] ALSA: firewire: Use *-y instead of *-objs in Makefile
2024-05-07 13:55 ` [PATCH 7/9] ALSA: firewire: " Takashi Iwai
@ 2024-05-08 9:59 ` Takashi Sakamoto
0 siblings, 0 replies; 19+ messages in thread
From: Takashi Sakamoto @ 2024-05-08 9:59 UTC (permalink / raw)
To: Takashi Iwai; +Cc: linux-sound, Andy Shevchenko
Hi,
On Tue, May 07, 2024 at 03:55:07PM +0200, Takashi Iwai wrote:
> *-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.
>
> Cc: Takashi Sakamoto <o-takashi@sakamocchi.jp>
> Signed-off-by: Takashi Iwai <tiwai@suse.de>
> ---
> sound/firewire/Makefile | 4 ++--
> sound/firewire/bebob/Makefile | 2 +-
> sound/firewire/dice/Makefile | 2 +-
> sound/firewire/digi00x/Makefile | 2 +-
> sound/firewire/fireface/Makefile | 2 +-
> sound/firewire/fireworks/Makefile | 2 +-
> sound/firewire/motu/Makefile | 2 +-
> sound/firewire/oxfw/Makefile | 2 +-
> sound/firewire/tascam/Makefile | 2 +-
> 9 files changed, 10 insertions(+), 10 deletions(-)
Good catch.
Reviewed-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
Thanks
Takashi Sakamoto
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH 0/9] ALSA: Use *-y instead of *-objs in Makefile
2024-05-08 9:02 ` Takashi Iwai
@ 2024-05-09 16:10 ` Pierre-Louis Bossart
2024-05-09 18:28 ` Takashi Iwai
0 siblings, 1 reply; 19+ messages in thread
From: Pierre-Louis Bossart @ 2024-05-09 16:10 UTC (permalink / raw)
To: Takashi Iwai, Andy Shevchenko
Cc: linux-sound, Liam Girdwood, Peter Ujfalusi, Bard Liao,
Ranjani Sridharan, Daniel Baluta, sound-open-firmware
On 5/8/24 04:02, Takashi Iwai wrote:
> On Tue, 07 May 2024 22:53:46 +0200,
> Andy Shevchenko wrote:
>>
>> On Tue, May 07, 2024 at 07:02:35PM +0300, Andy Shevchenko wrote:
>>> On Tue, May 07, 2024 at 03:55:00PM +0200, Takashi Iwai wrote:
>>>> Hi,
>>>>
>>>> this is a series of trivial cleanup patches for Makefile in sound/*
>>>> (modulo ASoC -- which will be submitted later in a separate series).
>>>>
>>>> As Andy suggested in a patch review, *-objs suffix in Makefile is
>>>> basically a mis-use nowadays for kernel driver modules. They should
>>>> be replaced with *-y suffix instead. This is a result of systematic
>>>> conversions, separated per directory.
>>>
>>> I briefly looked at this and since it's a mechanical conversion I don't see
>>> any issues, so
>>>
>>> Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
>>
>> Btw, make W=1 nowadays enables modpost checks, which complain about absence of
>> MODULE_DESCRIPTION().
>>
>> Example:
>> WARNING: modpost: missing MODULE_DESCRIPTION() in sound/core/snd-pcm-dmaengine.o
>> WARNING: modpost: missing MODULE_DESCRIPTION() in sound/soc/sof/intel/snd-sof-intel-atom.o
>> WARNING: modpost: missing MODULE_DESCRIPTION() in sound/soc/sof/intel/snd-sof-acpi-intel-byt.o
>> WARNING: modpost: missing MODULE_DESCRIPTION() in sound/soc/sof/intel/snd-sof-acpi-intel-bdw.o
>> WARNING: modpost: missing MODULE_DESCRIPTION() in sound/soc/sof/snd-sof-utils.o
>> WARNING: modpost: missing MODULE_DESCRIPTION() in sound/soc/sof/snd-sof-acpi.o
>> WARNING: modpost: missing MODULE_DESCRIPTION() in sound/ac97_bus.o
>>
>> I'm not sure what the case now for ALSA, just FYI.
>
> Indeed there are lots of code that miss MODULE_DESCRIPTION().
...
> There are too many stuff in sound/soc/sof/* and I leave them to SOF
> people (Cc'ed), while I'm going to submit the fix patches for the
> rest.
ok, I'll take care of it. I wasn't aware this was a requirement.
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH 0/9] ALSA: Use *-y instead of *-objs in Makefile
2024-05-09 16:10 ` Pierre-Louis Bossart
@ 2024-05-09 18:28 ` Takashi Iwai
2024-05-10 14:15 ` Andy Shevchenko
0 siblings, 1 reply; 19+ messages in thread
From: Takashi Iwai @ 2024-05-09 18:28 UTC (permalink / raw)
To: Pierre-Louis Bossart
Cc: Takashi Iwai, Andy Shevchenko, linux-sound, Liam Girdwood,
Peter Ujfalusi, Bard Liao, Ranjani Sridharan, Daniel Baluta,
sound-open-firmware
On Thu, 09 May 2024 18:10:39 +0200,
Pierre-Louis Bossart wrote:
>
>
>
> On 5/8/24 04:02, Takashi Iwai wrote:
> > On Tue, 07 May 2024 22:53:46 +0200,
> > Andy Shevchenko wrote:
> >>
> >> On Tue, May 07, 2024 at 07:02:35PM +0300, Andy Shevchenko wrote:
> >>> On Tue, May 07, 2024 at 03:55:00PM +0200, Takashi Iwai wrote:
> >>>> Hi,
> >>>>
> >>>> this is a series of trivial cleanup patches for Makefile in sound/*
> >>>> (modulo ASoC -- which will be submitted later in a separate series).
> >>>>
> >>>> As Andy suggested in a patch review, *-objs suffix in Makefile is
> >>>> basically a mis-use nowadays for kernel driver modules. They should
> >>>> be replaced with *-y suffix instead. This is a result of systematic
> >>>> conversions, separated per directory.
> >>>
> >>> I briefly looked at this and since it's a mechanical conversion I don't see
> >>> any issues, so
> >>>
> >>> Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
> >>
> >> Btw, make W=1 nowadays enables modpost checks, which complain about absence of
> >> MODULE_DESCRIPTION().
> >>
> >> Example:
> >> WARNING: modpost: missing MODULE_DESCRIPTION() in sound/core/snd-pcm-dmaengine.o
> >> WARNING: modpost: missing MODULE_DESCRIPTION() in sound/soc/sof/intel/snd-sof-intel-atom.o
> >> WARNING: modpost: missing MODULE_DESCRIPTION() in sound/soc/sof/intel/snd-sof-acpi-intel-byt.o
> >> WARNING: modpost: missing MODULE_DESCRIPTION() in sound/soc/sof/intel/snd-sof-acpi-intel-bdw.o
> >> WARNING: modpost: missing MODULE_DESCRIPTION() in sound/soc/sof/snd-sof-utils.o
> >> WARNING: modpost: missing MODULE_DESCRIPTION() in sound/soc/sof/snd-sof-acpi.o
> >> WARNING: modpost: missing MODULE_DESCRIPTION() in sound/ac97_bus.o
> >>
> >> I'm not sure what the case now for ALSA, just FYI.
> >
> > Indeed there are lots of code that miss MODULE_DESCRIPTION().
> ...
> > There are too many stuff in sound/soc/sof/* and I leave them to SOF
> > people (Cc'ed), while I'm going to submit the fix patches for the
> > rest.
>
> ok, I'll take care of it. I wasn't aware this was a requirement.
It wasn't, but now became so :)
Takashi
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH 0/9] ALSA: Use *-y instead of *-objs in Makefile
2024-05-09 18:28 ` Takashi Iwai
@ 2024-05-10 14:15 ` Andy Shevchenko
2024-05-23 21:00 ` Jeff Johnson
0 siblings, 1 reply; 19+ messages in thread
From: Andy Shevchenko @ 2024-05-10 14:15 UTC (permalink / raw)
To: Takashi Iwai
Cc: Pierre-Louis Bossart, linux-sound, Liam Girdwood, Peter Ujfalusi,
Bard Liao, Ranjani Sridharan, Daniel Baluta, sound-open-firmware
On Thu, May 09, 2024 at 08:28:32PM +0200, Takashi Iwai wrote:
> On Thu, 09 May 2024 18:10:39 +0200,
> Pierre-Louis Bossart wrote:
> > On 5/8/24 04:02, Takashi Iwai wrote:
> > > On Tue, 07 May 2024 22:53:46 +0200,
> > > Andy Shevchenko wrote:
> > >> On Tue, May 07, 2024 at 07:02:35PM +0300, Andy Shevchenko wrote:
> > >>> On Tue, May 07, 2024 at 03:55:00PM +0200, Takashi Iwai wrote:
> > >>>> this is a series of trivial cleanup patches for Makefile in sound/*
> > >>>> (modulo ASoC -- which will be submitted later in a separate series).
> > >>>>
> > >>>> As Andy suggested in a patch review, *-objs suffix in Makefile is
> > >>>> basically a mis-use nowadays for kernel driver modules. They should
> > >>>> be replaced with *-y suffix instead. This is a result of systematic
> > >>>> conversions, separated per directory.
> > >>>
> > >>> I briefly looked at this and since it's a mechanical conversion I don't see
> > >>> any issues, so
> > >>>
> > >>> Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
> > >>
> > >> Btw, make W=1 nowadays enables modpost checks, which complain about absence of
> > >> MODULE_DESCRIPTION().
> > >>
> > >> Example:
> > >> WARNING: modpost: missing MODULE_DESCRIPTION() in sound/core/snd-pcm-dmaengine.o
> > >> WARNING: modpost: missing MODULE_DESCRIPTION() in sound/soc/sof/intel/snd-sof-intel-atom.o
> > >> WARNING: modpost: missing MODULE_DESCRIPTION() in sound/soc/sof/intel/snd-sof-acpi-intel-byt.o
> > >> WARNING: modpost: missing MODULE_DESCRIPTION() in sound/soc/sof/intel/snd-sof-acpi-intel-bdw.o
> > >> WARNING: modpost: missing MODULE_DESCRIPTION() in sound/soc/sof/snd-sof-utils.o
> > >> WARNING: modpost: missing MODULE_DESCRIPTION() in sound/soc/sof/snd-sof-acpi.o
> > >> WARNING: modpost: missing MODULE_DESCRIPTION() in sound/ac97_bus.o
> > >>
> > >> I'm not sure what the case now for ALSA, just FYI.
> > >
> > > Indeed there are lots of code that miss MODULE_DESCRIPTION().
> > ...
> > > There are too many stuff in sound/soc/sof/* and I leave them to SOF
> > > people (Cc'ed), while I'm going to submit the fix patches for the
> > > rest.
> >
> > ok, I'll take care of it. I wasn't aware this was a requirement.
>
> It wasn't, but now became so :)
Seems this is the result of fixing... the 2008 bug:
https://bugzilla.kernel.org/show_bug.cgi?id=10770
--
With Best Regards,
Andy Shevchenko
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH 0/9] ALSA: Use *-y instead of *-objs in Makefile
2024-05-10 14:15 ` Andy Shevchenko
@ 2024-05-23 21:00 ` Jeff Johnson
0 siblings, 0 replies; 19+ messages in thread
From: Jeff Johnson @ 2024-05-23 21:00 UTC (permalink / raw)
To: Andy Shevchenko, Takashi Iwai
Cc: Pierre-Louis Bossart, linux-sound, Liam Girdwood, Peter Ujfalusi,
Bard Liao, Ranjani Sridharan, Daniel Baluta, sound-open-firmware
On 5/10/24 07:15, Andy Shevchenko wrote:
> On Thu, May 09, 2024 at 08:28:32PM +0200, Takashi Iwai wrote:
>> On Thu, 09 May 2024 18:10:39 +0200,
>> Pierre-Louis Bossart wrote:
>>> On 5/8/24 04:02, Takashi Iwai wrote:
>>>> On Tue, 07 May 2024 22:53:46 +0200,
>>>> Andy Shevchenko wrote:
>>>>> On Tue, May 07, 2024 at 07:02:35PM +0300, Andy Shevchenko wrote:
>>>>>> On Tue, May 07, 2024 at 03:55:00PM +0200, Takashi Iwai wrote:
>
>>>>>>> this is a series of trivial cleanup patches for Makefile in sound/*
>>>>>>> (modulo ASoC -- which will be submitted later in a separate series).
>>>>>>>
>>>>>>> As Andy suggested in a patch review, *-objs suffix in Makefile is
>>>>>>> basically a mis-use nowadays for kernel driver modules. They should
>>>>>>> be replaced with *-y suffix instead. This is a result of systematic
>>>>>>> conversions, separated per directory.
>>>>>>
>>>>>> I briefly looked at this and since it's a mechanical conversion I don't see
>>>>>> any issues, so
>>>>>>
>>>>>> Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
>>>>>
>>>>> Btw, make W=1 nowadays enables modpost checks, which complain about absence of
>>>>> MODULE_DESCRIPTION().
>>>>>
>>>>> Example:
>>>>> WARNING: modpost: missing MODULE_DESCRIPTION() in sound/core/snd-pcm-dmaengine.o
>>>>> WARNING: modpost: missing MODULE_DESCRIPTION() in sound/soc/sof/intel/snd-sof-intel-atom.o
>>>>> WARNING: modpost: missing MODULE_DESCRIPTION() in sound/soc/sof/intel/snd-sof-acpi-intel-byt.o
>>>>> WARNING: modpost: missing MODULE_DESCRIPTION() in sound/soc/sof/intel/snd-sof-acpi-intel-bdw.o
>>>>> WARNING: modpost: missing MODULE_DESCRIPTION() in sound/soc/sof/snd-sof-utils.o
>>>>> WARNING: modpost: missing MODULE_DESCRIPTION() in sound/soc/sof/snd-sof-acpi.o
>>>>> WARNING: modpost: missing MODULE_DESCRIPTION() in sound/ac97_bus.o
>>>>>
>>>>> I'm not sure what the case now for ALSA, just FYI.
>>>>
>>>> Indeed there are lots of code that miss MODULE_DESCRIPTION().
>>> ...
>>>> There are too many stuff in sound/soc/sof/* and I leave them to SOF
>>>> people (Cc'ed), while I'm going to submit the fix patches for the
>>>> rest.
>>>
>>> ok, I'll take care of it. I wasn't aware this was a requirement.
>>
>> It wasn't, but now became so :)
>
> Seems this is the result of fixing... the 2008 bug:
> https://bugzilla.kernel.org/show_bug.cgi?id=10770
I've been slowly cleaning these tree-wide.
Will now remove sound/... from my "hit list" :)
^ permalink raw reply [flat|nested] 19+ messages in thread
end of thread, other threads:[~2024-05-23 21:01 UTC | newest]
Thread overview: 19+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-05-07 13:55 [PATCH 0/9] ALSA: Use *-y instead of *-objs in Makefile Takashi Iwai
2024-05-07 13:55 ` [PATCH 1/9] ALSA: core: " Takashi Iwai
2024-05-07 13:55 ` [PATCH 2/9] ALSA: pci: " Takashi Iwai
2024-05-07 13:55 ` [PATCH 3/9] ALSA: hda: " Takashi Iwai
2024-05-07 13:55 ` [PATCH 4/9] ALSA: isa: " Takashi Iwai
2024-05-07 13:55 ` [PATCH 5/9] ALSA: usb: " Takashi Iwai
2024-05-07 13:55 ` [PATCH 6/9] ALSA: drivers: " Takashi Iwai
2024-05-07 13:55 ` [PATCH 7/9] ALSA: firewire: " Takashi Iwai
2024-05-08 9:59 ` Takashi Sakamoto
2024-05-07 13:55 ` [PATCH 8/9] ALSA: aoa: " Takashi Iwai
2024-05-07 13:55 ` [PATCH 9/9] ALSA: misc: " Takashi Iwai
2024-05-07 14:34 ` [PATCH 0/9] ALSA: " Jaroslav Kysela
2024-05-07 16:02 ` Andy Shevchenko
2024-05-07 20:53 ` Andy Shevchenko
2024-05-08 9:02 ` Takashi Iwai
2024-05-09 16:10 ` Pierre-Louis Bossart
2024-05-09 18:28 ` Takashi Iwai
2024-05-10 14:15 ` Andy Shevchenko
2024-05-23 21:00 ` Jeff Johnson
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox