From 5e4e2ef774138958036cfe1dd7a907c7dd3cb1bb Mon Sep 17 00:00:00 2001 From: Shiva Kerdel Date: Sun, 12 Mar 2017 03:30:01 +0100 Subject: [PATCH] Staging: ks7010: ks_hostif.*: Use preferred 'u32' kernel type over 'uint32_t' Fix prefer kernel type 'u32' over 'uint32_t' checks. Signed-off-by: Shiva Kerdel Signed-off-by: Greg Kroah-Hartman --- drivers/staging/ks7010/ks_hostif.c | 18 +++++++++--------- drivers/staging/ks7010/ks_hostif.h | 30 +++++++++++++++--------------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/drivers/staging/ks7010/ks_hostif.c b/drivers/staging/ks7010/ks_hostif.c index 2cbb04305f33..b1fff903bce6 100644 --- a/drivers/staging/ks7010/ks_hostif.c +++ b/drivers/staging/ks7010/ks_hostif.c @@ -507,8 +507,8 @@ static void hostif_mib_get_confirm(struct ks_wlan_private *priv) { struct net_device *dev = priv->net_dev; - uint32_t mib_status; - uint32_t mib_attribute; + u32 mib_status; + u32 mib_attribute; u16 mib_val_size; u16 mib_val_type; @@ -587,8 +587,8 @@ void hostif_mib_get_confirm(struct ks_wlan_private *priv) static void hostif_mib_set_confirm(struct ks_wlan_private *priv) { - uint32_t mib_status; /* +04 MIB Status */ - uint32_t mib_attribute; /* +08 MIB attribute */ + u32 mib_status; /* +04 MIB Status */ + u32 mib_attribute; /* +08 MIB attribute */ DPRINTK(3, "\n"); @@ -1864,7 +1864,7 @@ void hostif_receive(struct ks_wlan_private *priv, unsigned char *p, static void hostif_sme_set_wep(struct ks_wlan_private *priv, int type) { - uint32_t val; + u32 val; switch (type) { case SME_WEP_INDEX_REQUEST: @@ -1918,7 +1918,7 @@ struct wpa_suite_t { } __packed; struct rsn_mode_t { - uint32_t rsn_mode; + u32 rsn_mode; u16 rsn_capability; } __packed; @@ -1927,7 +1927,7 @@ void hostif_sme_set_rsn(struct ks_wlan_private *priv, int type) { struct wpa_suite_t wpa_suite; struct rsn_mode_t rsn_mode; - uint32_t val; + u32 val; memset(&wpa_suite, 0, sizeof(wpa_suite)); @@ -2323,7 +2323,7 @@ void hostif_sme_sleep_set(struct ks_wlan_private *priv) static void hostif_sme_set_key(struct ks_wlan_private *priv, int type) { - uint32_t val; + u32 val; switch (type) { case SME_SET_FLAG: @@ -2413,7 +2413,7 @@ void hostif_sme_set_pmksa(struct ks_wlan_private *priv) static void hostif_sme_execute(struct ks_wlan_private *priv, int event) { - uint32_t val; + u32 val; DPRINTK(3, "event=%d\n", event); switch (event) { diff --git a/drivers/staging/ks7010/ks_hostif.h b/drivers/staging/ks7010/ks_hostif.h index 5b2120293967..02b483afff5a 100644 --- a/drivers/staging/ks7010/ks_hostif.h +++ b/drivers/staging/ks7010/ks_hostif.h @@ -143,7 +143,7 @@ struct channel_list_t { struct hostif_mib_get_request_t { struct hostif_hdr header; - uint32_t mib_attribute; + u32 mib_attribute; } __packed; struct hostif_mib_value_t { @@ -159,36 +159,36 @@ struct hostif_mib_value_t { struct hostif_mib_get_confirm_t { struct hostif_hdr header; - uint32_t mib_status; + u32 mib_status; #define MIB_SUCCESS 0 #define MIB_INVALID 1 #define MIB_READ_ONLY 2 #define MIB_WRITE_ONLY 3 - uint32_t mib_attribute; + u32 mib_attribute; struct hostif_mib_value_t mib_value; } __packed; struct hostif_mib_set_request_t { struct hostif_hdr header; - uint32_t mib_attribute; + u32 mib_attribute; struct hostif_mib_value_t mib_value; } __packed; struct hostif_mib_set_confirm_t { struct hostif_hdr header; - uint32_t mib_status; - uint32_t mib_attribute; + u32 mib_status; + u32 mib_attribute; } __packed; struct hostif_power_mngmt_request_t { struct hostif_hdr header; - uint32_t mode; + u32 mode; #define POWER_ACTIVE 1 #define POWER_SAVE 2 - uint32_t wake_up; + u32 wake_up; #define SLEEP_FALSE 0 #define SLEEP_TRUE 1 /* not used */ - uint32_t receiveDTIMs; + u32 receiveDTIMs; #define DTIM_FALSE 0 #define DTIM_TRUE 1 } __packed; @@ -480,8 +480,8 @@ struct hostif_bss_scan_request_t { #define ACTIVE_SCAN 0 #define PASSIVE_SCAN 1 u8 pad[3]; - uint32_t ch_time_min; - uint32_t ch_time_max; + u32 ch_time_min; + u32 ch_time_max; struct channel_list_t channel_list; struct ssid_t ssid; } __packed; @@ -506,10 +506,10 @@ struct hostif_phy_information_confirm_t { u8 sq; u8 noise; u8 link_speed; - uint32_t tx_frame; - uint32_t rx_frame; - uint32_t tx_error; - uint32_t rx_error; + u32 tx_frame; + u32 rx_frame; + u32 tx_error; + u32 rx_error; } __packed; /* sleep mode */ -- 2.11.0