From 01d391d45701790be830e6af0a18fece388cc1f4 Mon Sep 17 00:00:00 2001 From: Quytelda Kahja Date: Fri, 30 Mar 2018 23:08:34 -0700 Subject: [PATCH] staging: ks7010: Remove trailing _t from 'struct local_ap_t'. The "_t" suffix is not needed for structure names in this driver, and is a reflection of an older typedef system that is no longer in place. Replace all occurences of 'struct local_ap_t' with 'struct local_ap'. Signed-off-by: Quytelda Kahja Signed-off-by: Greg Kroah-Hartman --- drivers/staging/ks7010/ks_hostif.c | 10 +++++----- drivers/staging/ks7010/ks_wlan.h | 6 +++--- drivers/staging/ks7010/ks_wlan_net.c | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/drivers/staging/ks7010/ks_hostif.c b/drivers/staging/ks7010/ks_hostif.c index 92865d1363c4..442f5e2b44e5 100644 --- a/drivers/staging/ks7010/ks_hostif.c +++ b/drivers/staging/ks7010/ks_hostif.c @@ -109,14 +109,14 @@ int ks_wlan_do_power_save(struct ks_wlan_private *priv) static int get_current_ap(struct ks_wlan_private *priv, struct link_ap_info *ap_info) { - struct local_ap_t *ap; + struct local_ap *ap; union iwreq_data wrqu; struct net_device *netdev = priv->net_dev; ap = &priv->current_ap; if (is_disconnect_status(priv->connect_status)) { - memset(ap, 0, sizeof(struct local_ap_t)); + memset(ap, 0, sizeof(struct local_ap)); return -EPERM; } @@ -224,12 +224,12 @@ static u8 read_ie(unsigned char *bp, u8 max, u8 *body) static int get_ap_information(struct ks_wlan_private *priv, struct ap_info *ap_info, - struct local_ap_t *ap) + struct local_ap *ap) { unsigned char *bp; int bsize, offset; - memset(ap, 0, sizeof(struct local_ap_t)); + memset(ap, 0, sizeof(struct local_ap)); /* bssid */ memcpy(ap->bssid, ap_info->bssid, ETH_ALEN); @@ -2359,7 +2359,7 @@ void hostif_sme_enqueue(struct ks_wlan_private *priv, unsigned short event) static inline void hostif_aplist_init(struct ks_wlan_private *priv) { - size_t size = LOCAL_APLIST_MAX * sizeof(struct local_ap_t); + size_t size = LOCAL_APLIST_MAX * sizeof(struct local_ap); priv->aplist.size = 0; memset(&priv->aplist.ap[0], 0, size); } diff --git a/drivers/staging/ks7010/ks_wlan.h b/drivers/staging/ks7010/ks_wlan.h index 30d81f9456b7..3104ff92c453 100644 --- a/drivers/staging/ks7010/ks_wlan.h +++ b/drivers/staging/ks7010/ks_wlan.h @@ -218,7 +218,7 @@ struct wps_ie { } __packed; #endif /* WPS */ -struct local_ap_t { +struct local_ap { u8 bssid[6]; u8 rssi; u8 sq; @@ -246,7 +246,7 @@ struct local_ap_t { #define LOCAL_CURRENT_AP LOCAL_APLIST_MAX struct local_aplist_t { int size; - struct local_ap_t ap[LOCAL_APLIST_MAX + 1]; + struct local_ap ap[LOCAL_APLIST_MAX + 1]; }; struct local_gain_t { @@ -424,7 +424,7 @@ struct ks_wlan_private { unsigned char eth_addr[ETH_ALEN]; struct local_aplist_t aplist; - struct local_ap_t current_ap; + struct local_ap current_ap; struct power_save_status_t psstatus; struct sleep_status_t sleepstatus; struct wpa_status_t wpa; diff --git a/drivers/staging/ks7010/ks_wlan_net.c b/drivers/staging/ks7010/ks_wlan_net.c index 533feef604a9..a4f10bec865f 100644 --- a/drivers/staging/ks7010/ks_wlan_net.c +++ b/drivers/staging/ks7010/ks_wlan_net.c @@ -1301,7 +1301,7 @@ static int ks_wlan_set_scan(struct net_device *dev, static inline char *ks_wlan_translate_scan(struct net_device *dev, struct iw_request_info *info, char *current_ev, char *end_buf, - struct local_ap_t *ap) + struct local_ap *ap) { /* struct ks_wlan_private *priv = (struct ks_wlan_private *)dev->priv; */ struct iw_event iwe; /* Temporary buffer */ -- 2.11.0