Skip to content

Commit 188d804

Browse files
brooniebroonie
committed
ASoC: Use *-y instead of *-objs in Makefile
Merge series from Takashi Iwai <[email protected]>: 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/[email protected] 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.
2 parents d45ae45 + 476d0a2 commit 188d804

File tree

65 files changed

+787
-787
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

65 files changed

+787
-787
lines changed

‎sound/soc/Makefile‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
# SPDX-License-Identifier: GPL-2.0
2-
snd-soc-core-objs := soc-core.o soc-dapm.o soc-jack.o soc-utils.o soc-dai.o soc-component.o
3-
snd-soc-core-objs += soc-pcm.o soc-devres.o soc-ops.o soc-link.o soc-card.o
2+
snd-soc-core-y := soc-core.o soc-dapm.o soc-jack.o soc-utils.o soc-dai.o soc-component.o
3+
snd-soc-core-y += soc-pcm.o soc-devres.o soc-ops.o soc-link.o soc-card.o
44
snd-soc-core-$(CONFIG_SND_SOC_COMPRESS) += soc-compress.o
55

66
ifneq ($(CONFIG_SND_SOC_TOPOLOGY),)
7-
snd-soc-core-objs += soc-topology.o
7+
snd-soc-core-y += soc-topology.o
88
endif
99

1010
ifneq ($(CONFIG_SND_SOC_TOPOLOGY_KUNIT_TEST),)
11-
# snd-soc-test-objs := soc-topology-test.o
11+
# snd-soc-test-y := soc-topology-test.o
1212
obj-$(CONFIG_SND_SOC_TOPOLOGY_KUNIT_TEST) += soc-topology-test.o
1313
endif
1414

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

1919
ifneq ($(CONFIG_SND_SOC_UTILS_KUNIT_TEST),)
20-
# snd-soc-test-objs := soc-utils-test.o
20+
# snd-soc-test-y := soc-utils-test.o
2121
obj-$(CONFIG_SND_SOC_UTILS_KUNIT_TEST) += soc-utils-test.o
2222
endif
2323

2424
ifneq ($(CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM),)
25-
snd-soc-core-objs += soc-generic-dmaengine-pcm.o
25+
snd-soc-core-y += soc-generic-dmaengine-pcm.o
2626
endif
2727

2828
ifneq ($(CONFIG_SND_SOC_AC97_BUS),)
29-
snd-soc-core-objs += soc-ac97.o
29+
snd-soc-core-y += soc-ac97.o
3030
endif
3131

3232
ifneq ($(CONFIG_SND_SOC_ACPI),)
33-
snd-soc-acpi-objs := soc-acpi.o
33+
snd-soc-acpi-y := soc-acpi.o
3434
endif
3535

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

‎sound/soc/adi/Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# SPDX-License-Identifier: GPL-2.0-only
2-
snd-soc-adi-axi-i2s-objs := axi-i2s.o
3-
snd-soc-adi-axi-spdif-objs := axi-spdif.o
2+
snd-soc-adi-axi-i2s-y := axi-i2s.o
3+
snd-soc-adi-axi-spdif-y := axi-spdif.o
44

55
obj-$(CONFIG_SND_SOC_ADI_AXI_I2S) += snd-soc-adi-axi-i2s.o
66
obj-$(CONFIG_SND_SOC_ADI_AXI_SPDIF) += snd-soc-adi-axi-spdif.o

‎sound/soc/amd/Makefile‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
# SPDX-License-Identifier: GPL-2.0-only
2-
acp_audio_dma-objs := acp-pcm-dma.o
3-
snd-soc-acp-da7219mx98357-mach-objs := acp-da7219-max98357a.o
4-
snd-soc-acp-rt5645-mach-objs := acp-rt5645.o
5-
snd-soc-acp-es8336-mach-objs := acp-es8336.o
6-
snd-soc-acp-rt5682-mach-objs := acp3x-rt5682-max9836.o
7-
snd-acp-config-objs := acp-config.o
2+
acp_audio_dma-y := acp-pcm-dma.o
3+
snd-soc-acp-da7219mx98357-mach-y := acp-da7219-max98357a.o
4+
snd-soc-acp-rt5645-mach-y := acp-rt5645.o
5+
snd-soc-acp-es8336-mach-y := acp-es8336.o
6+
snd-soc-acp-rt5682-mach-y := acp3x-rt5682-max9836.o
7+
snd-acp-config-y := acp-config.o
88

99
obj-$(CONFIG_SND_SOC_AMD_ACP) += acp_audio_dma.o
1010
obj-$(CONFIG_SND_SOC_AMD_CZ_DA7219MX98357_MACH) += snd-soc-acp-da7219mx98357-mach.o

‎sound/soc/amd/acp/Makefile‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -5,23 +5,23 @@
55
# Copyright(c) 2021 Advanced Micro Devices, Inc. All rights reserved.
66

77
#common acp driver
8-
snd-acp-pcm-objs := acp-platform.o
9-
snd-acp-i2s-objs := acp-i2s.o
10-
snd-acp-pdm-objs := acp-pdm.o
11-
snd-acp-legacy-common-objs := acp-legacy-common.o
12-
snd-acp-pci-objs := acp-pci.o
13-
snd-amd-sdw-acpi-objs := amd-sdw-acpi.o
8+
snd-acp-pcm-y := acp-platform.o
9+
snd-acp-i2s-y := acp-i2s.o
10+
snd-acp-pdm-y := acp-pdm.o
11+
snd-acp-legacy-common-y := acp-legacy-common.o
12+
snd-acp-pci-y := acp-pci.o
13+
snd-amd-sdw-acpi-y := amd-sdw-acpi.o
1414

1515
#platform specific driver
16-
snd-acp-renoir-objs := acp-renoir.o
17-
snd-acp-rembrandt-objs := acp-rembrandt.o
18-
snd-acp63-objs := acp63.o
19-
snd-acp70-objs := acp70.o
16+
snd-acp-renoir-y := acp-renoir.o
17+
snd-acp-rembrandt-y := acp-rembrandt.o
18+
snd-acp63-y := acp63.o
19+
snd-acp70-y := acp70.o
2020

2121
#machine specific driver
22-
snd-acp-mach-objs := acp-mach-common.o
23-
snd-acp-legacy-mach-objs := acp-legacy-mach.o acp3x-es83xx/acp3x-es83xx.o
24-
snd-acp-sof-mach-objs := acp-sof-mach.o
22+
snd-acp-mach-y := acp-mach-common.o
23+
snd-acp-legacy-mach-y := acp-legacy-mach.o acp3x-es83xx/acp3x-es83xx.o
24+
snd-acp-sof-mach-y := acp-sof-mach.o
2525

2626
obj-$(CONFIG_SND_SOC_AMD_ACP_PCM) += snd-acp-pcm.o
2727
obj-$(CONFIG_SND_SOC_AMD_ACP_I2S) += snd-acp-i2s.o

‎sound/soc/amd/ps/Makefile‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
# SPDX-License-Identifier: GPL-2.0-only
22
# Pink Sardine platform Support
3-
snd-pci-ps-objs := pci-ps.o
4-
snd-ps-pdm-dma-objs := ps-pdm-dma.o
5-
snd-soc-ps-mach-objs := ps-mach.o
6-
snd-ps-sdw-dma-objs := ps-sdw-dma.o
3+
snd-pci-ps-y := pci-ps.o
4+
snd-ps-pdm-dma-y := ps-pdm-dma.o
5+
snd-soc-ps-mach-y := ps-mach.o
6+
snd-ps-sdw-dma-y := ps-sdw-dma.o
77

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

‎sound/soc/amd/raven/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
# Raven Ridge platform Support
3-
snd-pci-acp3x-objs := pci-acp3x.o
4-
snd-acp3x-pcm-dma-objs := acp3x-pcm-dma.o
5-
snd-acp3x-i2s-objs := acp3x-i2s.o
3+
snd-pci-acp3x-y := pci-acp3x.o
4+
snd-acp3x-pcm-dma-y := acp3x-pcm-dma.o
5+
snd-acp3x-i2s-y := acp3x-i2s.o
66
obj-$(CONFIG_SND_SOC_AMD_ACP3x) += snd-pci-acp3x.o
77
obj-$(CONFIG_SND_SOC_AMD_ACP3x) += snd-acp3x-pcm-dma.o
88
obj-$(CONFIG_SND_SOC_AMD_ACP3x) += snd-acp3x-i2s.o

‎sound/soc/amd/renoir/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
# Renoir platform Support
3-
snd-rn-pci-acp3x-objs := rn-pci-acp3x.o
4-
snd-acp3x-pdm-dma-objs := acp3x-pdm-dma.o
5-
snd-acp3x-rn-objs := acp3x-rn.o
3+
snd-rn-pci-acp3x-y := rn-pci-acp3x.o
4+
snd-acp3x-pdm-dma-y := acp3x-pdm-dma.o
5+
snd-acp3x-rn-y := acp3x-rn.o
66
obj-$(CONFIG_SND_SOC_AMD_RENOIR) += snd-rn-pci-acp3x.o
77
obj-$(CONFIG_SND_SOC_AMD_RENOIR) += snd-acp3x-pdm-dma.o
88
obj-$(CONFIG_SND_SOC_AMD_RENOIR_MACH) += snd-acp3x-rn.o

‎sound/soc/amd/rpl/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+
22
# RPL platform Support
3-
snd-rpl-pci-acp6x-objs := rpl-pci-acp6x.o
3+
snd-rpl-pci-acp6x-y := rpl-pci-acp6x.o
44

55
obj-$(CONFIG_SND_SOC_AMD_RPL_ACP6x) += snd-rpl-pci-acp6x.o

‎sound/soc/amd/vangogh/Makefile‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
# SPDX-License-Identifier: GPL-2.0+
22
# Vangogh platform Support
3-
snd-pci-acp5x-objs := pci-acp5x.o
4-
snd-acp5x-i2s-objs := acp5x-i2s.o
5-
snd-acp5x-pcm-dma-objs := acp5x-pcm-dma.o
6-
snd-soc-acp5x-mach-objs := acp5x-mach.o
3+
snd-pci-acp5x-y := pci-acp5x.o
4+
snd-acp5x-i2s-y := acp5x-i2s.o
5+
snd-acp5x-pcm-dma-y := acp5x-pcm-dma.o
6+
snd-soc-acp5x-mach-y := acp5x-mach.o
77

88
obj-$(CONFIG_SND_SOC_AMD_ACP5x) += snd-pci-acp5x.o
99
obj-$(CONFIG_SND_SOC_AMD_ACP5x) += snd-acp5x-i2s.o

‎sound/soc/amd/yc/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
# Yellow Carp platform Support
3-
snd-pci-acp6x-objs := pci-acp6x.o
4-
snd-acp6x-pdm-dma-objs := acp6x-pdm-dma.o
5-
snd-soc-acp6x-mach-objs := acp6x-mach.o
3+
snd-pci-acp6x-y := pci-acp6x.o
4+
snd-acp6x-pdm-dma-y := acp6x-pdm-dma.o
5+
snd-soc-acp6x-mach-y := acp6x-mach.o
66

77
obj-$(CONFIG_SND_SOC_AMD_ACP6x) += snd-pci-acp6x.o
88
obj-$(CONFIG_SND_SOC_AMD_ACP6x) += snd-acp6x-pdm-dma.o

0 commit comments

Comments
 (0)