Skip to content

Commit a355e07

Browse files
committed
ALSA: usb: Use *-y instead of *-objs in Makefile
*-objs suffix is reserved rather for (user-space) host programs while usually *-y suffix is used for kernel drivers (although *-objs works for that purpose for now). Let's correct the old usages of *-objs in Makefiles. Signed-off-by: Takashi Iwai <tiwai@suse.de> Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Reviewed-by: Jaroslav Kysela <perex@perex.cz> Link: https://lore.kernel.org/r/20240507135513.14919-6-tiwai@suse.de
1 parent 2e7b8fd commit a355e07

5 files changed

Lines changed: 7 additions & 7 deletions

File tree

sound/usb/6fire/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-usb-6fire-objs += chip.o comm.o midi.o control.o firmware.o pcm.o
2+
snd-usb-6fire-y += chip.o comm.o midi.o control.o firmware.o pcm.o
33
obj-$(CONFIG_SND_USB_6FIRE) += snd-usb-6fire.o
44

sound/usb/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# Makefile for ALSA
44
#
55

6-
snd-usb-audio-objs := card.o \
6+
snd-usb-audio-y := card.o \
77
clock.o \
88
endpoint.o \
99
format.o \
@@ -25,7 +25,7 @@ snd-usb-audio-objs := card.o \
2525
snd-usb-audio-$(CONFIG_SND_USB_AUDIO_MIDI_V2) += midi2.o
2626
snd-usb-audio-$(CONFIG_SND_USB_AUDIO_USE_MEDIA_CONTROLLER) += media.o
2727

28-
snd-usbmidi-lib-objs := midi.o
28+
snd-usbmidi-lib-y := midi.o
2929

3030
# Toplevel Module Dependency
3131
obj-$(CONFIG_SND_USB_AUDIO) += snd-usb-audio.o snd-usbmidi-lib.o

sound/usb/hiface/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
# SPDX-License-Identifier: GPL-2.0-only
2-
snd-usb-hiface-objs := chip.o pcm.o
2+
snd-usb-hiface-y := chip.o pcm.o
33
obj-$(CONFIG_SND_USB_HIFACE) += snd-usb-hiface.o

sound/usb/misc/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
# SPDX-License-Identifier: GPL-2.0-only
2-
snd-ua101-objs := ua101.o
2+
snd-ua101-y := ua101.o
33
obj-$(CONFIG_SND_USB_UA101) += snd-ua101.o

sound/usb/usx2y/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# SPDX-License-Identifier: GPL-2.0
2-
snd-usb-usx2y-objs := usbusx2y.o usX2Yhwdep.o usx2yhwdeppcm.o
3-
snd-usb-us122l-objs := us122l.o
2+
snd-usb-usx2y-y := usbusx2y.o usX2Yhwdep.o usx2yhwdeppcm.o
3+
snd-usb-us122l-y := us122l.o
44

55
obj-$(CONFIG_SND_USB_USX2Y) += snd-usb-usx2y.o
66
obj-$(CONFIG_SND_USB_US122L) += snd-usb-us122l.o

0 commit comments

Comments
 (0)