Commit 07874db4 authored by Jérôme Pouiller's avatar Jérôme Pouiller Committed by Greg Kroah-Hartman
Browse files

staging: wfx: prefix structs tx_policy and hwbus_ops with wfx_ 



All the types related to a driver should use the same prefix.

Signed-off-by: default avatarJérôme Pouiller <jerome.pouiller@silabs.com>
Link: https://lore.kernel.org/r/20220113085524.1110708-20-Jerome.Pouiller@silabs.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 9d3586fe

drivers/staging/wfx/bus.h

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 
#define WFX_REG_SET_GEN_R_W   0x6

#define WFX_REG_FRAME_OUT     0x7



struct hwbus_ops {

struct wfx_hwbus_ops {

	int (*copy_from_io)(void *bus_priv, unsigned int addr,

			    void *dst, size_t count);

	int (*copy_to_io)(void *bus_priv, unsigned int addr,

drivers/staging/wfx/bus_sdio.c

+1 −1
Original line number Diff line number Diff line
@@ -159,7 +159,7 @@ static size_t wfx_sdio_align_size(void *priv, size_t size) 
	return sdio_align_size(bus->func, size);

}



static const struct hwbus_ops wfx_sdio_hwbus_ops = {

static const struct wfx_hwbus_ops wfx_sdio_hwbus_ops = {

	.copy_from_io = wfx_sdio_copy_from_io,

	.copy_to_io = wfx_sdio_copy_to_io,

	.irq_subscribe = wfx_sdio_irq_subscribe,

drivers/staging/wfx/bus_spi.c

+1 −1
Original line number Diff line number Diff line
@@ -168,7 +168,7 @@ static size_t wfx_spi_align_size(void *priv, size_t size) 
	return ALIGN(size, 4);

}



static const struct hwbus_ops wfx_spi_hwbus_ops = {

static const struct wfx_hwbus_ops wfx_spi_hwbus_ops = {

	.copy_from_io = wfx_spi_copy_from_io,

	.copy_to_io = wfx_spi_copy_to_io,

	.irq_subscribe = wfx_spi_irq_subscribe,

drivers/staging/wfx/data_tx.c

+19 −19
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ static int wfx_get_hw_rate(struct wfx_dev *wdev, 


/* TX policy cache implementation */



static void wfx_tx_policy_build(struct wfx_vif *wvif, struct tx_policy *policy,

static void wfx_tx_policy_build(struct wfx_vif *wvif, struct wfx_tx_policy *policy,

				struct ieee80211_tx_rate *rates)

{

	struct wfx_dev *wdev = wvif->wdev;
@@ -66,16 +66,16 @@ static void wfx_tx_policy_build(struct wfx_vif *wvif, struct tx_policy *policy, 
	}

}



static bool wfx_tx_policy_is_equal(const struct tx_policy *a,

				   const struct tx_policy *b)

static bool wfx_tx_policy_is_equal(const struct wfx_tx_policy *a,

				   const struct wfx_tx_policy *b)

{

	return !memcmp(a->rates, b->rates, sizeof(a->rates));

}



static int wfx_tx_policy_find(struct tx_policy_cache *cache,

			      struct tx_policy *wanted)

static int wfx_tx_policy_find(struct wfx_tx_policy_cache *cache,

			      struct wfx_tx_policy *wanted)

{

	struct tx_policy *it;

	struct wfx_tx_policy *it;



	list_for_each_entry(it, &cache->used, link)

		if (wfx_tx_policy_is_equal(wanted, it))
@@ -86,15 +86,15 @@ static int wfx_tx_policy_find(struct tx_policy_cache *cache, 
	return -1;

}



static void wfx_tx_policy_use(struct tx_policy_cache *cache,

			      struct tx_policy *entry)

static void wfx_tx_policy_use(struct wfx_tx_policy_cache *cache,

			      struct wfx_tx_policy *entry)

{

	++entry->usage_count;

	list_move(&entry->link, &cache->used);

}



static int wfx_tx_policy_release(struct tx_policy_cache *cache,

				 struct tx_policy *entry)

static int wfx_tx_policy_release(struct wfx_tx_policy_cache *cache,

				 struct wfx_tx_policy *entry)

{

	int ret = --entry->usage_count;
@@ -107,9 +107,9 @@ static int wfx_tx_policy_get(struct wfx_vif *wvif, 
			     struct ieee80211_tx_rate *rates, bool *renew)

{

	int idx;

	struct tx_policy_cache *cache = &wvif->tx_policy_cache;

	struct tx_policy wanted;

	struct tx_policy *entry;

	struct wfx_tx_policy_cache *cache = &wvif->tx_policy_cache;

	struct wfx_tx_policy wanted;

	struct wfx_tx_policy *entry;



	wfx_tx_policy_build(wvif, &wanted, rates);
@@ -127,7 +127,7 @@ static int wfx_tx_policy_get(struct wfx_vif *wvif, 
		 * entry in "free" list

		 */

		*renew = true;

		entry = list_entry(cache->free.prev, struct tx_policy, link);

		entry = list_entry(cache->free.prev, struct wfx_tx_policy, link);

		memcpy(entry->rates, wanted.rates, sizeof(entry->rates));

		entry->uploaded = false;

		entry->usage_count = 0;
@@ -143,7 +143,7 @@ static int wfx_tx_policy_get(struct wfx_vif *wvif, 
static void wfx_tx_policy_put(struct wfx_vif *wvif, int idx)

{

	int usage, locked;

	struct tx_policy_cache *cache = &wvif->tx_policy_cache;

	struct wfx_tx_policy_cache *cache = &wvif->tx_policy_cache;



	if (idx == HIF_TX_RETRY_POLICY_INVALID)

		return;
@@ -157,7 +157,7 @@ static void wfx_tx_policy_put(struct wfx_vif *wvif, int idx) 


static int wfx_tx_policy_upload(struct wfx_vif *wvif)

{

	struct tx_policy *policies = wvif->tx_policy_cache.cache;

	struct wfx_tx_policy *policies = wvif->tx_policy_cache.cache;

	u8 tmp_rates[12];

	int i, is_used;
@@ -192,7 +192,7 @@ void wfx_tx_policy_upload_work(struct work_struct *work) 


void wfx_tx_policy_init(struct wfx_vif *wvif)

{

	struct tx_policy_cache *cache = &wvif->tx_policy_cache;

	struct wfx_tx_policy_cache *cache = &wvif->tx_policy_cache;

	int i;



	memset(cache, 0, sizeof(*cache));
@@ -435,8 +435,8 @@ void wfx_tx(struct ieee80211_hw *hw, struct ieee80211_tx_control *control, 


static void wfx_skb_dtor(struct wfx_vif *wvif, struct sk_buff *skb)

{

	struct wfx_hif_msg *hif = (struct hif_msg *)skb->data;

	struct wfx_hif_req_tx *req = (struct hif_req_tx *)hif->body;

	struct wfx_hif_msg *hif = (struct wfx_hif_msg *)skb->data;

	struct wfx_hif_req_tx *req = (struct wfx_hif_req_tx *)hif->body;

	unsigned int offset = sizeof(struct wfx_hif_msg) +

			      sizeof(struct wfx_hif_req_tx) +

			      req->fc_offset;

drivers/staging/wfx/data_tx.h

+5 −5
Original line number Diff line number Diff line
@@ -18,15 +18,15 @@ struct wfx_tx_priv; 
struct wfx_dev;

struct wfx_vif;



struct tx_policy {

struct wfx_tx_policy {

	struct list_head link;

	int usage_count;

	u8 rates[12];

	bool uploaded;

};



struct tx_policy_cache {

	struct tx_policy cache[HIF_TX_RETRY_POLICY_MAX];

struct wfx_tx_policy_cache {

	struct wfx_tx_policy cache[HIF_TX_RETRY_POLICY_MAX];

	/* FIXME: use a trees and drop hash from tx_policy */

	struct list_head used;

	struct list_head free;
@@ -59,8 +59,8 @@ static inline struct wfx_tx_priv *wfx_skb_tx_priv(struct sk_buff *skb) 


static inline struct wfx_hif_req_tx *wfx_skb_txreq(struct sk_buff *skb)

{

	struct wfx_hif_msg *hif = (struct hif_msg *)skb->data;

	struct wfx_hif_req_tx *req = (struct hif_req_tx *)hif->body;

	struct wfx_hif_msg *hif = (struct wfx_hif_msg *)skb->data;

	struct wfx_hif_req_tx *req = (struct wfx_hif_req_tx *)hif->body;



	return req;

}