From: Takashi Iwai <tiwai@suse.de>
To: linux-sound@vger.kernel.org
Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com>,
Takashi Iwai <tiwai@suse.de>
Subject: [PATCH 5/9] ALSA: usb: Use *-y instead of *-objs in Makefile
Date: Tue, 7 May 2024 15:55:05 +0200 [thread overview]
Message-ID: <20240507135513.14919-6-tiwai@suse.de> (raw)
In-Reply-To: <20240507135513.14919-1-tiwai@suse.de>
*-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
next prev parent reply other threads:[~2024-05-07 13:55 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
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 ` Takashi Iwai [this message]
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
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240507135513.14919-6-tiwai@suse.de \
--to=tiwai@suse.de \
--cc=andriy.shevchenko@linux.intel.com \
--cc=linux-sound@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.