mac80211: Deinline drv_get/set/reset_tsf()

With this .config: http://busybox.net/~vda/kernel_config_ALLYES_Os,
after deinlining these functions have sizes and callsite counts
as follows:

drv_get_tsf: 634 bytes, 6 calls
drv_set_tsf: 626 bytes, 2 calls
drv_reset_tsf: 617 bytes, 2 calls

Total size reduction is about 4.2 kbytes.

Signed-off-by: Denys Vlasenko <dvlasenk@redhat.com>
CC: Johannes Berg <johannes.berg@intel.com>
CC: John Linville <linville@tuxdriver.com>
CC: Michal Kazior <michal.kazior@tieto.com>
CC: linux-wireless@vger.kernel.org
CC: linux-kernel@vger.kernel.org
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

diff --git a/net/mac80211/driver-ops.c b/net/mac80211/driver-ops.c
index e1bb9e04e5beddd3bd58be34eec3db622efd222d..a1d54318f16c044c0554fa8df5dc996f591bbb0a 100644 (file)
--- a/net/mac80211/driver-ops.c
+++ b/net/mac80211/driver-ops.c
@@ -139,6 +139,52 @@ int drv_conf_tx(struct ieee80211_local *local,
        return ret;
 }
 
+u64 drv_get_tsf(struct ieee80211_local *local,
+               struct ieee80211_sub_if_data *sdata)
+{
+       u64 ret = -1ULL;
+
+       might_sleep();
+
+       if (!check_sdata_in_driver(sdata))
+               return ret;
+
+       trace_drv_get_tsf(local, sdata);
+       if (local->ops->get_tsf)
+               ret = local->ops->get_tsf(&local->hw, &sdata->vif);
+       trace_drv_return_u64(local, ret);
+       return ret;
+}
+
+void drv_set_tsf(struct ieee80211_local *local,
+                struct ieee80211_sub_if_data *sdata,
+                u64 tsf)
+{
+       might_sleep();
+
+       if (!check_sdata_in_driver(sdata))
+               return;
+
+       trace_drv_set_tsf(local, sdata, tsf);
+       if (local->ops->set_tsf)
+               local->ops->set_tsf(&local->hw, &sdata->vif, tsf);
+       trace_drv_return_void(local);
+}
+
+void drv_reset_tsf(struct ieee80211_local *local,
+                  struct ieee80211_sub_if_data *sdata)
+{
+       might_sleep();
+
+       if (!check_sdata_in_driver(sdata))
+               return;
+
+       trace_drv_reset_tsf(local, sdata);
+       if (local->ops->reset_tsf)
+               local->ops->reset_tsf(&local->hw, &sdata->vif);
+       trace_drv_return_void(local);
+}
+
 int drv_switch_vif_chanctx(struct ieee80211_local *local,
                           struct ieee80211_vif_chanctx_switch *vifs,
                           int n_vifs, enum ieee80211_chanctx_switch_mode mode)

diff --git a/net/mac80211/driver-ops.h b/net/mac80211/driver-ops.h
index 6411c3b9fe38d603215f2f3ddfc67b933e97bb8a..30987099eb8f43d67af933154599060f275ca88d 100644 (file)
--- a/net/mac80211/driver-ops.h
+++ b/net/mac80211/driver-ops.h
@@ -590,51 +590,13 @@ int drv_conf_tx(struct ieee80211_local *local,
                struct ieee80211_sub_if_data *sdata, u16 ac,
                const struct ieee80211_tx_queue_params *params);
 
-static inline u64 drv_get_tsf(struct ieee80211_local *local,
-                             struct ieee80211_sub_if_data *sdata)
-{
-       u64 ret = -1ULL;
-
-       might_sleep();
-
-       if (!check_sdata_in_driver(sdata))
-               return ret;
-
-       trace_drv_get_tsf(local, sdata);
-       if (local->ops->get_tsf)
-               ret = local->ops->get_tsf(&local->hw, &sdata->vif);
-       trace_drv_return_u64(local, ret);
-       return ret;
-}
-
-static inline void drv_set_tsf(struct ieee80211_local *local,
-                              struct ieee80211_sub_if_data *sdata,
-                              u64 tsf)
-{
-       might_sleep();
-
-       if (!check_sdata_in_driver(sdata))
-               return;
-
-       trace_drv_set_tsf(local, sdata, tsf);
-       if (local->ops->set_tsf)
-               local->ops->set_tsf(&local->hw, &sdata->vif, tsf);
-       trace_drv_return_void(local);
-}
-
-static inline void drv_reset_tsf(struct ieee80211_local *local,
-                                struct ieee80211_sub_if_data *sdata)
-{
-       might_sleep();
-
-       if (!check_sdata_in_driver(sdata))
-               return;
-
-       trace_drv_reset_tsf(local, sdata);
-       if (local->ops->reset_tsf)
-               local->ops->reset_tsf(&local->hw, &sdata->vif);
-       trace_drv_return_void(local);
-}
+u64 drv_get_tsf(struct ieee80211_local *local,
+               struct ieee80211_sub_if_data *sdata);
+void drv_set_tsf(struct ieee80211_local *local,
+                struct ieee80211_sub_if_data *sdata,
+                u64 tsf);
+void drv_reset_tsf(struct ieee80211_local *local,
+                  struct ieee80211_sub_if_data *sdata);
 
 static inline int drv_tx_last_beacon(struct ieee80211_local *local)
 {