net: intel: Use *-y instead of *-objs in Makefile
authorAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Fri, 7 Jun 2024 21:22:32 +0000 (14:22 -0700)
committerJakub Kicinski <kuba@kernel.org>
Tue, 11 Jun 2024 02:52:44 +0000 (19:52 -0700)
*-objs suffix is reserved rather for (user-space) host programs while
usually *-y suffix is used for kernel drivers (although *-objs works
for that purpose for now).

Let's correct the old usages of *-objs in Makefiles.

Reviewed-by: Aleksandr Loktionov <aleksandr.loktionov@intel.com>
Reviewed-by: Alexander Lobakin <aleksander.lobakin@intel.com>
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-by: Jacob Keller <jacob.e.keller@intel.com>
Tested-by: Pucha Himasekhar Reddy <himasekharx.reddy.pucha@intel.com>
Signed-off-by: Jacob Keller <jacob.e.keller@intel.com>
Link: https://lore.kernel.org/r/20240607-next-2024-06-03-intel-next-batch-v3-1-d1470cee3347@intel.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
drivers/net/ethernet/intel/e1000/Makefile
drivers/net/ethernet/intel/e1000e/Makefile
drivers/net/ethernet/intel/i40e/Makefile
drivers/net/ethernet/intel/iavf/Makefile
drivers/net/ethernet/intel/igb/Makefile
drivers/net/ethernet/intel/igbvf/Makefile
drivers/net/ethernet/intel/igc/Makefile
drivers/net/ethernet/intel/ixgbe/Makefile
drivers/net/ethernet/intel/ixgbevf/Makefile
drivers/net/ethernet/intel/libeth/Makefile
drivers/net/ethernet/intel/libie/Makefile

index 314c52d44b7c55dfcfd28a9a7c2fd26a95580d53..79491dec47e193115a484d3cb1512bb32f2a0194 100644 (file)
@@ -7,4 +7,4 @@
 
 obj-$(CONFIG_E1000) += e1000.o
 
-e1000-objs := e1000_main.o e1000_hw.o e1000_ethtool.o e1000_param.o
+e1000-y := e1000_main.o e1000_hw.o e1000_ethtool.o e1000_param.o
index 0baa15503c381cec82163a14748fff6491209680..18f22b6374d512a47d7f1481975fe88a9536f7a4 100644 (file)
@@ -10,7 +10,6 @@ subdir-ccflags-y += -I$(src)
 
 obj-$(CONFIG_E1000E) += e1000e.o
 
-e1000e-objs := 82571.o ich8lan.o 80003es2lan.o \
-              mac.o manage.o nvm.o phy.o \
-              param.o ethtool.o netdev.o ptp.o
-
+e1000e-y := 82571.o ich8lan.o 80003es2lan.o \
+           mac.o manage.o nvm.o phy.o \
+           param.o ethtool.o netdev.o ptp.o
index cad93f323bd5223d912580c1707b3c2fe65a10e0..9faa4339a76c35a40cbbe3ad6f69b4b89c3aa967 100644 (file)
@@ -10,7 +10,7 @@ subdir-ccflags-y += -I$(src)
 
 obj-$(CONFIG_I40E) += i40e.o
 
-i40e-objs := i40e_main.o \
+i40e-y := i40e_main.o \
        i40e_ethtool.o  \
        i40e_adminq.o   \
        i40e_common.o   \
index 2d154a4e2fd76938b71d1ba9700f33521a868ce8..356ac9faa5bf9de6c386b4828fdd32fae381ee50 100644 (file)
@@ -11,6 +11,5 @@ subdir-ccflags-y += -I$(src)
 
 obj-$(CONFIG_IAVF) += iavf.o
 
-iavf-objs := iavf_main.o iavf_ethtool.o iavf_virtchnl.o iavf_fdir.o \
-            iavf_adv_rss.o \
-            iavf_txrx.o iavf_common.o iavf_adminq.o
+iavf-y := iavf_main.o iavf_ethtool.o iavf_virtchnl.o iavf_fdir.o \
+         iavf_adv_rss.o iavf_txrx.o iavf_common.o iavf_adminq.o
index 394c1e0656b9ec2c2183cc50ac82e9b705b5ac7e..463c0d26b9d43cb9ca660f960269a7e659679888 100644 (file)
@@ -6,6 +6,6 @@
 
 obj-$(CONFIG_IGB) += igb.o
 
-igb-objs := igb_main.o igb_ethtool.o e1000_82575.o \
-           e1000_mac.o e1000_nvm.o e1000_phy.o e1000_mbx.o \
-           e1000_i210.o igb_ptp.o igb_hwmon.o
+igb-y := igb_main.o igb_ethtool.o e1000_82575.o \
+        e1000_mac.o e1000_nvm.o e1000_phy.o e1000_mbx.o \
+        e1000_i210.o igb_ptp.o igb_hwmon.o
index afd3e36eae75704a2a3b6144db0e4b50c8086bb1..902711d5e6916bc23d9a6915063890ffc2e63f3d 100644 (file)
@@ -6,8 +6,4 @@
 
 obj-$(CONFIG_IGBVF) += igbvf.o
 
-igbvf-objs := vf.o \
-              mbx.o \
-              ethtool.o \
-              netdev.o
-
+igbvf-y := vf.o mbx.o ethtool.o netdev.o
index ebffd3054285c20a1395204d0e0beb388a8269e3..efc5e7983dad9551490fba71bdcca15d646989f9 100644 (file)
@@ -6,7 +6,7 @@
 #
 
 obj-$(CONFIG_IGC) += igc.o
-igc-$(CONFIG_IGC_LEDS) += igc_leds.o
 
-igc-objs := igc_main.o igc_mac.o igc_i225.o igc_base.o igc_nvm.o igc_phy.o \
-igc_diag.o igc_ethtool.o igc_ptp.o igc_dump.o igc_tsn.o igc_xdp.o
+igc-y := igc_main.o igc_mac.o igc_i225.o igc_base.o igc_nvm.o igc_phy.o \
+        igc_diag.o igc_ethtool.o igc_ptp.o igc_dump.o igc_tsn.o igc_xdp.o
+igc-$(CONFIG_IGC_LEDS) += igc_leds.o
index 4fb0d9e3f2da21db5acf17dbf5b9c091502db442..965e5ce1b3267f289271a451acfe0d3353275385 100644 (file)
@@ -6,10 +6,10 @@
 
 obj-$(CONFIG_IXGBE) += ixgbe.o
 
-ixgbe-objs := ixgbe_main.o ixgbe_common.o ixgbe_ethtool.o \
-              ixgbe_82599.o ixgbe_82598.o ixgbe_phy.o ixgbe_sriov.o \
-              ixgbe_mbx.o ixgbe_x540.o ixgbe_x550.o ixgbe_lib.o ixgbe_ptp.o \
-              ixgbe_xsk.o
+ixgbe-y := ixgbe_main.o ixgbe_common.o ixgbe_ethtool.o \
+           ixgbe_82599.o ixgbe_82598.o ixgbe_phy.o ixgbe_sriov.o \
+           ixgbe_mbx.o ixgbe_x540.o ixgbe_x550.o ixgbe_lib.o ixgbe_ptp.o \
+           ixgbe_xsk.o
 
 ixgbe-$(CONFIG_IXGBE_DCB) +=  ixgbe_dcb.o ixgbe_dcb_82598.o \
                               ixgbe_dcb_82599.o ixgbe_dcb_nl.o
index 186a4bb24fdea58a483f161858333313c34373ae..01d3e892f3fa7b6f2ee68174ac978dc7f2b51c3e 100644 (file)
@@ -6,9 +6,5 @@
 
 obj-$(CONFIG_IXGBEVF) += ixgbevf.o
 
-ixgbevf-objs := vf.o \
-                mbx.o \
-                ethtool.o \
-                ixgbevf_main.o
+ixgbevf-y := vf.o mbx.o ethtool.o ixgbevf_main.o
 ixgbevf-$(CONFIG_IXGBEVF_IPSEC) += ipsec.o
-
index cb99203d1dd209fd78b7ccfdebde6d2e88b18722..52492b08113261dd1121a4427077f2ca8e797005 100644 (file)
@@ -3,4 +3,4 @@
 
 obj-$(CONFIG_LIBETH)           += libeth.o
 
-libeth-objs                    += rx.o
+libeth-y                       := rx.o
index bf42c5aeeeddabf23a5bb67f6b558b588969bb64..ffd27fab916a6d6b07dd2eb60de8c7d3ac0c84d8 100644 (file)
@@ -3,4 +3,4 @@
 
 obj-$(CONFIG_LIBIE)    += libie.o
 
-libie-objs             += rx.o
+libie-y                        := rx.o