From 9111a57ae0454d49f3e0b84219e76b370e181bc9 Mon Sep 17 00:00:00 2001 From: Mahesh Kumar Kalikot Veetil Date: Tue, 10 Oct 2017 16:11:11 -0700 Subject: [PATCH] qcacld-3.0: Fix code style issues Fix code style issues introduced by the change "Change-Id: I3934f2a18c796ed3b53175dcbe7efd7f4d1409b9" in HDD. Change-Id: Ib2c411017f1a838156a222d2e536fad15056daf0 CRs-Fixed: 2122828 --- core/hdd/src/wlan_hdd_cfg80211.c | 5 +++-- core/hdd/src/wlan_hdd_cfg80211.h | 2 +- core/hdd/src/wlan_hdd_driver_ops.c | 2 +- core/hdd/src/wlan_hdd_scan.c | 1 + 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/core/hdd/src/wlan_hdd_cfg80211.c b/core/hdd/src/wlan_hdd_cfg80211.c index 2835607ceff8..54c651729bd4 100644 --- a/core/hdd/src/wlan_hdd_cfg80211.c +++ b/core/hdd/src/wlan_hdd_cfg80211.c @@ -871,7 +871,7 @@ int wlan_hdd_send_avoid_freq_event(struct hdd_context *hdd_ctx, static enum qca_wlan_vendor_hang_reason hdd_convert_hang_reason(enum qdf_hang_reason reason) { - uint32_t ret_val; + u32 ret_val; switch (reason) { case QDF_RX_HASH_NO_ENTRY_FOUND: @@ -941,7 +941,7 @@ int wlan_hdd_send_hang_reason_event(struct hdd_context *hdd_ctx, hang_reason = hdd_convert_hang_reason(reason); if (nla_put_u32(vendor_event, QCA_WLAN_VENDOR_ATTR_HANG_REASON, - (uint32_t) hang_reason)) { + (uint32_t)hang_reason)) { hdd_err("QCA_WLAN_VENDOR_ATTR_HANG_REASON put fail"); kfree_skb(vendor_event); return -EINVAL; @@ -952,6 +952,7 @@ int wlan_hdd_send_hang_reason_event(struct hdd_context *hdd_ctx, EXIT(); return 0; } + #undef HANG_REASON_INDEX /** diff --git a/core/hdd/src/wlan_hdd_cfg80211.h b/core/hdd/src/wlan_hdd_cfg80211.h index d8573374ae0b..addd9e8c63f6 100644 --- a/core/hdd/src/wlan_hdd_cfg80211.h +++ b/core/hdd/src/wlan_hdd_cfg80211.h @@ -333,7 +333,7 @@ int wlan_hdd_send_avoid_freq_event(struct hdd_context *hdd_ctx, * * Return: 0 on success or failure reason */ -int wlan_hdd_send_hang_reason_event(struct hdd_context *pHddCtx, uint32_t reason); +int wlan_hdd_send_hang_reason_event(struct hdd_context *hdd_ctx, uint32_t reason); int wlan_hdd_send_avoid_freq_for_dnbs(struct hdd_context *hdd_ctx, uint8_t op_chan); diff --git a/core/hdd/src/wlan_hdd_driver_ops.c b/core/hdd/src/wlan_hdd_driver_ops.c index d55c1f39cb28..6a27ed2f96ec 100644 --- a/core/hdd/src/wlan_hdd_driver_ops.c +++ b/core/hdd/src/wlan_hdd_driver_ops.c @@ -501,7 +501,7 @@ static inline void hdd_wlan_ssr_shutdown_event(void) */ static void hdd_send_hang_reason(void) { - uint32_t reason = 0; + enum qdf_hang_reason reason = QDF_REASON_UNSPECIFIED; struct hdd_context *hdd_ctx = cds_get_context(QDF_MODULE_ID_HDD); if (wlan_hdd_validate_context(hdd_ctx)) diff --git a/core/hdd/src/wlan_hdd_scan.c b/core/hdd/src/wlan_hdd_scan.c index 4ab0e8d7294e..864e9b44aaae 100644 --- a/core/hdd/src/wlan_hdd_scan.c +++ b/core/hdd/src/wlan_hdd_scan.c @@ -883,6 +883,7 @@ free_mem: #endif } + #undef SCAN_FAILURE /**