qcacmn: Remove qdf_*_outline() APIs

Several qdf_*_outline() APIs exist which are straight aliases to their
regular qdf_*() counterparts. Remove them, and update any callers to use
the regular APIs instead.

Change-Id: Ibe6e9cced521b93061e89690ab817ceafe49a469
CRs-Fixed: 2408267
This commit is contained in:
Dustin Brown
2019-03-01 15:20:58 -08:00
committed by nshrivas
parent fbe297b129
commit b5b21cac42
6 changed files with 3 additions and 101 deletions

View File

@@ -969,7 +969,7 @@ static QDF_STATUS dp_tx_hw_enqueue(struct dp_soc *soc, struct dp_vdev *vdev,
void *hal_srng = soc->tcl_data_ring[ring_id].hal_srng;
hal_tx_desc_cached = (void *) cached_desc;
qdf_mem_zero_outline(hal_tx_desc_cached, HAL_TX_DESC_LEN_BYTES);
qdf_mem_zero(hal_tx_desc_cached, HAL_TX_DESC_LEN_BYTES);
if (tx_desc->flags & DP_TX_DESC_FLAG_FRAG) {
length = HAL_TX_EXT_DESC_WITH_META_DATA;

View File

@@ -1,5 +1,5 @@
/*
* Copyright (c) 2014-2018 The Linux Foundation. All rights reserved.
* Copyright (c) 2014-2019 The Linux Foundation. All rights reserved.
*
* Permission to use, copy, modify, and/or distribute this software for
* any purpose with or without fee is hereby granted, provided that the
@@ -298,8 +298,6 @@ static inline int qdf_spin_trylock_bh(qdf_spinlock_t *lock, const char *func)
}
#define qdf_spin_trylock_bh(lock) qdf_spin_trylock_bh(lock, __func__)
int qdf_spin_trylock_bh_outline(qdf_spinlock_t *lock);
/**
* qdf_spin_trylock() - spin trylock
* @lock: spinlock object
@@ -332,8 +330,6 @@ static inline void qdf_spin_lock_bh(qdf_spinlock_t *lock, const char *func)
#define qdf_spin_lock_bh(lock) qdf_spin_lock_bh(lock, __func__)
void qdf_spin_lock_bh_outline(qdf_spinlock_t *lock);
/**
* qdf_spin_unlock_bh() - unlocks the spinlock mutex in soft irq context
* @lock: spinlock object pointer
@@ -345,8 +341,6 @@ static inline void qdf_spin_unlock_bh(qdf_spinlock_t *lock)
__qdf_spin_unlock_bh(&lock->lock);
}
void qdf_spin_unlock_bh_outline(qdf_spinlock_t *lock);
/**
* qdf_spinlock_irq_exec - Execute the input function with spinlock held
* and interrupt disabled.

View File

@@ -311,8 +311,6 @@ void *qdf_aligned_mem_alloc_consistent_fl(
qdf_dma_addr_t *paddr_aligned, uint32_t ring_base_align,
const char *func, uint32_t line);
void *qdf_mem_alloc_outline(qdf_device_t osdev, qdf_size_t size);
void qdf_mem_set_io(void *ptr, uint32_t num_bytes, uint32_t value);
void qdf_mem_copy_toio(void *dst_addr, const void *src_addr,
@@ -393,10 +391,6 @@ void qdf_mem_move(void *dst_addr, const void *src_addr, uint32_t num_bytes);
*/
int qdf_mem_cmp(const void *left, const void *right, size_t size);
void qdf_mem_free_outline(void *buf);
void qdf_mem_zero_outline(void *buf, qdf_size_t size);
void qdf_ether_addr_copy(void *dst_addr, const void *src_addr);
/**

View File

@@ -677,39 +677,6 @@ QDF_STATUS qdf_mutex_destroy(qdf_mutex_t *lock)
}
qdf_export_symbol(qdf_mutex_destroy);
/**
* qdf_spin_trylock_bh_outline() - spin trylock bottomhalf
* @lock: spinlock object
* Return: nonzero if lock is acquired
*/
int qdf_spin_trylock_bh_outline(qdf_spinlock_t *lock)
{
return qdf_spin_trylock_bh(lock);
}
qdf_export_symbol(qdf_spin_trylock_bh_outline);
/**
* qdf_spin_lock_bh_outline() - locks the spinlock in soft irq context
* @lock: spinlock object pointer
* Return: none
*/
void qdf_spin_lock_bh_outline(qdf_spinlock_t *lock)
{
qdf_spin_lock_bh(lock);
}
qdf_export_symbol(qdf_spin_lock_bh_outline);
/**
* qdf_spin_unlock_bh_outline() - unlocks spinlock in soft irq context
* @lock: spinlock object pointer
* Return: none
*/
void qdf_spin_unlock_bh_outline(qdf_spinlock_t *lock)
{
qdf_spin_unlock_bh(lock);
}
qdf_export_symbol(qdf_spin_unlock_bh_outline);
#if QDF_LOCK_STATS_LIST
struct qdf_lock_cookie {
union {

View File

@@ -840,59 +840,6 @@ void __qdf_mempool_free(qdf_device_t osdev, __qdf_mempool_t pool, void *buf)
}
qdf_export_symbol(__qdf_mempool_free);
/**
* qdf_mem_alloc_outline() - allocation QDF memory
* @osdev: platform device object
* @size: Number of bytes of memory to allocate.
*
* This function will dynamicallly allocate the specified number of bytes of
* memory.
*
* Return:
* Upon successful allocate, returns a non-NULL pointer to the allocated
* memory. If this function is unable to allocate the amount of memory
* specified (for any reason) it returns NULL.
*/
void *
qdf_mem_alloc_outline(qdf_device_t osdev, size_t size)
{
return qdf_mem_malloc(size);
}
qdf_export_symbol(qdf_mem_alloc_outline);
/**
* qdf_mem_free_outline() - QDF memory free API
* @ptr: Pointer to the starting address of the memory to be free'd.
*
* This function will free the memory pointed to by 'ptr'. It also checks
* is memory is corrupted or getting double freed and panic.
*
* Return: none
*/
void
qdf_mem_free_outline(void *buf)
{
qdf_mem_free(buf);
}
qdf_export_symbol(qdf_mem_free_outline);
/**
* qdf_mem_zero_outline() - zero out memory
* @buf: pointer to memory that will be set to zero
* @size: number of bytes zero
*
* This function sets the memory location to all zeros, essentially clearing
* the memory.
*
* Return: none
*/
void
qdf_mem_zero_outline(void *buf, qdf_size_t size)
{
qdf_mem_zero(buf, size);
}
qdf_export_symbol(qdf_mem_zero_outline);
#ifdef CONFIG_WCNSS_MEM_PRE_ALLOC
/**
* qdf_mem_prealloc_get() - conditionally pre-allocate memory

View File

@@ -51,7 +51,7 @@ QDF_STATUS init_deinit_chainmask_table_alloc(
ser_ext_par->chainmask_table[i].num_valid_chainmasks);
ser_ext_par->chainmask_table[i].cap_list =
qdf_mem_alloc_outline(NULL, alloc_size);
qdf_mem_malloc(alloc_size);
if (!ser_ext_par->chainmask_table[i].cap_list) {
init_deinit_chainmask_table_free(ser_ext_par);
status = QDF_STATUS_E_NOMEM;