iwlwifi: remove object duplication in Makefile
diff mbox series

Message ID 20200106075439.20926-1-masahiroy@kernel.org
State New
Delegated to: Luca Coelho
Headers show
Series
  • iwlwifi: remove object duplication in Makefile
Related show

Commit Message

Masahiro Yamada Jan. 6, 2020, 7:54 a.m. UTC
The objects in $(iwlwifi-objs) $(iwlwifi-y) $(iwlwifi-m) are linked to
iwlwifi.ko .

This line adds $(iwlwifi-m) to iwlwifi-objs, so the objects from
$(iwlwifi-m) are listed twice as the dependency of the module.

It works because Kbuild trims the duplicated objects from linking,
but there is no good reason to have this line.

Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
---

 drivers/net/wireless/intel/iwlwifi/Makefile | 2 --
 1 file changed, 2 deletions(-)

Comments

Johannes Berg Jan. 6, 2020, 3:51 p.m. UTC | #1
On Mon, 2020-01-06 at 16:54 +0900, Masahiro Yamada wrote:
> The objects in $(iwlwifi-objs) $(iwlwifi-y) $(iwlwifi-m) are linked to
> iwlwifi.ko .
> 
> This line adds $(iwlwifi-m) to iwlwifi-objs, so the objects from
> $(iwlwifi-m) are listed twice as the dependency of the module.

Are you sure? We have

obj-$(CONFIG_IWLWIFI)   += iwlwifi.o

and then "iwlwifi-y += ...", but I was under the impression that
iwlwifi.o didn't really pick up iwlwifi-m automatically, that's not
something that you'd normally do, normally -m only makes sense to build
a module using "obj-m", just here we do it for the mvm sub level
stuff...

johannes
Masahiro Yamada Jan. 6, 2020, 5:11 p.m. UTC | #2
On Tue, Jan 7, 2020 at 12:51 AM Johannes Berg <johannes@sipsolutions.net> wrote:
>
> On Mon, 2020-01-06 at 16:54 +0900, Masahiro Yamada wrote:
> > The objects in $(iwlwifi-objs) $(iwlwifi-y) $(iwlwifi-m) are linked to
> > iwlwifi.ko .
> >
> > This line adds $(iwlwifi-m) to iwlwifi-objs, so the objects from
> > $(iwlwifi-m) are listed twice as the dependency of the module.
>
> Are you sure? We have
>
> obj-$(CONFIG_IWLWIFI)   += iwlwifi.o
>
> and then "iwlwifi-y += ...", but I was under the impression that
> iwlwifi.o didn't really pick up iwlwifi-m automatically, that's not
> something that you'd normally do, normally -m only makes sense to build
> a module using "obj-m", just here we do it for the mvm sub level
> stuff...
>
> johannes
>

I made a mistake.

iwlwifi-m is automatically handled since commit
cf4f21938e13ea1533ebdcb21c46f1d998a44ee8
but cfg/*.o objects are not liked to vmlinux
under the following combination:

CONFIG_IWLWIFI=y
CONFIG_IWLDVM=m
CONFIG_IWLMVM=m


Please ignore this patch.

Perhaps, I may come back to this patch,
but I need to change scripts/Makefile.lib beforehand.
Johannes Berg Jan. 6, 2020, 5:45 p.m. UTC | #3
On Tue, 2020-01-07 at 02:11 +0900, Masahiro Yamada wrote:

> iwlwifi-m is automatically handled since commit
> cf4f21938e13ea1533ebdcb21c46f1d998a44ee8
> but cfg/*.o objects are not liked to vmlinux
> under the following combination:
> 
> CONFIG_IWLWIFI=y
> CONFIG_IWLDVM=m
> CONFIG_IWLMVM=m

Right, that's what I thought.

> Perhaps, I may come back to this patch,
> but I need to change scripts/Makefile.lib beforehand.

It's a pretty special case, not really worth it IMHO...

johannes

Patch
diff mbox series

diff --git a/drivers/net/wireless/intel/iwlwifi/Makefile b/drivers/net/wireless/intel/iwlwifi/Makefile
index 0aae3fa4128c..a018d27a5410 100644
--- a/drivers/net/wireless/intel/iwlwifi/Makefile
+++ b/drivers/net/wireless/intel/iwlwifi/Makefile
@@ -19,8 +19,6 @@  iwlwifi-$(CONFIG_IWLMVM) += fw/paging.o fw/smem.o fw/init.o
 iwlwifi-$(CONFIG_ACPI) += fw/acpi.o
 iwlwifi-$(CONFIG_IWLWIFI_DEBUGFS) += fw/debugfs.o
 
-iwlwifi-objs += $(iwlwifi-m)
-
 iwlwifi-$(CONFIG_IWLWIFI_DEVICE_TRACING) += iwl-devtrace.o
 
 ccflags-y += -I$(src)