net: ipa: move configuration data files
cover net: ipa: move configuration data files
This series moves the "ipa_data-vX.Y.c" files into a subdirectory. The first patch adds a Makefile variable containing the list of supported IPA versions, and uses it to simplify the way these files are specified.
-Alex
Alex Elder (2):
net: ipa: list supported IPA versions in the Makefile
net: ipa: move configuration data files into a subdirectory
drivers/net/ipa/Makefile | 10 +++++++---
drivers/net/ipa/{ => data}/ipa_data-v3.1.c | 0
drivers/net/ipa/{ => data}/ipa_data-v3.5.1.c | 0
drivers/net/ipa/{ => data}/ipa_data-v4.11.c | 0
drivers/net/ipa/{ => data}/ipa_data-v4.2.c | 0
drivers/net/ipa/{ => data}/ipa_data-v4.5.c | 0
drivers/net/ipa/{ => data}/ipa_data-v4.9.c | 0
7 files changed, 7 insertions(+), 3 deletions(-)
rename drivers/net/ipa/{ => data}/ipa_data-v3.1.c (100%)
rename drivers/net/ipa/{ => data}/ipa_data-v3.5.1.c (100%)
rename drivers/net/ipa/{ => data}/ipa_data-v4.11.c (100%)
rename drivers/net/ipa/{ => data}/ipa_data-v4.2.c (100%)
rename drivers/net/ipa/{ => data}/ipa_data-v4.5.c (100%)
rename drivers/net/ipa/{ => data}/ipa_data-v4.9.c (100%)Signature · 1 line
2.34.1
PATCH 1/2 net: ipa: list supported IPA versions in the Makefile
Create a variable in the Makefile listing the IPA versions supported by the driver. Use that to create the list of configuration data object files used (rather than listing them all individually).
Add a SPDX license comment.
--- drivers/net/ipa/Makefile | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)
drivers/net/ipa/Makefile +7 -3
@@ -1,3 +1,9 @@ +# SPDX-License-Identifier: GPL-2.0 +# +# Makefile for the Qualcomm IPA driver. + +IPA_VERSIONS := 3.1 3.5.1 4.2 4.5 4.9 4.11 + obj-$(CONFIG_QCOM_IPA) += ipa.o ipa-y := ipa_main.o ipa_power.o ipa_reg.o ipa_mem.o \
@@ -7,6 +13,4 @@ ipa-y := ipa_main.o ipa_power.o ipa_reg.o ipa_mem.o \ ipa_resource.o ipa_qmi.o ipa_qmi_msg.o \ ipa_sysfs.o -ipa-y += ipa_data-v3.1.o ipa_data-v3.5.1.o \ - ipa_data-v4.2.o ipa_data-v4.5.o \ - ipa_data-v4.9.o ipa_data-v4.11.o +ipa-y += $(IPA_VERSIONS:%=ipa_data-v%.o)
Signature · 1 line
2.34.1
PATCH 2/2 net: ipa: move configuration data files into a subdirectory
In reply to Alex ElderReduce the clutter in the main IPA source directory by creating a new "data" subdirectory, and locating all of the configuration data files in there.
---
drivers/net/ipa/Makefile | 2 +-
drivers/net/ipa/{ => data}/ipa_data-v3.1.c | 0
drivers/net/ipa/{ => data}/ipa_data-v3.5.1.c | 0
drivers/net/ipa/{ => data}/ipa_data-v4.11.c | 0
drivers/net/ipa/{ => data}/ipa_data-v4.2.c | 0
drivers/net/ipa/{ => data}/ipa_data-v4.5.c | 0
drivers/net/ipa/{ => data}/ipa_data-v4.9.c | 0
7 files changed, 1 insertion(+), 1 deletion(-)
rename drivers/net/ipa/{ => data}/ipa_data-v3.1.c (100%)
rename drivers/net/ipa/{ => data}/ipa_data-v3.5.1.c (100%)
rename drivers/net/ipa/{ => data}/ipa_data-v4.11.c (100%)
rename drivers/net/ipa/{ => data}/ipa_data-v4.2.c (100%)
rename drivers/net/ipa/{ => data}/ipa_data-v4.5.c (100%)
rename drivers/net/ipa/{ => data}/ipa_data-v4.9.c (100%)drivers/net/ipa/Makefile +1 -1
@@ -13,4 +13,4 @@ ipa-y := ipa_main.o ipa_power.o ipa_reg.o ipa_mem.o \ ipa_resource.o ipa_qmi.o ipa_qmi_msg.o \ ipa_sysfs.o -ipa-y += $(IPA_VERSIONS:%=ipa_data-v%.o) +ipa-y += $(IPA_VERSIONS:%=data/ipa_data-v%.o)
drivers/net/ipa/data/ipa_data-v3.1.c renamed from drivers/net/ipa/ipa_data-v3.1.c +0 -0
drivers/net/ipa/data/ipa_data-v3.5.1.c renamed from drivers/net/ipa/ipa_data-v3.5.1.c +0 -0
drivers/net/ipa/data/ipa_data-v4.11.c renamed from drivers/net/ipa/ipa_data-v4.11.c +0 -0
drivers/net/ipa/data/ipa_data-v4.2.c renamed from drivers/net/ipa/ipa_data-v4.2.c +0 -0
drivers/net/ipa/data/ipa_data-v4.5.c renamed from drivers/net/ipa/ipa_data-v4.5.c +0 -0
drivers/net/ipa/data/ipa_data-v4.9.c renamed from drivers/net/ipa/ipa_data-v4.9.c +0 -0
Signature · 1 line
2.34.1
This series was applied to netdev/net-next.git (master) by Jakub Kicinski <[email protected]>:
Hello:
This series was applied to netdev/net-next.git (master) by Jakub Kicinski <[email protected]>:
Quoted 8 lines · On Tue, 19 Jul 2022 10:08:25 -0500 you wrote:
This series moves the "
ipa_data-vX.Y.c" files into a subdirectory. The first patch adds aMakefilevariable containing the list of supported IPA versions, and uses it to simplify the way these files are specified.-Alex
[...]
Here is the summary with links:
- [net-next,1/2] net: ipa: list supported IPA versions in the Makefile
https://git.kernel.org/netdev/net-next/c/ec2ea5e06c67 - [net-next,2/2] net: ipa: move configuration data files into a subdirectory https://git.kernel.org/netdev/net-next/c/2c7b9b936bdc
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html