Re: [PATCH net-next v2 1/9] of: net: move of_net under net/
From: Rob Herring <robh+dt@kernel.org>
Date: 2021-10-06 16:18:34
Also in:
linux-devicetree
On Wed, Oct 6, 2021 at 10:45 AM Jakub Kicinski [off-list ref] wrote:
quoted hunk ↗ jump to hunk
Rob suggests to move of_net.c from under drivers/of/ somewhere to the networking code. Suggested-by: Rob Herring <robh@kernel.org> Signed-off-by: Jakub Kicinski <kuba@kernel.org> --- v2: new patch --- drivers/of/Makefile | 1 - net/core/Makefile | 1 + {drivers/of => net/core}/of_net.c | 0 3 files changed, 1 insertion(+), 1 deletion(-) rename {drivers/of => net/core}/of_net.c (100%)diff --git a/drivers/of/Makefile b/drivers/of/Makefile index c13b982084a3..e0360a44306e 100644 --- a/drivers/of/Makefile +++ b/drivers/of/Makefile@@ -7,7 +7,6 @@ obj-$(CONFIG_OF_EARLY_FLATTREE) += fdt_address.o obj-$(CONFIG_OF_PROMTREE) += pdt.o obj-$(CONFIG_OF_ADDRESS) += address.o obj-$(CONFIG_OF_IRQ) += irq.o -obj-$(CONFIG_OF_NET) += of_net.o obj-$(CONFIG_OF_UNITTEST) += unittest.o obj-$(CONFIG_OF_RESERVED_MEM) += of_reserved_mem.o obj-$(CONFIG_OF_RESOLVE) += resolver.odiff --git a/net/core/Makefile b/net/core/Makefile index 35ced6201814..37b1befc39aa 100644 --- a/net/core/Makefile +++ b/net/core/Makefile@@ -36,3 +36,4 @@ obj-$(CONFIG_FAILOVER) += failover.o obj-$(CONFIG_NET_SOCK_MSG) += skmsg.o obj-$(CONFIG_BPF_SYSCALL) += sock_map.o obj-$(CONFIG_BPF_SYSCALL) += bpf_sk_storage.o +obj-$(CONFIG_OF_NET) += of_net.o
The OF_NET kconfig should move or disappear too. I imagine you can do just: obj-$(CONFIG_OF) += of_net.o
quoted hunk ↗ jump to hunk
diff --git a/drivers/of/of_net.c b/net/core/of_net.c similarity index 100% rename from drivers/of/of_net.c rename to net/core/of_net.c --2.31.1