Skip to content

Commit 2e7b8fd

Browse files
committed
ALSA: isa: 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-5-tiwai@suse.de
1 parent b266939 commit 2e7b8fd

12 files changed

Lines changed: 41 additions & 41 deletions

File tree

sound/isa/Makefile

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@
44
# Copyright (c) 2001 by Jaroslav Kysela <perex@perex.cz>
55
#
66

7-
snd-adlib-objs := adlib.o
8-
snd-als100-objs := als100.o
9-
snd-azt2320-objs := azt2320.o
10-
snd-cmi8328-objs := cmi8328.o
11-
snd-cmi8330-objs := cmi8330.o
12-
snd-es18xx-objs := es18xx.o
13-
snd-opl3sa2-objs := opl3sa2.o
14-
snd-sc6000-objs := sc6000.o
15-
snd-sscape-objs := sscape.o
7+
snd-adlib-y := adlib.o
8+
snd-als100-y := als100.o
9+
snd-azt2320-y := azt2320.o
10+
snd-cmi8328-y := cmi8328.o
11+
snd-cmi8330-y := cmi8330.o
12+
snd-es18xx-y := es18xx.o
13+
snd-opl3sa2-y := opl3sa2.o
14+
snd-sc6000-y := sc6000.o
15+
snd-sscape-y := sscape.o
1616

1717
# Toplevel Module Dependency
1818
obj-$(CONFIG_SND_ADLIB) += snd-adlib.o

sound/isa/ad1816a/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# Copyright (c) 2001 by Jaroslav Kysela <perex@perex.cz>
55
#
66

7-
snd-ad1816a-objs := ad1816a.o ad1816a_lib.o
7+
snd-ad1816a-y := ad1816a.o ad1816a_lib.o
88

99
# Toplevel Module Dependency
1010
obj-$(CONFIG_SND_AD1816A) += snd-ad1816a.o

sound/isa/ad1848/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# Copyright (c) 2001 by Jaroslav Kysela <perex@perex.cz>
55
#
66

7-
snd-ad1848-objs := ad1848.o
7+
snd-ad1848-y := ad1848.o
88

99
# Toplevel Module Dependency
1010
obj-$(CONFIG_SND_AD1848) += snd-ad1848.o

sound/isa/cs423x/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
# Copyright (c) 2001 by Jaroslav Kysela <perex@perex.cz>
55
#
66

7-
snd-cs4231-objs := cs4231.o
8-
snd-cs4236-objs := cs4236.o cs4236_lib.o
7+
snd-cs4231-y := cs4231.o
8+
snd-cs4236-y := cs4236.o cs4236_lib.o
99

1010
# Toplevel Module Dependency
1111
obj-$(CONFIG_SND_CS4231) += snd-cs4231.o

sound/isa/es1688/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
# Copyright (c) 2001 by Jaroslav Kysela <perex@perex.cz>
55
#
66

7-
snd-es1688-lib-objs := es1688_lib.o
8-
snd-es1688-objs := es1688.o
7+
snd-es1688-lib-y := es1688_lib.o
8+
snd-es1688-y := es1688.o
99

1010
# Toplevel Module Dependency
1111
obj-$(CONFIG_SND_ES1688) += snd-es1688.o snd-es1688-lib.o

sound/isa/galaxy/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
# Copyright (c) 2001 by Jaroslav Kysela <perex@suse.cz>
55
#
66

7-
snd-azt1605-objs := azt1605.o
8-
snd-azt2316-objs := azt2316.o
7+
snd-azt1605-y := azt1605.o
8+
snd-azt2316-y := azt2316.o
99

1010
obj-$(CONFIG_SND_AZT1605) += snd-azt1605.o
1111
obj-$(CONFIG_SND_AZT2316) += snd-azt2316.o

sound/isa/gus/Makefile

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,18 @@
44
# Copyright (c) 2001 by Jaroslav Kysela <perex@perex.cz>
55
#
66

7-
snd-gus-lib-objs := gus_main.o \
7+
snd-gus-lib-y := gus_main.o \
88
gus_io.o gus_irq.o gus_timer.o \
99
gus_mem.o gus_mem_proc.o gus_dram.o gus_dma.o gus_volume.o \
1010
gus_pcm.o gus_mixer.o \
1111
gus_uart.o \
1212
gus_reset.o
1313

14-
snd-gusclassic-objs := gusclassic.o
15-
snd-gusextreme-objs := gusextreme.o
16-
snd-gusmax-objs := gusmax.o
17-
snd-interwave-objs := interwave.o
18-
snd-interwave-stb-objs := interwave-stb.o
14+
snd-gusclassic-y := gusclassic.o
15+
snd-gusextreme-y := gusextreme.o
16+
snd-gusmax-y := gusmax.o
17+
snd-interwave-y := interwave.o
18+
snd-interwave-stb-y := interwave-stb.o
1919

2020
# Toplevel Module Dependency
2121
obj-$(CONFIG_SND_GUSCLASSIC) += snd-gusclassic.o snd-gus-lib.o

sound/isa/msnd/Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
# SPDX-License-Identifier: GPL-2.0
22

3-
snd-msnd-lib-objs := msnd.o msnd_midi.o msnd_pinnacle_mixer.o
4-
snd-msnd-pinnacle-objs := msnd_pinnacle.o
5-
snd-msnd-classic-objs := msnd_classic.o
3+
snd-msnd-lib-y := msnd.o msnd_midi.o msnd_pinnacle_mixer.o
4+
snd-msnd-pinnacle-y := msnd_pinnacle.o
5+
snd-msnd-classic-y := msnd_classic.o
66

77
# Toplevel Module Dependency
88
obj-$(CONFIG_SND_MSND_PINNACLE) += snd-msnd-pinnacle.o snd-msnd-lib.o

sound/isa/opti9xx/Makefile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
# Copyright (c) 2001 by Jaroslav Kysela <perex@perex.cz>
55
#
66

7-
snd-opti92x-ad1848-objs := opti92x-ad1848.o
8-
snd-opti92x-cs4231-objs := opti92x-cs4231.o
9-
snd-opti93x-objs := opti93x.o
10-
snd-miro-objs := miro.o
7+
snd-opti92x-ad1848-y := opti92x-ad1848.o
8+
snd-opti92x-cs4231-y := opti92x-cs4231.o
9+
snd-opti93x-y := opti93x.o
10+
snd-miro-y := miro.o
1111

1212
# Toplevel Module Dependency
1313
obj-$(CONFIG_SND_OPTI92X_AD1848) += snd-opti92x-ad1848.o

sound/isa/sb/Makefile

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@
44
# Copyright (c) 2001 by Jaroslav Kysela <perex@perex.cz>
55
#
66

7-
snd-sb-common-objs := sb_common.o sb_mixer.o
8-
snd-sb8-dsp-objs := sb8_main.o sb8_midi.o
9-
snd-sb16-dsp-objs := sb16_main.o
10-
snd-sb16-csp-objs := sb16_csp.o
11-
snd-sb8-objs := sb8.o
12-
snd-sb16-objs := sb16.o
13-
snd-sbawe-objs := sbawe.o emu8000.o
14-
snd-emu8000-synth-objs := emu8000_synth.o emu8000_callback.o emu8000_patch.o emu8000_pcm.o
15-
snd-jazz16-objs := jazz16.o
7+
snd-sb-common-y := sb_common.o sb_mixer.o
8+
snd-sb8-dsp-y := sb8_main.o sb8_midi.o
9+
snd-sb16-dsp-y := sb16_main.o
10+
snd-sb16-csp-y := sb16_csp.o
11+
snd-sb8-y := sb8.o
12+
snd-sb16-y := sb16.o
13+
snd-sbawe-y := sbawe.o emu8000.o
14+
snd-emu8000-synth-y := emu8000_synth.o emu8000_callback.o emu8000_patch.o emu8000_pcm.o
15+
snd-jazz16-y := jazz16.o
1616

1717
# Toplevel Module Dependency
1818
obj-$(CONFIG_SND_SB_COMMON) += snd-sb-common.o

0 commit comments

Comments
 (0)