Skip to content

Commit fdd51b3

Browse files
committed
ALSA: firewire: 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. Cc: Takashi Sakamoto <o-takashi@sakamocchi.jp> Signed-off-by: Takashi Iwai <tiwai@suse.de> Reviewed-by: Takashi Sakamoto <o-takashi@sakamocchi.jp> Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Reviewed-by: Jaroslav Kysela <perex@perex.cz> Link: https://lore.kernel.org/r/20240507135513.14919-8-tiwai@suse.de
1 parent 4d25612 commit fdd51b3

9 files changed

Lines changed: 10 additions & 10 deletions

File tree

sound/firewire/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
# To find a header included by define_trace.h.
33
CFLAGS_amdtp-stream.o := -I$(src)
44

5-
snd-firewire-lib-objs := lib.o iso-resources.o packets-buffer.o \
5+
snd-firewire-lib-y := lib.o iso-resources.o packets-buffer.o \
66
fcp.o cmp.o amdtp-stream.o amdtp-am824.o
7-
snd-isight-objs := isight.o
7+
snd-isight-y := isight.o
88

99
obj-$(CONFIG_SND_FIREWIRE_LIB) += snd-firewire-lib.o
1010
obj-$(CONFIG_SND_DICE) += dice/

sound/firewire/bebob/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# SPDX-License-Identifier: GPL-2.0
2-
snd-bebob-objs := bebob_command.o bebob_stream.o bebob_proc.o bebob_midi.o \
2+
snd-bebob-y := bebob_command.o bebob_stream.o bebob_proc.o bebob_midi.o \
33
bebob_pcm.o bebob_hwdep.o bebob_terratec.o \
44
bebob_yamaha_terratec.o bebob_focusrite.o bebob_maudio.o \
55
bebob.o

sound/firewire/dice/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# SPDX-License-Identifier: GPL-2.0-only
2-
snd-dice-objs := dice-transaction.o dice-stream.o dice-proc.o dice-midi.o \
2+
snd-dice-y := dice-transaction.o dice-stream.o dice-proc.o dice-midi.o \
33
dice-pcm.o dice-hwdep.o dice.o dice-tcelectronic.o \
44
dice-alesis.o dice-extension.o dice-mytek.o dice-presonus.o \
55
dice-harman.o dice-focusrite.o dice-weiss.o

sound/firewire/digi00x/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# SPDX-License-Identifier: GPL-2.0-only
2-
snd-firewire-digi00x-objs := amdtp-dot.o digi00x-stream.o digi00x-proc.o \
2+
snd-firewire-digi00x-y := amdtp-dot.o digi00x-stream.o digi00x-proc.o \
33
digi00x-pcm.o digi00x-hwdep.o \
44
digi00x-transaction.o digi00x-midi.o digi00x.o
55
obj-$(CONFIG_SND_FIREWIRE_DIGI00X) += snd-firewire-digi00x.o

sound/firewire/fireface/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# SPDX-License-Identifier: GPL-2.0-only
2-
snd-fireface-objs := ff.o ff-transaction.o ff-midi.o ff-proc.o amdtp-ff.o \
2+
snd-fireface-y := ff.o ff-transaction.o ff-midi.o ff-proc.o amdtp-ff.o \
33
ff-stream.o ff-pcm.o ff-hwdep.o ff-protocol-former.o \
44
ff-protocol-latter.o
55
obj-$(CONFIG_SND_FIREFACE) += snd-fireface.o

sound/firewire/fireworks/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# SPDX-License-Identifier: GPL-2.0-only
2-
snd-fireworks-objs := fireworks_transaction.o fireworks_command.o \
2+
snd-fireworks-y := fireworks_transaction.o fireworks_command.o \
33
fireworks_stream.o fireworks_proc.o fireworks_midi.o \
44
fireworks_pcm.o fireworks_hwdep.o fireworks.o
55
obj-$(CONFIG_SND_FIREWORKS) += snd-fireworks.o

sound/firewire/motu/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# SPDX-License-Identifier: GPL-2.0
22
CFLAGS_amdtp-motu.o := -I$(src)
33

4-
snd-firewire-motu-objs := motu.o amdtp-motu.o motu-transaction.o motu-stream.o \
4+
snd-firewire-motu-y := motu.o amdtp-motu.o motu-transaction.o motu-stream.o \
55
motu-proc.o motu-pcm.o motu-midi.o motu-hwdep.o \
66
motu-protocol-v2.o motu-protocol-v3.o \
77
motu-protocol-v1.o motu-register-dsp-message-parser.o \

sound/firewire/oxfw/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
# SPDX-License-Identifier: GPL-2.0-only
2-
snd-oxfw-objs := oxfw-command.o oxfw-stream.o oxfw-pcm.o oxfw-proc.o \
2+
snd-oxfw-y := oxfw-command.o oxfw-stream.o oxfw-pcm.o oxfw-proc.o \
33
oxfw-midi.o oxfw-hwdep.o oxfw-spkr.o oxfw-scs1x.o oxfw.o
44
obj-$(CONFIG_SND_OXFW) += snd-oxfw.o

sound/firewire/tascam/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# SPDX-License-Identifier: GPL-2.0-only
2-
snd-firewire-tascam-objs := tascam-proc.o amdtp-tascam.o tascam-stream.o \
2+
snd-firewire-tascam-y := tascam-proc.o amdtp-tascam.o tascam-stream.o \
33
tascam-pcm.o tascam-hwdep.o tascam-transaction.o \
44
tascam-midi.o tascam.o
55
obj-$(CONFIG_SND_FIREWIRE_TASCAM) += snd-firewire-tascam.o

0 commit comments

Comments
 (0)