Unverified Commit 188d804a authored by Mark Brown's avatar Mark Brown
Browse files

ASoC: Use *-y instead of *-objs in Makefile 

Merge series from Takashi Iwai <tiwai@suse.de>:

This is a series of trivial cleanup patches for ASoC to correct
the *-objs suffix in Makefile.  The other ALSA code has been covered
by a previous patch set
  https://lore.kernel.org/r/20240507135513.14919-1-tiwai@suse.de

As was suggested in a patch review, *-objs suffix in Makefile is
basically a wrong use nowadays for kernel driver modules.
They should be replaced with *-y suffix instead.
This is a result of systematic conversions, separated per directory.

Only lightly compile-tested.
parents d45ae45f 476d0a22

sound/soc/Makefile

+8 −8
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

snd-soc-core-objs := soc-core.o soc-dapm.o soc-jack.o soc-utils.o soc-dai.o soc-component.o

snd-soc-core-objs += soc-pcm.o soc-devres.o soc-ops.o soc-link.o soc-card.o

snd-soc-core-y := soc-core.o soc-dapm.o soc-jack.o soc-utils.o soc-dai.o soc-component.o

snd-soc-core-y += soc-pcm.o soc-devres.o soc-ops.o soc-link.o soc-card.o

snd-soc-core-$(CONFIG_SND_SOC_COMPRESS) += soc-compress.o



ifneq ($(CONFIG_SND_SOC_TOPOLOGY),)

snd-soc-core-objs += soc-topology.o

snd-soc-core-y += soc-topology.o

endif



ifneq ($(CONFIG_SND_SOC_TOPOLOGY_KUNIT_TEST),)

# snd-soc-test-objs := soc-topology-test.o

# snd-soc-test-y := soc-topology-test.o

obj-$(CONFIG_SND_SOC_TOPOLOGY_KUNIT_TEST) += soc-topology-test.o

endif
@@ -17,20 +17,20 @@ obj-$(CONFIG_SND_SOC_CARD_KUNIT_TEST) += soc-card-test.o 
endif



ifneq ($(CONFIG_SND_SOC_UTILS_KUNIT_TEST),)

# snd-soc-test-objs := soc-utils-test.o

# snd-soc-test-y := soc-utils-test.o

obj-$(CONFIG_SND_SOC_UTILS_KUNIT_TEST) += soc-utils-test.o

endif



ifneq ($(CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM),)

snd-soc-core-objs += soc-generic-dmaengine-pcm.o

snd-soc-core-y += soc-generic-dmaengine-pcm.o

endif



ifneq ($(CONFIG_SND_SOC_AC97_BUS),)

snd-soc-core-objs += soc-ac97.o

snd-soc-core-y += soc-ac97.o

endif



ifneq ($(CONFIG_SND_SOC_ACPI),)

snd-soc-acpi-objs := soc-acpi.o

snd-soc-acpi-y := soc-acpi.o

endif



obj-$(CONFIG_SND_SOC_ACPI) += snd-soc-acpi.o

sound/soc/adi/Makefile

+2 −2
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0-only

snd-soc-adi-axi-i2s-objs := axi-i2s.o

snd-soc-adi-axi-spdif-objs := axi-spdif.o

snd-soc-adi-axi-i2s-y := axi-i2s.o

snd-soc-adi-axi-spdif-y := axi-spdif.o



obj-$(CONFIG_SND_SOC_ADI_AXI_I2S) += snd-soc-adi-axi-i2s.o

obj-$(CONFIG_SND_SOC_ADI_AXI_SPDIF) += snd-soc-adi-axi-spdif.o

sound/soc/amd/Makefile

+6 −6
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0-only

acp_audio_dma-objs := acp-pcm-dma.o

snd-soc-acp-da7219mx98357-mach-objs := acp-da7219-max98357a.o

snd-soc-acp-rt5645-mach-objs := acp-rt5645.o

snd-soc-acp-es8336-mach-objs := acp-es8336.o

snd-soc-acp-rt5682-mach-objs := acp3x-rt5682-max9836.o

snd-acp-config-objs := acp-config.o

acp_audio_dma-y := acp-pcm-dma.o

snd-soc-acp-da7219mx98357-mach-y := acp-da7219-max98357a.o

snd-soc-acp-rt5645-mach-y := acp-rt5645.o

snd-soc-acp-es8336-mach-y := acp-es8336.o

snd-soc-acp-rt5682-mach-y := acp3x-rt5682-max9836.o

snd-acp-config-y := acp-config.o



obj-$(CONFIG_SND_SOC_AMD_ACP) += acp_audio_dma.o

obj-$(CONFIG_SND_SOC_AMD_CZ_DA7219MX98357_MACH) += snd-soc-acp-da7219mx98357-mach.o

sound/soc/amd/acp/Makefile

+13 −13
Original line number Diff line number Diff line
@@ -5,23 +5,23 @@ 
# Copyright(c) 2021 Advanced Micro Devices, Inc. All rights reserved.



#common acp driver

snd-acp-pcm-objs     := acp-platform.o

snd-acp-i2s-objs     := acp-i2s.o

snd-acp-pdm-objs     := acp-pdm.o

snd-acp-legacy-common-objs   := acp-legacy-common.o

snd-acp-pci-objs     := acp-pci.o

snd-amd-sdw-acpi-objs := amd-sdw-acpi.o

snd-acp-pcm-y     := acp-platform.o

snd-acp-i2s-y     := acp-i2s.o

snd-acp-pdm-y     := acp-pdm.o

snd-acp-legacy-common-y   := acp-legacy-common.o

snd-acp-pci-y     := acp-pci.o

snd-amd-sdw-acpi-y := amd-sdw-acpi.o



#platform specific driver

snd-acp-renoir-objs     := acp-renoir.o

snd-acp-rembrandt-objs  := acp-rembrandt.o

snd-acp63-objs := acp63.o

snd-acp70-objs := acp70.o

snd-acp-renoir-y     := acp-renoir.o

snd-acp-rembrandt-y  := acp-rembrandt.o

snd-acp63-y := acp63.o

snd-acp70-y := acp70.o



#machine specific driver

snd-acp-mach-objs     := acp-mach-common.o

snd-acp-legacy-mach-objs     := acp-legacy-mach.o acp3x-es83xx/acp3x-es83xx.o

snd-acp-sof-mach-objs     := acp-sof-mach.o

snd-acp-mach-y     := acp-mach-common.o

snd-acp-legacy-mach-y     := acp-legacy-mach.o acp3x-es83xx/acp3x-es83xx.o

snd-acp-sof-mach-y     := acp-sof-mach.o



obj-$(CONFIG_SND_SOC_AMD_ACP_PCM) += snd-acp-pcm.o

obj-$(CONFIG_SND_SOC_AMD_ACP_I2S) += snd-acp-i2s.o

sound/soc/amd/ps/Makefile

+4 −4
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0-only

# Pink Sardine platform Support

snd-pci-ps-objs := pci-ps.o

snd-ps-pdm-dma-objs := ps-pdm-dma.o

snd-soc-ps-mach-objs := ps-mach.o

snd-ps-sdw-dma-objs := ps-sdw-dma.o

snd-pci-ps-y := pci-ps.o

snd-ps-pdm-dma-y := ps-pdm-dma.o

snd-soc-ps-mach-y := ps-mach.o

snd-ps-sdw-dma-y := ps-sdw-dma.o



obj-$(CONFIG_SND_SOC_AMD_PS) += snd-pci-ps.o

obj-$(CONFIG_SND_SOC_AMD_PS) += snd-ps-pdm-dma.o