qcacld-3.0: Fix Datapath kernel checkpatch warnings in ol_txrx_peer_find.c

Fix Datapath kernel checkpatch warnings in ol_txrx_peer_find.c

Change-Id: Ie0416390bfd4c1f6a50c70747a9fc5b87daa7959
CRs-Fixed: 2032874
This commit is contained in:
Yun Park
2017-04-08 10:13:04 -07:00
committed by snandini
parent 863014df56
commit 512f3a145d

View File

@@ -46,12 +46,12 @@
/*=== misc. / utility function definitions ==================================*/ /*=== misc. / utility function definitions ==================================*/
static int ol_txrx_log2_ceil(unsigned value) static int ol_txrx_log2_ceil(unsigned int value)
{ {
/* need to switch to unsigned math so that negative values /* need to switch to unsigned math so that negative values
* will right-shift towards 0 instead of -1 * will right-shift towards 0 instead of -1
*/ */
unsigned tmp = value; unsigned int tmp = value;
int log2 = -1; int log2 = -1;
if (value == 0) { if (value == 0) {
@@ -122,11 +122,11 @@ static void ol_txrx_peer_find_hash_detach(struct ol_txrx_pdev_t *pdev)
qdf_mem_free(pdev->peer_hash.bins); qdf_mem_free(pdev->peer_hash.bins);
} }
static inline unsigned static inline unsigned int
ol_txrx_peer_find_hash_index(struct ol_txrx_pdev_t *pdev, ol_txrx_peer_find_hash_index(struct ol_txrx_pdev_t *pdev,
union ol_txrx_align_mac_addr_t *mac_addr) union ol_txrx_align_mac_addr_t *mac_addr)
{ {
unsigned index; unsigned int index;
index = index =
mac_addr->align2.bytes_ab ^ mac_addr->align2.bytes_ab ^
@@ -140,7 +140,7 @@ void
ol_txrx_peer_find_hash_add(struct ol_txrx_pdev_t *pdev, ol_txrx_peer_find_hash_add(struct ol_txrx_pdev_t *pdev,
struct ol_txrx_peer_t *peer) struct ol_txrx_peer_t *peer)
{ {
unsigned index; unsigned int index;
index = ol_txrx_peer_find_hash_index(pdev, &peer->mac_addr); index = ol_txrx_peer_find_hash_index(pdev, &peer->mac_addr);
qdf_spin_lock_bh(&pdev->peer_ref_mutex); qdf_spin_lock_bh(&pdev->peer_ref_mutex);
@@ -162,7 +162,7 @@ struct ol_txrx_peer_t *ol_txrx_peer_vdev_find_hash(struct ol_txrx_pdev_t *pdev,
uint8_t check_valid) uint8_t check_valid)
{ {
union ol_txrx_align_mac_addr_t local_mac_addr_aligned, *mac_addr; union ol_txrx_align_mac_addr_t local_mac_addr_aligned, *mac_addr;
unsigned index; unsigned int index;
struct ol_txrx_peer_t *peer; struct ol_txrx_peer_t *peer;
if (mac_addr_is_aligned) { if (mac_addr_is_aligned) {
@@ -178,8 +178,10 @@ struct ol_txrx_peer_t *ol_txrx_peer_vdev_find_hash(struct ol_txrx_pdev_t *pdev,
if (ol_txrx_peer_find_mac_addr_cmp(mac_addr, &peer->mac_addr) == if (ol_txrx_peer_find_mac_addr_cmp(mac_addr, &peer->mac_addr) ==
0 && (check_valid == 0 || peer->valid) 0 && (check_valid == 0 || peer->valid)
&& peer->vdev == vdev) { && peer->vdev == vdev) {
/* found it - increment the ref count before releasing /*
the lock */ * found it - increment the ref count before releasing
* the lock
*/
qdf_atomic_inc(&peer->ref_cnt); qdf_atomic_inc(&peer->ref_cnt);
QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_INFO_HIGH, QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_INFO_HIGH,
"%s: peer %p peer->ref_cnt %d", "%s: peer %p peer->ref_cnt %d",
@@ -199,7 +201,7 @@ struct ol_txrx_peer_t *ol_txrx_peer_find_hash_find(struct ol_txrx_pdev_t *pdev,
uint8_t check_valid) uint8_t check_valid)
{ {
union ol_txrx_align_mac_addr_t local_mac_addr_aligned, *mac_addr; union ol_txrx_align_mac_addr_t local_mac_addr_aligned, *mac_addr;
unsigned index; unsigned int index;
struct ol_txrx_peer_t *peer; struct ol_txrx_peer_t *peer;
if (mac_addr_is_aligned) { if (mac_addr_is_aligned) {
@@ -214,8 +216,10 @@ struct ol_txrx_peer_t *ol_txrx_peer_find_hash_find(struct ol_txrx_pdev_t *pdev,
TAILQ_FOREACH(peer, &pdev->peer_hash.bins[index], hash_list_elem) { TAILQ_FOREACH(peer, &pdev->peer_hash.bins[index], hash_list_elem) {
if (ol_txrx_peer_find_mac_addr_cmp(mac_addr, &peer->mac_addr) == if (ol_txrx_peer_find_mac_addr_cmp(mac_addr, &peer->mac_addr) ==
0 && (check_valid == 0 || peer->valid)) { 0 && (check_valid == 0 || peer->valid)) {
/* found it - increment the ref count before /*
releasing the lock */ * found it - increment the ref count before
* releasing the lock
*/
qdf_atomic_inc(&peer->ref_cnt); qdf_atomic_inc(&peer->ref_cnt);
qdf_spin_unlock_bh(&pdev->peer_ref_mutex); qdf_spin_unlock_bh(&pdev->peer_ref_mutex);
QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_INFO_HIGH, QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_INFO_HIGH,
@@ -233,7 +237,7 @@ void
ol_txrx_peer_find_hash_remove(struct ol_txrx_pdev_t *pdev, ol_txrx_peer_find_hash_remove(struct ol_txrx_pdev_t *pdev,
struct ol_txrx_peer_t *peer) struct ol_txrx_peer_t *peer)
{ {
unsigned index; unsigned int index;
index = ol_txrx_peer_find_hash_index(pdev, &peer->mac_addr); index = ol_txrx_peer_find_hash_index(pdev, &peer->mac_addr);
/* /*
@@ -257,7 +261,7 @@ ol_txrx_peer_find_hash_remove(struct ol_txrx_pdev_t *pdev,
void ol_txrx_peer_find_hash_erase(struct ol_txrx_pdev_t *pdev) void ol_txrx_peer_find_hash_erase(struct ol_txrx_pdev_t *pdev)
{ {
unsigned i; unsigned int i;
/* /*
* Not really necessary to take peer_ref_mutex lock - by this point, * Not really necessary to take peer_ref_mutex lock - by this point,
* it's known that the pdev is no longer in use. * it's known that the pdev is no longer in use.
@@ -408,8 +412,6 @@ static inline void ol_txrx_peer_find_add_id(struct ol_txrx_pdev_t *pdev,
/* TBDXXX: assert for now */ /* TBDXXX: assert for now */
qdf_assert(0); qdf_assert(0);
} }
return;
} }
/*=== allocation / deallocation function definitions ========================*/ /*=== allocation / deallocation function definitions ========================*/
@@ -443,6 +445,7 @@ ol_rx_peer_map_handler(ol_txrx_pdev_handle pdev,
ol_txrx_peer_find_add_id(pdev, peer_mac_addr, peer_id); ol_txrx_peer_find_add_id(pdev, peer_mac_addr, peer_id);
if (!tx_ready) { if (!tx_ready) {
struct ol_txrx_peer_t *peer; struct ol_txrx_peer_t *peer;
peer = ol_txrx_peer_find_by_id(pdev, peer_id); peer = ol_txrx_peer_find_by_id(pdev, peer_id);
if (!peer) { if (!peer) {
/* ol_txrx_peer_detach called before peer map arrived*/ /* ol_txrx_peer_detach called before peer map arrived*/
@@ -450,6 +453,7 @@ ol_rx_peer_map_handler(ol_txrx_pdev_handle pdev,
} else { } else {
if (tx_ready) { if (tx_ready) {
int i; int i;
/* unpause all tx queues now, since the /* unpause all tx queues now, since the
* target is ready * target is ready
*/ */
@@ -465,7 +469,8 @@ ol_rx_peer_map_handler(ol_txrx_pdev_handle pdev,
/* keep non-mgmt tx queues paused until assoc /* keep non-mgmt tx queues paused until assoc
* is finished tx queues were paused in * is finished tx queues were paused in
* ol_txrx_peer_attach*/ * ol_txrx_peer_attach
*/
/* unpause tx mgmt queue */ /* unpause tx mgmt queue */
ol_txrx_peer_tid_unpause(peer, ol_txrx_peer_tid_unpause(peer,
HTT_TX_EXT_TID_MGMT); HTT_TX_EXT_TID_MGMT);
@@ -502,12 +507,10 @@ ol_rx_peer_map_handler(ol_txrx_pdev_handle pdev,
int tx_ready) int tx_ready)
{ {
ol_txrx_peer_find_add_id(pdev, peer_mac_addr, peer_id); ol_txrx_peer_find_add_id(pdev, peer_mac_addr, peer_id);
} }
void ol_txrx_peer_tx_ready_handler(ol_txrx_pdev_handle pdev, uint16_t peer_id) void ol_txrx_peer_tx_ready_handler(ol_txrx_pdev_handle pdev, uint16_t peer_id)
{ {
return;
} }
#endif #endif
@@ -694,6 +697,7 @@ void ol_txrx_peer_find_display(ol_txrx_pdev_handle pdev, int indent)
for (i = 0; i <= pdev->peer_hash.mask; i++) { for (i = 0; i <= pdev->peer_hash.mask; i++) {
if (!TAILQ_EMPTY(&pdev->peer_hash.bins[i])) { if (!TAILQ_EMPTY(&pdev->peer_hash.bins[i])) {
struct ol_txrx_peer_t *peer; struct ol_txrx_peer_t *peer;
TAILQ_FOREACH(peer, &pdev->peer_hash.bins[i], TAILQ_FOREACH(peer, &pdev->peer_hash.bins[i],
hash_list_elem) { hash_list_elem) {
QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE(QDF_MODULE_ID_TXRX,