Skip to contentSkip to conversation

staging: rtl8723bs: remove get_monotonic_boottime()

PATCH In review Arnd Bergmann 2 participants 3 messages Jun 18, 2018 – Jun 19, 2018 Staging

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 staging: rtl8723bs: remove get_monotonic_boottime()

get_monotonic_boottime() is deprecated because it uses the old 'timespec' structure. This replaces one of the last callers with a call to ktime_get_boottime, which also simplifies it a bit by avoiding a double conversion.

---
 drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)
drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c +1 -8
index 02178e25fbb8..73fc3a742f74 100644
@@ -233,13 +233,6 @@ static int rtw_ieee80211_channel_to_frequency(int chan, int band)
 	return 0; /* not supported */
 }
 
-static u64 rtw_get_systime_us(void)
-{
-	struct timespec ts;
-	get_monotonic_boottime(&ts);
-	return ((u64)ts.tv_sec*1000000) + ts.tv_nsec / 1000;
-}
-
 #define MAX_BSSINFO_LEN 1000
 struct cfg80211_bss *rtw_cfg80211_inform_bss(struct adapter *padapter, struct wlan_network *pnetwork)
 {
@@ -331,7 +324,7 @@ struct cfg80211_bss *rtw_cfg80211_inform_bss(struct adapter *padapter, struct wl
 
 	notify_channel = ieee80211_get_channel(wiphy, freq);
 
-	notify_timestamp = rtw_get_systime_us();
+	notify_timestamp = ktime_to_us(ktime_get_boottime());
 
 	notify_interval = le16_to_cpu(*(__le16 *)rtw_get_beacon_interval_from_ie(pnetwork->network.IEs));
 	notify_capability = le16_to_cpu(*(__le16 *)rtw_get_capability_from_ie(pnetwork->network.IEs));
Signature · 1 line
2.9.0
Reviewed-by on v1 1/1
#1 lore raw

I'm fairly sure this doesn't matter functionally (yet), but perhaps 'notify_timestamp' should be updated to an 's64' type since ktime_to_us() returns a signed type?

That note aside, I think this is good.

Quoted 6 lines · Arnd Bergmann

get_monotonic_boottime() is deprecated because it uses the old 'timespec' structure. This replaces one of the last callers with a call to ktime_get_boottime, which also simplifies it a bit by avoiding a double conversion.

Quoted 34 lines
---
 drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)
drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c +1 -9
index 02178e25fbb8..73fc3a742f74 100644
@@ -233,13 +233,6 @@ static int rtw_ieee80211_channel_to_frequency(int chan, int band)
 	return 0; /* not supported */
 }
 
-static u64 rtw_get_systime_us(void)
-{
-	struct timespec ts;
-	get_monotonic_boottime(&ts);
-	return ((u64)ts.tv_sec*1000000) + ts.tv_nsec / 1000;
-}
-
 #define MAX_BSSINFO_LEN 1000
 struct cfg80211_bss *rtw_cfg80211_inform_bss(struct adapter *padapter, struct wlan_network *pnetwork)
 {
@@ -331,7 +324,7 @@ struct cfg80211_bss *rtw_cfg80211_inform_bss(struct adapter *padapter, struct wl
 
 	notify_channel = ieee80211_get_channel(wiphy, freq);
 
-	notify_timestamp = rtw_get_systime_us();
+	notify_timestamp = ktime_to_us(ktime_get_boottime());
 
 	notify_interval = le16_to_cpu(*(__le16 *)rtw_get_beacon_interval_from_ie(pnetwork->network.IEs));
 	notify_capability = le16_to_cpu(*(__le16 *)rtw_get_capability_from_ie(pnetwork->network.IEs));
--

2.9.0

#2 lore raw
Quoted 3 lines · Quytelda Kahja

I'm fairly sure this doesn't matter functionally (yet), but perhaps 'notify_timestamp' should be updated to an 's64' type since ktime_to_us() returns a signed type?

I think it's fine either way, ktime_t is only signed to deal with differences between
times and the theoretical case of running with local time set to a date before 1970
(which I'm sure fails for a number of other reasons), but boottime is guaranteed to be positive as well as monotonically increasing, so an unsigned type is fine here.

Quoted 3 lines

That note aside, I think this is good.

Thanks for taking a look!

Arnd