Skip to content

Commit 1f75c49

Browse files
tiwaitiwai
committed
ALSA: pci: 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-3-tiwai@suse.de
1 parent 3983f7b commit 1f75c49

22 files changed

Lines changed: 94 additions & 94 deletions

File tree

‎sound/pci/Makefile‎

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

7-
snd-ad1889-objs := ad1889.o
8-
snd-als300-objs := als300.o
9-
snd-als4000-objs := als4000.o
10-
snd-atiixp-objs := atiixp.o
11-
snd-atiixp-modem-objs := atiixp_modem.o
12-
snd-azt3328-objs := azt3328.o
13-
snd-bt87x-objs := bt87x.o
14-
snd-cmipci-objs := cmipci.o
15-
snd-cs4281-objs := cs4281.o
16-
snd-cs5530-objs := cs5530.o
17-
snd-ens1370-objs := ens1370.o ak4531_codec.o
18-
snd-ens1371-objs := ens1371.o
19-
snd-es1938-objs := es1938.o
20-
snd-es1968-objs := es1968.o
21-
snd-fm801-objs := fm801.o
22-
snd-intel8x0-objs := intel8x0.o
23-
snd-intel8x0m-objs := intel8x0m.o
24-
snd-maestro3-objs := maestro3.o
25-
snd-rme32-objs := rme32.o
26-
snd-rme96-objs := rme96.o
27-
snd-sis7019-objs := sis7019.o
28-
snd-sonicvibes-objs := sonicvibes.o
29-
snd-via82xx-objs := via82xx.o
30-
snd-via82xx-modem-objs := via82xx_modem.o
7+
snd-ad1889-y := ad1889.o
8+
snd-als300-y := als300.o
9+
snd-als4000-y := als4000.o
10+
snd-atiixp-y := atiixp.o
11+
snd-atiixp-modem-y := atiixp_modem.o
12+
snd-azt3328-y := azt3328.o
13+
snd-bt87x-y := bt87x.o
14+
snd-cmipci-y := cmipci.o
15+
snd-cs4281-y := cs4281.o
16+
snd-cs5530-y := cs5530.o
17+
snd-ens1370-y := ens1370.o ak4531_codec.o
18+
snd-ens1371-y := ens1371.o
19+
snd-es1938-y := es1938.o
20+
snd-es1968-y := es1968.o
21+
snd-fm801-y := fm801.o
22+
snd-intel8x0-y := intel8x0.o
23+
snd-intel8x0m-y := intel8x0m.o
24+
snd-maestro3-y := maestro3.o
25+
snd-rme32-y := rme32.o
26+
snd-rme96-y := rme96.o
27+
snd-sis7019-y := sis7019.o
28+
snd-sonicvibes-y := sonicvibes.o
29+
snd-via82xx-y := via82xx.o
30+
snd-via82xx-modem-y := via82xx_modem.o
3131

3232
# Toplevel Module Dependency
3333
obj-$(CONFIG_SND_AD1889) += snd-ad1889.o

‎sound/pci/ali5451/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-ali5451-objs := ali5451.o
7+
snd-ali5451-y := ali5451.o
88

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

‎sound/pci/asihpi/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-asihpi-objs := asihpi.o hpioctl.o hpimsginit.o\
2+
snd-asihpi-y := asihpi.o hpioctl.o hpimsginit.o\
33
hpicmn.o hpifunc.o hpidebug.o hpidspcd.o\
44
hpios.o hpi6000.o hpi6205.o hpimsgx.o
55

‎sound/pci/au88x0/Makefile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# SPDX-License-Identifier: GPL-2.0
2-
snd-au8810-objs := au8810.o
3-
snd-au8820-objs := au8820.o
4-
snd-au8830-objs := au8830.o
2+
snd-au8810-y := au8810.o
3+
snd-au8820-y := au8820.o
4+
snd-au8830-y := au8830.o
55

66
obj-$(CONFIG_SND_AU8810) += snd-au8810.o
77
obj-$(CONFIG_SND_AU8820) += snd-au8820.o

‎sound/pci/aw2/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-aw2-objs := aw2-alsa.o aw2-saa7146.o
2+
snd-aw2-y := aw2-alsa.o aw2-saa7146.o
33

44
obj-$(CONFIG_SND_AW2) += snd-aw2.o

‎sound/pci/ca0106/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-ca0106-objs := ca0106_main.o ca0106_mixer.o ca_midi.o
2+
snd-ca0106-y := ca0106_main.o ca0106_mixer.o ca_midi.o
33
snd-ca0106-$(CONFIG_SND_PROC_FS) += ca0106_proc.o
44

55
obj-$(CONFIG_SND_CA0106) += snd-ca0106.o

‎sound/pci/ctxfi/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-ctxfi-objs := xfi.o ctatc.o ctvmem.o ctpcm.o ctmixer.o ctresource.o \
2+
snd-ctxfi-y := xfi.o ctatc.o ctvmem.o ctpcm.o ctmixer.o ctresource.o \
33
ctsrc.o ctamixer.o ctdaio.o ctimap.o cthardware.o cttimer.o \
44
cthw20k2.o cthw20k1.o
55

‎sound/pci/echoaudio/Makefile‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,20 @@
44
# Copyright (c) 2003 by Giuliano Pochini <pochini@shiny.it>
55
#
66

7-
snd-darla20-objs := darla20.o
8-
snd-gina20-objs := gina20.o
9-
snd-layla20-objs := layla20.o
10-
snd-darla24-objs := darla24.o
11-
snd-gina24-objs := gina24.o
12-
snd-layla24-objs := layla24.o
13-
snd-mona-objs := mona.o
14-
snd-mia-objs := mia.o
15-
snd-echo3g-objs := echo3g.o
16-
snd-indigo-objs := indigo.o
17-
snd-indigoio-objs := indigoio.o
18-
snd-indigodj-objs := indigodj.o
19-
snd-indigoiox-objs := indigoiox.o
20-
snd-indigodjx-objs := indigodjx.o
7+
snd-darla20-y := darla20.o
8+
snd-gina20-y := gina20.o
9+
snd-layla20-y := layla20.o
10+
snd-darla24-y := darla24.o
11+
snd-gina24-y := gina24.o
12+
snd-layla24-y := layla24.o
13+
snd-mona-y := mona.o
14+
snd-mia-y := mia.o
15+
snd-echo3g-y := echo3g.o
16+
snd-indigo-y := indigo.o
17+
snd-indigoio-y := indigoio.o
18+
snd-indigodj-y := indigodj.o
19+
snd-indigoiox-y := indigoiox.o
20+
snd-indigodjx-y := indigodjx.o
2121

2222
obj-$(CONFIG_SND_DARLA20) += snd-darla20.o
2323
obj-$(CONFIG_SND_GINA20) += snd-gina20.o

‎sound/pci/emu10k1/Makefile‎

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

7-
snd-emu10k1-objs := emu10k1.o emu10k1_main.o \
7+
snd-emu10k1-y := emu10k1.o emu10k1_main.o \
88
irq.o memory.o voice.o emumpu401.o emupcm.o io.o \
99
emumixer.o emufx.o timer.o p16v.o
1010
snd-emu10k1-$(CONFIG_SND_PROC_FS) += emuproc.o
11-
snd-emu10k1-synth-objs := emu10k1_synth.o emu10k1_callback.o emu10k1_patch.o
12-
snd-emu10k1x-objs := emu10k1x.o
11+
snd-emu10k1-synth-y := emu10k1_synth.o emu10k1_callback.o emu10k1_patch.o
12+
snd-emu10k1x-y := emu10k1x.o
1313

1414
# Toplevel Module Dependency
1515
obj-$(CONFIG_SND_EMU10K1) += snd-emu10k1.o

‎sound/pci/hda/Makefile‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# SPDX-License-Identifier: GPL-2.0
2-
snd-hda-intel-objs := hda_intel.o
3-
snd-hda-tegra-objs := hda_tegra.o
2+
snd-hda-intel-y := hda_intel.o
3+
snd-hda-tegra-y := hda_tegra.o
44

55
snd-hda-codec-y := hda_bind.o hda_codec.o hda_jack.o hda_auto_parser.o hda_sysfs.o
66
snd-hda-codec-y += hda_controller.o
@@ -13,32 +13,32 @@ snd-hda-codec-$(CONFIG_SND_HDA_INPUT_BEEP) += hda_beep.o
1313
CFLAGS_hda_controller.o := -I$(src)
1414
CFLAGS_hda_intel.o := -I$(src)
1515

16-
snd-hda-codec-generic-objs := hda_generic.o
17-
snd-hda-codec-realtek-objs := patch_realtek.o
18-
snd-hda-codec-cmedia-objs := patch_cmedia.o
19-
snd-hda-codec-analog-objs := patch_analog.o
20-
snd-hda-codec-idt-objs := patch_sigmatel.o
21-
snd-hda-codec-si3054-objs := patch_si3054.o
22-
snd-hda-codec-cirrus-objs := patch_cirrus.o
23-
snd-hda-codec-cs8409-objs := patch_cs8409.o patch_cs8409-tables.o
24-
snd-hda-codec-ca0110-objs := patch_ca0110.o
25-
snd-hda-codec-ca0132-objs := patch_ca0132.o
26-
snd-hda-codec-conexant-objs := patch_conexant.o
27-
snd-hda-codec-via-objs := patch_via.o
28-
snd-hda-codec-hdmi-objs := patch_hdmi.o hda_eld.o
16+
snd-hda-codec-generic-y := hda_generic.o
17+
snd-hda-codec-realtek-y := patch_realtek.o
18+
snd-hda-codec-cmedia-y := patch_cmedia.o
19+
snd-hda-codec-analog-y := patch_analog.o
20+
snd-hda-codec-idt-y := patch_sigmatel.o
21+
snd-hda-codec-si3054-y := patch_si3054.o
22+
snd-hda-codec-cirrus-y := patch_cirrus.o
23+
snd-hda-codec-cs8409-y := patch_cs8409.o patch_cs8409-tables.o
24+
snd-hda-codec-ca0110-y := patch_ca0110.o
25+
snd-hda-codec-ca0132-y := patch_ca0132.o
26+
snd-hda-codec-conexant-y := patch_conexant.o
27+
snd-hda-codec-via-y := patch_via.o
28+
snd-hda-codec-hdmi-y := patch_hdmi.o hda_eld.o
2929

3030
# side codecs
31-
snd-hda-cirrus-scodec-objs := cirrus_scodec.o
32-
snd-hda-cirrus-scodec-test-objs := cirrus_scodec_test.o
33-
snd-hda-scodec-cs35l41-objs := cs35l41_hda.o cs35l41_hda_property.o
34-
snd-hda-scodec-cs35l41-i2c-objs := cs35l41_hda_i2c.o
35-
snd-hda-scodec-cs35l41-spi-objs := cs35l41_hda_spi.o
36-
snd-hda-scodec-cs35l56-objs := cs35l56_hda.o
37-
snd-hda-scodec-cs35l56-i2c-objs := cs35l56_hda_i2c.o
38-
snd-hda-scodec-cs35l56-spi-objs := cs35l56_hda_spi.o
39-
snd-hda-cs-dsp-ctls-objs := hda_cs_dsp_ctl.o
40-
snd-hda-scodec-component-objs := hda_component.o
41-
snd-hda-scodec-tas2781-i2c-objs := tas2781_hda_i2c.o
31+
snd-hda-cirrus-scodec-y := cirrus_scodec.o
32+
snd-hda-cirrus-scodec-test-y := cirrus_scodec_test.o
33+
snd-hda-scodec-cs35l41-y := cs35l41_hda.o cs35l41_hda_property.o
34+
snd-hda-scodec-cs35l41-i2c-y := cs35l41_hda_i2c.o
35+
snd-hda-scodec-cs35l41-spi-y := cs35l41_hda_spi.o
36+
snd-hda-scodec-cs35l56-y := cs35l56_hda.o
37+
snd-hda-scodec-cs35l56-i2c-y := cs35l56_hda_i2c.o
38+
snd-hda-scodec-cs35l56-spi-y := cs35l56_hda_spi.o
39+
snd-hda-cs-dsp-ctls-y := hda_cs_dsp_ctl.o
40+
snd-hda-scodec-component-y := hda_component.o
41+
snd-hda-scodec-tas2781-i2c-y := tas2781_hda_i2c.o
4242

4343
# common driver
4444
obj-$(CONFIG_SND_HDA) := snd-hda-codec.o

0 commit comments

Comments
 (0)