Skip to content

Commit

Permalink
ALSA: pci: Use *-y instead of *-objs in Makefile
Browse files Browse the repository at this point in the history
*-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 <[email protected]>
Reviewed-by: Andy Shevchenko <[email protected]>
Reviewed-by: Jaroslav Kysela <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
  • Loading branch information
tiwai committed May 8, 2024
1 parent 3983f7b commit 1f75c49
Show file tree
Hide file tree
Showing 22 changed files with 94 additions and 94 deletions.
48 changes: 24 additions & 24 deletions sound/pci/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -4,30 +4,30 @@
# Copyright (c) 2001 by Jaroslav Kysela <[email protected]>
#

snd-ad1889-objs := ad1889.o
snd-als300-objs := als300.o
snd-als4000-objs := als4000.o
snd-atiixp-objs := atiixp.o
snd-atiixp-modem-objs := atiixp_modem.o
snd-azt3328-objs := azt3328.o
snd-bt87x-objs := bt87x.o
snd-cmipci-objs := cmipci.o
snd-cs4281-objs := cs4281.o
snd-cs5530-objs := cs5530.o
snd-ens1370-objs := ens1370.o ak4531_codec.o
snd-ens1371-objs := ens1371.o
snd-es1938-objs := es1938.o
snd-es1968-objs := es1968.o
snd-fm801-objs := fm801.o
snd-intel8x0-objs := intel8x0.o
snd-intel8x0m-objs := intel8x0m.o
snd-maestro3-objs := maestro3.o
snd-rme32-objs := rme32.o
snd-rme96-objs := rme96.o
snd-sis7019-objs := sis7019.o
snd-sonicvibes-objs := sonicvibes.o
snd-via82xx-objs := via82xx.o
snd-via82xx-modem-objs := via82xx_modem.o
snd-ad1889-y := ad1889.o
snd-als300-y := als300.o
snd-als4000-y := als4000.o
snd-atiixp-y := atiixp.o
snd-atiixp-modem-y := atiixp_modem.o
snd-azt3328-y := azt3328.o
snd-bt87x-y := bt87x.o
snd-cmipci-y := cmipci.o
snd-cs4281-y := cs4281.o
snd-cs5530-y := cs5530.o
snd-ens1370-y := ens1370.o ak4531_codec.o
snd-ens1371-y := ens1371.o
snd-es1938-y := es1938.o
snd-es1968-y := es1968.o
snd-fm801-y := fm801.o
snd-intel8x0-y := intel8x0.o
snd-intel8x0m-y := intel8x0m.o
snd-maestro3-y := maestro3.o
snd-rme32-y := rme32.o
snd-rme96-y := rme96.o
snd-sis7019-y := sis7019.o
snd-sonicvibes-y := sonicvibes.o
snd-via82xx-y := via82xx.o
snd-via82xx-modem-y := via82xx_modem.o

# Toplevel Module Dependency
obj-$(CONFIG_SND_AD1889) += snd-ad1889.o
Expand Down
2 changes: 1 addition & 1 deletion sound/pci/ali5451/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# Copyright (c) 2001 by Jaroslav Kysela <[email protected]>
#

snd-ali5451-objs := ali5451.o
snd-ali5451-y := ali5451.o

# Toplevel Module Dependency
obj-$(CONFIG_SND_ALI5451) += snd-ali5451.o
2 changes: 1 addition & 1 deletion sound/pci/asihpi/Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# SPDX-License-Identifier: GPL-2.0-only
snd-asihpi-objs := asihpi.o hpioctl.o hpimsginit.o\
snd-asihpi-y := asihpi.o hpioctl.o hpimsginit.o\
hpicmn.o hpifunc.o hpidebug.o hpidspcd.o\
hpios.o hpi6000.o hpi6205.o hpimsgx.o

Expand Down
6 changes: 3 additions & 3 deletions sound/pci/au88x0/Makefile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# SPDX-License-Identifier: GPL-2.0
snd-au8810-objs := au8810.o
snd-au8820-objs := au8820.o
snd-au8830-objs := au8830.o
snd-au8810-y := au8810.o
snd-au8820-y := au8820.o
snd-au8830-y := au8830.o

obj-$(CONFIG_SND_AU8810) += snd-au8810.o
obj-$(CONFIG_SND_AU8820) += snd-au8820.o
Expand Down
2 changes: 1 addition & 1 deletion sound/pci/aw2/Makefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# SPDX-License-Identifier: GPL-2.0-only
snd-aw2-objs := aw2-alsa.o aw2-saa7146.o
snd-aw2-y := aw2-alsa.o aw2-saa7146.o

obj-$(CONFIG_SND_AW2) += snd-aw2.o
2 changes: 1 addition & 1 deletion sound/pci/ca0106/Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# SPDX-License-Identifier: GPL-2.0-only
snd-ca0106-objs := ca0106_main.o ca0106_mixer.o ca_midi.o
snd-ca0106-y := ca0106_main.o ca0106_mixer.o ca_midi.o
snd-ca0106-$(CONFIG_SND_PROC_FS) += ca0106_proc.o

obj-$(CONFIG_SND_CA0106) += snd-ca0106.o
2 changes: 1 addition & 1 deletion sound/pci/ctxfi/Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# SPDX-License-Identifier: GPL-2.0-only
snd-ctxfi-objs := xfi.o ctatc.o ctvmem.o ctpcm.o ctmixer.o ctresource.o \
snd-ctxfi-y := xfi.o ctatc.o ctvmem.o ctpcm.o ctmixer.o ctresource.o \
ctsrc.o ctamixer.o ctdaio.o ctimap.o cthardware.o cttimer.o \
cthw20k2.o cthw20k1.o

Expand Down
28 changes: 14 additions & 14 deletions sound/pci/echoaudio/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -4,20 +4,20 @@
# Copyright (c) 2003 by Giuliano Pochini <[email protected]>
#

snd-darla20-objs := darla20.o
snd-gina20-objs := gina20.o
snd-layla20-objs := layla20.o
snd-darla24-objs := darla24.o
snd-gina24-objs := gina24.o
snd-layla24-objs := layla24.o
snd-mona-objs := mona.o
snd-mia-objs := mia.o
snd-echo3g-objs := echo3g.o
snd-indigo-objs := indigo.o
snd-indigoio-objs := indigoio.o
snd-indigodj-objs := indigodj.o
snd-indigoiox-objs := indigoiox.o
snd-indigodjx-objs := indigodjx.o
snd-darla20-y := darla20.o
snd-gina20-y := gina20.o
snd-layla20-y := layla20.o
snd-darla24-y := darla24.o
snd-gina24-y := gina24.o
snd-layla24-y := layla24.o
snd-mona-y := mona.o
snd-mia-y := mia.o
snd-echo3g-y := echo3g.o
snd-indigo-y := indigo.o
snd-indigoio-y := indigoio.o
snd-indigodj-y := indigodj.o
snd-indigoiox-y := indigoiox.o
snd-indigodjx-y := indigodjx.o

obj-$(CONFIG_SND_DARLA20) += snd-darla20.o
obj-$(CONFIG_SND_GINA20) += snd-gina20.o
Expand Down
6 changes: 3 additions & 3 deletions sound/pci/emu10k1/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@
# Copyright (c) 2001 by Jaroslav Kysela <[email protected]>
#

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

# Toplevel Module Dependency
obj-$(CONFIG_SND_EMU10K1) += snd-emu10k1.o
Expand Down
52 changes: 26 additions & 26 deletions sound/pci/hda/Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# SPDX-License-Identifier: GPL-2.0
snd-hda-intel-objs := hda_intel.o
snd-hda-tegra-objs := hda_tegra.o
snd-hda-intel-y := hda_intel.o
snd-hda-tegra-y := hda_tegra.o

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

snd-hda-codec-generic-objs := hda_generic.o
snd-hda-codec-realtek-objs := patch_realtek.o
snd-hda-codec-cmedia-objs := patch_cmedia.o
snd-hda-codec-analog-objs := patch_analog.o
snd-hda-codec-idt-objs := patch_sigmatel.o
snd-hda-codec-si3054-objs := patch_si3054.o
snd-hda-codec-cirrus-objs := patch_cirrus.o
snd-hda-codec-cs8409-objs := patch_cs8409.o patch_cs8409-tables.o
snd-hda-codec-ca0110-objs := patch_ca0110.o
snd-hda-codec-ca0132-objs := patch_ca0132.o
snd-hda-codec-conexant-objs := patch_conexant.o
snd-hda-codec-via-objs := patch_via.o
snd-hda-codec-hdmi-objs := patch_hdmi.o hda_eld.o
snd-hda-codec-generic-y := hda_generic.o
snd-hda-codec-realtek-y := patch_realtek.o
snd-hda-codec-cmedia-y := patch_cmedia.o
snd-hda-codec-analog-y := patch_analog.o
snd-hda-codec-idt-y := patch_sigmatel.o
snd-hda-codec-si3054-y := patch_si3054.o
snd-hda-codec-cirrus-y := patch_cirrus.o
snd-hda-codec-cs8409-y := patch_cs8409.o patch_cs8409-tables.o
snd-hda-codec-ca0110-y := patch_ca0110.o
snd-hda-codec-ca0132-y := patch_ca0132.o
snd-hda-codec-conexant-y := patch_conexant.o
snd-hda-codec-via-y := patch_via.o
snd-hda-codec-hdmi-y := patch_hdmi.o hda_eld.o

# side codecs
snd-hda-cirrus-scodec-objs := cirrus_scodec.o
snd-hda-cirrus-scodec-test-objs := cirrus_scodec_test.o
snd-hda-scodec-cs35l41-objs := cs35l41_hda.o cs35l41_hda_property.o
snd-hda-scodec-cs35l41-i2c-objs := cs35l41_hda_i2c.o
snd-hda-scodec-cs35l41-spi-objs := cs35l41_hda_spi.o
snd-hda-scodec-cs35l56-objs := cs35l56_hda.o
snd-hda-scodec-cs35l56-i2c-objs := cs35l56_hda_i2c.o
snd-hda-scodec-cs35l56-spi-objs := cs35l56_hda_spi.o
snd-hda-cs-dsp-ctls-objs := hda_cs_dsp_ctl.o
snd-hda-scodec-component-objs := hda_component.o
snd-hda-scodec-tas2781-i2c-objs := tas2781_hda_i2c.o
snd-hda-cirrus-scodec-y := cirrus_scodec.o
snd-hda-cirrus-scodec-test-y := cirrus_scodec_test.o
snd-hda-scodec-cs35l41-y := cs35l41_hda.o cs35l41_hda_property.o
snd-hda-scodec-cs35l41-i2c-y := cs35l41_hda_i2c.o
snd-hda-scodec-cs35l41-spi-y := cs35l41_hda_spi.o
snd-hda-scodec-cs35l56-y := cs35l56_hda.o
snd-hda-scodec-cs35l56-i2c-y := cs35l56_hda_i2c.o
snd-hda-scodec-cs35l56-spi-y := cs35l56_hda_spi.o
snd-hda-cs-dsp-ctls-y := hda_cs_dsp_ctl.o
snd-hda-scodec-component-y := hda_component.o
snd-hda-scodec-tas2781-i2c-y := tas2781_hda_i2c.o

# common driver
obj-$(CONFIG_SND_HDA) := snd-hda-codec.o
Expand Down
6 changes: 3 additions & 3 deletions sound/pci/ice1712/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
# Copyright (c) 2001 by Jaroslav Kysela <[email protected]>
#

snd-ice17xx-ak4xxx-objs := ak4xxx.o
snd-ice1712-objs := ice1712.o delta.o hoontech.o ews.o
snd-ice1724-objs := ice1724.o amp.o revo.o aureon.o vt1720_mobo.o pontis.o prodigy192.o prodigy_hifi.o juli.o phase.o wtm.o se.o maya44.o quartet.o psc724.o wm8766.o wm8776.o
snd-ice17xx-ak4xxx-y := ak4xxx.o
snd-ice1712-y := ice1712.o delta.o hoontech.o ews.o
snd-ice1724-y := ice1724.o amp.o revo.o aureon.o vt1720_mobo.o pontis.o prodigy192.o prodigy_hifi.o juli.o phase.o wtm.o se.o maya44.o quartet.o psc724.o wm8766.o wm8776.o

# Toplevel Module Dependency
obj-$(CONFIG_SND_ICE1712) += snd-ice1712.o snd-ice17xx-ak4xxx.o
Expand Down
2 changes: 1 addition & 1 deletion sound/pci/korg1212/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# Copyright (c) 2001 by Jaroslav Kysela <[email protected]>
#

snd-korg1212-objs := korg1212.o
snd-korg1212-y := korg1212.o

# Toplevel Module Dependency
obj-$(CONFIG_SND_KORG1212) += snd-korg1212.o
2 changes: 1 addition & 1 deletion sound/pci/lx6464es/Makefile
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# SPDX-License-Identifier: GPL-2.0-only
snd-lx6464es-objs := lx6464es.o lx_core.o
snd-lx6464es-y := lx6464es.o lx_core.o
obj-$(CONFIG_SND_LX6464ES) += snd-lx6464es.o
2 changes: 1 addition & 1 deletion sound/pci/mixart/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@
# Copyright (c) 2001 by Jaroslav Kysela <[email protected]>
#

snd-mixart-objs := mixart.o mixart_core.o mixart_hwdep.o mixart_mixer.o
snd-mixart-y := mixart.o mixart_core.o mixart_hwdep.o mixart_mixer.o

obj-$(CONFIG_SND_MIXART) += snd-mixart.o
2 changes: 1 addition & 1 deletion sound/pci/nm256/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# Copyright (c) 2001 by Jaroslav Kysela <[email protected]>
#

snd-nm256-objs := nm256.o
snd-nm256-y := nm256.o

# Toplevel Module Dependency
obj-$(CONFIG_SND_NM256) += snd-nm256.o
8 changes: 4 additions & 4 deletions sound/pci/oxygen/Makefile
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# SPDX-License-Identifier: GPL-2.0
snd-oxygen-lib-objs := oxygen_io.o oxygen_lib.o oxygen_mixer.o oxygen_pcm.o
snd-oxygen-objs := oxygen.o xonar_dg_mixer.o xonar_dg.o
snd-se6x-objs := se6x.o
snd-virtuoso-objs := virtuoso.o xonar_lib.o \
snd-oxygen-lib-y := oxygen_io.o oxygen_lib.o oxygen_mixer.o oxygen_pcm.o
snd-oxygen-y := oxygen.o xonar_dg_mixer.o xonar_dg.o
snd-se6x-y := se6x.o
snd-virtuoso-y := virtuoso.o xonar_lib.o \
xonar_pcm179x.o xonar_cs43xx.o xonar_wm87x6.o xonar_hdmi.o

obj-$(CONFIG_SND_OXYGEN_LIB) += snd-oxygen-lib.o
Expand Down
2 changes: 1 addition & 1 deletion sound/pci/pcxhr/Makefile
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# SPDX-License-Identifier: GPL-2.0-only
snd-pcxhr-objs := pcxhr.o pcxhr_hwdep.o pcxhr_mixer.o pcxhr_core.o pcxhr_mix22.o
snd-pcxhr-y := pcxhr.o pcxhr_hwdep.o pcxhr_mixer.o pcxhr_core.o pcxhr_mix22.o
obj-$(CONFIG_SND_PCXHR) += snd-pcxhr.o
2 changes: 1 addition & 1 deletion sound/pci/riptide/Makefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# SPDX-License-Identifier: GPL-2.0-only
snd-riptide-objs := riptide.o
snd-riptide-y := riptide.o

obj-$(CONFIG_SND_RIPTIDE) += snd-riptide.o
6 changes: 3 additions & 3 deletions sound/pci/rme9652/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
# Copyright (c) 2001 by Jaroslav Kysela <[email protected]>
#

snd-rme9652-objs := rme9652.o
snd-hdsp-objs := hdsp.o
snd-hdspm-objs := hdspm.o
snd-rme9652-y := rme9652.o
snd-hdsp-y := hdsp.o
snd-hdspm-y := hdspm.o

# Toplevel Module Dependency
obj-$(CONFIG_SND_RME9652) += snd-rme9652.o
Expand Down
2 changes: 1 addition & 1 deletion sound/pci/trident/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# Copyright (c) 2001 by Jaroslav Kysela <[email protected]>
#

snd-trident-objs := trident.o trident_main.o trident_memory.o
snd-trident-y := trident.o trident_main.o trident_memory.o

# Toplevel Module Dependency
obj-$(CONFIG_SND_TRIDENT) += snd-trident.o
2 changes: 1 addition & 1 deletion sound/pci/vx222/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@
# Copyright (c) 2001 by Jaroslav Kysela <[email protected]>
#

snd-vx222-objs := vx222.o vx222_ops.o
snd-vx222-y := vx222.o vx222_ops.o

obj-$(CONFIG_SND_VX222) += snd-vx222.o
2 changes: 1 addition & 1 deletion sound/pci/ymfpci/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# Copyright (c) 2001 by Jaroslav Kysela <[email protected]>
#

snd-ymfpci-objs := ymfpci.o ymfpci_main.o
snd-ymfpci-y := ymfpci.o ymfpci_main.o

# Toplevel Module Dependency
obj-$(CONFIG_SND_YMFPCI) += snd-ymfpci.o

0 comments on commit 1f75c49

Please sign in to comment.