Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 93331458 authored by Ivo van Doorn's avatar Ivo van Doorn Committed by John W. Linville
Browse files

rt2x00: Simplify arguments to rt2x00 driver callback functions 



write_tx_desc shouldn't pass a rt2x00dev and skb pointer,
instead it should use the same format as other TX frame
callback functions, which is passing the data_entry pointer
which contains all the information which is needed to work
on a TX frame.

Most callers of the kick_tx_queue and kill_tx_queue already
have the data_queue pointer, so rather then sending the QID
with the given function, when the driver requests a new
pointer to the data_queue, it is more efficient to just
send the data_queue pointer directly.

Signed-off-by: default avatarIvo van Doorn <IvDoorn@gmail.com>
Acked-by: default avatarGertjan van Wingerde <gwingerde@gmail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 18c121d7

drivers/net/wireless/rt2x00/rt2400pci.c

+12 −13
Original line number Diff line number Diff line
@@ -1007,12 +1007,11 @@ static int rt2400pci_set_device_state(struct rt2x00_dev *rt2x00dev, 
/*

 * TX descriptor initialization

 */

static void rt2400pci_write_tx_desc(struct rt2x00_dev *rt2x00dev,

				    struct sk_buff *skb,

static void rt2400pci_write_tx_desc(struct queue_entry *entry,

				    struct txentry_desc *txdesc)

{

	struct skb_frame_desc *skbdesc = get_skb_frame_desc(skb);

	struct queue_entry_priv_pci *entry_priv = skbdesc->entry->priv_data;

	struct skb_frame_desc *skbdesc = get_skb_frame_desc(entry->skb);

	struct queue_entry_priv_pci *entry_priv = entry->priv_data;

	__le32 *txd = entry_priv->desc;

	u32 word;
@@ -1096,7 +1095,7 @@ static void rt2400pci_write_beacon(struct queue_entry *entry, 
	/*

	 * Write the TX descriptor for the beacon.

	 */

	rt2400pci_write_tx_desc(rt2x00dev, entry->skb, txdesc);

	rt2400pci_write_tx_desc(entry, txdesc);



	/*

	 * Dump beacon to userspace through debugfs.
@@ -1112,24 +1111,24 @@ static void rt2400pci_write_beacon(struct queue_entry *entry, 
	rt2x00pci_register_write(rt2x00dev, CSR14, reg);

}



static void rt2400pci_kick_tx_queue(struct rt2x00_dev *rt2x00dev,

				    const enum data_queue_qid queue)

static void rt2400pci_kick_tx_queue(struct data_queue *queue)

{

	struct rt2x00_dev *rt2x00dev = queue->rt2x00dev;

	u32 reg;



	rt2x00pci_register_read(rt2x00dev, TXCSR0, &reg);

	rt2x00_set_field32(&reg, TXCSR0_KICK_PRIO, (queue == QID_AC_BE));

	rt2x00_set_field32(&reg, TXCSR0_KICK_TX, (queue == QID_AC_BK));

	rt2x00_set_field32(&reg, TXCSR0_KICK_ATIM, (queue == QID_ATIM));

	rt2x00_set_field32(&reg, TXCSR0_KICK_PRIO, (queue->qid == QID_AC_BE));

	rt2x00_set_field32(&reg, TXCSR0_KICK_TX, (queue->qid == QID_AC_BK));

	rt2x00_set_field32(&reg, TXCSR0_KICK_ATIM, (queue->qid == QID_ATIM));

	rt2x00pci_register_write(rt2x00dev, TXCSR0, reg);

}



static void rt2400pci_kill_tx_queue(struct rt2x00_dev *rt2x00dev,

				    const enum data_queue_qid qid)

static void rt2400pci_kill_tx_queue(struct data_queue *queue)

{

	struct rt2x00_dev *rt2x00dev = queue->rt2x00dev;

	u32 reg;



	if (qid == QID_BEACON) {

	if (queue->qid == QID_BEACON) {

		rt2x00pci_register_write(rt2x00dev, CSR14, 0);

	} else {

		rt2x00pci_register_read(rt2x00dev, TXCSR0, &reg);

drivers/net/wireless/rt2x00/rt2500pci.c

+12 −13
Original line number Diff line number Diff line
@@ -1161,12 +1161,11 @@ static int rt2500pci_set_device_state(struct rt2x00_dev *rt2x00dev, 
/*

 * TX descriptor initialization

 */

static void rt2500pci_write_tx_desc(struct rt2x00_dev *rt2x00dev,

				    struct sk_buff *skb,

static void rt2500pci_write_tx_desc(struct queue_entry *entry,

				    struct txentry_desc *txdesc)

{

	struct skb_frame_desc *skbdesc = get_skb_frame_desc(skb);

	struct queue_entry_priv_pci *entry_priv = skbdesc->entry->priv_data;

	struct skb_frame_desc *skbdesc = get_skb_frame_desc(entry->skb);

	struct queue_entry_priv_pci *entry_priv = entry->priv_data;

	__le32 *txd = entry_priv->desc;

	u32 word;
@@ -1249,7 +1248,7 @@ static void rt2500pci_write_beacon(struct queue_entry *entry, 
	/*

	 * Write the TX descriptor for the beacon.

	 */

	rt2500pci_write_tx_desc(rt2x00dev, entry->skb, txdesc);

	rt2500pci_write_tx_desc(entry, txdesc);



	/*

	 * Dump beacon to userspace through debugfs.
@@ -1265,24 +1264,24 @@ static void rt2500pci_write_beacon(struct queue_entry *entry, 
	rt2x00pci_register_write(rt2x00dev, CSR14, reg);

}



static void rt2500pci_kick_tx_queue(struct rt2x00_dev *rt2x00dev,

				    const enum data_queue_qid queue)

static void rt2500pci_kick_tx_queue(struct data_queue *queue)

{

	struct rt2x00_dev *rt2x00dev = queue->rt2x00dev;

	u32 reg;



	rt2x00pci_register_read(rt2x00dev, TXCSR0, &reg);

	rt2x00_set_field32(&reg, TXCSR0_KICK_PRIO, (queue == QID_AC_BE));

	rt2x00_set_field32(&reg, TXCSR0_KICK_TX, (queue == QID_AC_BK));

	rt2x00_set_field32(&reg, TXCSR0_KICK_ATIM, (queue == QID_ATIM));

	rt2x00_set_field32(&reg, TXCSR0_KICK_PRIO, (queue->qid == QID_AC_BE));

	rt2x00_set_field32(&reg, TXCSR0_KICK_TX, (queue->qid == QID_AC_BK));

	rt2x00_set_field32(&reg, TXCSR0_KICK_ATIM, (queue->qid == QID_ATIM));

	rt2x00pci_register_write(rt2x00dev, TXCSR0, reg);

}



static void rt2500pci_kill_tx_queue(struct rt2x00_dev *rt2x00dev,

				    const enum data_queue_qid qid)

static void rt2500pci_kill_tx_queue(struct data_queue *queue)

{

	struct rt2x00_dev *rt2x00dev = queue->rt2x00dev;

	u32 reg;



	if (qid == QID_BEACON) {

	if (queue->qid == QID_BEACON) {

		rt2x00pci_register_write(rt2x00dev, CSR14, 0);

	} else {

		rt2x00pci_register_read(rt2x00dev, TXCSR0, &reg);

drivers/net/wireless/rt2x00/rt2500usb.c

+4 −5
Original line number Diff line number Diff line
@@ -1041,12 +1041,11 @@ static int rt2500usb_set_device_state(struct rt2x00_dev *rt2x00dev, 
/*

 * TX descriptor initialization

 */

static void rt2500usb_write_tx_desc(struct rt2x00_dev *rt2x00dev,

				    struct sk_buff *skb,

static void rt2500usb_write_tx_desc(struct queue_entry *entry,

				    struct txentry_desc *txdesc)

{

	struct skb_frame_desc *skbdesc = get_skb_frame_desc(skb);

	__le32 *txd = (__le32 *) skb->data;

	struct skb_frame_desc *skbdesc = get_skb_frame_desc(entry->skb);

	__le32 *txd = (__le32 *) entry->skb->data;

	u32 word;



	/*
@@ -1129,7 +1128,7 @@ static void rt2500usb_write_beacon(struct queue_entry *entry, 
	/*

	 * Write the TX descriptor for the beacon.

	 */

	rt2500usb_write_tx_desc(rt2x00dev, entry->skb, txdesc);

	rt2500usb_write_tx_desc(entry, txdesc);



	/*

	 * Dump beacon to userspace through debugfs.

drivers/net/wireless/rt2x00/rt2800pci.c

+17 −24
Original line number Diff line number Diff line
@@ -571,12 +571,11 @@ static __le32 *rt2800pci_get_txwi(struct queue_entry *entry) 
	return (__le32 *) entry->skb->data;

}



static void rt2800pci_write_tx_desc(struct rt2x00_dev *rt2x00dev,

				    struct sk_buff *skb,

static void rt2800pci_write_tx_desc(struct queue_entry *entry,

				    struct txentry_desc *txdesc)

{

	struct skb_frame_desc *skbdesc = get_skb_frame_desc(skb);

	struct queue_entry_priv_pci *entry_priv = skbdesc->entry->priv_data;

	struct skb_frame_desc *skbdesc = get_skb_frame_desc(entry->skb);

	struct queue_entry_priv_pci *entry_priv = entry->priv_data;

	__le32 *txd = entry_priv->desc;

	u32 word;
@@ -596,7 +595,7 @@ static void rt2800pci_write_tx_desc(struct rt2x00_dev *rt2x00dev, 
	rt2x00_desc_write(txd, 0, word);



	rt2x00_desc_read(txd, 1, &word);

	rt2x00_set_field32(&word, TXD_W1_SD_LEN1, skb->len);

	rt2x00_set_field32(&word, TXD_W1_SD_LEN1, entry->skb->len);

	rt2x00_set_field32(&word, TXD_W1_LAST_SEC1,

			   !test_bit(ENTRY_TXD_MORE_FRAG, &txdesc->flags));

	rt2x00_set_field32(&word, TXD_W1_BURST,
@@ -627,41 +626,35 @@ static void rt2800pci_write_tx_desc(struct rt2x00_dev *rt2x00dev, 
/*

 * TX data initialization

 */

static void rt2800pci_kick_tx_queue(struct rt2x00_dev *rt2x00dev,

				    const enum data_queue_qid queue_idx)

static void rt2800pci_kick_tx_queue(struct data_queue *queue)

{

	struct data_queue *queue;

	unsigned int idx, qidx = 0;



	if (queue_idx > QID_HCCA && queue_idx != QID_MGMT)

		return;



	queue = rt2x00queue_get_queue(rt2x00dev, queue_idx);

	idx = queue->index[Q_INDEX];

	struct rt2x00_dev *rt2x00dev = queue->rt2x00dev;

	unsigned int idx = queue->index[Q_INDEX];

	unsigned int qidx = 0;



	if (queue_idx == QID_MGMT)

	if (queue->qid == QID_MGMT)

		qidx = 5;

	else

		qidx = queue_idx;

		qidx = queue->qid;



	rt2800_register_write(rt2x00dev, TX_CTX_IDX(qidx), idx);

}



static void rt2800pci_kill_tx_queue(struct rt2x00_dev *rt2x00dev,

				    const enum data_queue_qid qid)

static void rt2800pci_kill_tx_queue(struct data_queue *queue)

{

	struct rt2x00_dev *rt2x00dev = queue->rt2x00dev;

	u32 reg;



	if (qid == QID_BEACON) {

	if (queue->qid == QID_BEACON) {

		rt2800_register_write(rt2x00dev, BCN_TIME_CFG, 0);

		return;

	}



	rt2800_register_read(rt2x00dev, WPDMA_RST_IDX, &reg);

	rt2x00_set_field32(&reg, WPDMA_RST_IDX_DTX_IDX0, (qid == QID_AC_BE));

	rt2x00_set_field32(&reg, WPDMA_RST_IDX_DTX_IDX1, (qid == QID_AC_BK));

	rt2x00_set_field32(&reg, WPDMA_RST_IDX_DTX_IDX2, (qid == QID_AC_VI));

	rt2x00_set_field32(&reg, WPDMA_RST_IDX_DTX_IDX3, (qid == QID_AC_VO));

	rt2x00_set_field32(&reg, WPDMA_RST_IDX_DTX_IDX0, (queue->qid == QID_AC_BE));

	rt2x00_set_field32(&reg, WPDMA_RST_IDX_DTX_IDX1, (queue->qid == QID_AC_BK));

	rt2x00_set_field32(&reg, WPDMA_RST_IDX_DTX_IDX2, (queue->qid == QID_AC_VI));

	rt2x00_set_field32(&reg, WPDMA_RST_IDX_DTX_IDX3, (queue->qid == QID_AC_VO));

	rt2800_register_write(rt2x00dev, WPDMA_RST_IDX, reg);

}

drivers/net/wireless/rt2x00/rt2800usb.c

+4 −5
Original line number Diff line number Diff line
@@ -329,12 +329,11 @@ static __le32 *rt2800usb_get_txwi(struct queue_entry *entry) 
		return (__le32 *) (entry->skb->data + TXINFO_DESC_SIZE);

}



static void rt2800usb_write_tx_desc(struct rt2x00_dev *rt2x00dev,

				    struct sk_buff *skb,

static void rt2800usb_write_tx_desc(struct queue_entry *entry,

				    struct txentry_desc *txdesc)

{

	struct skb_frame_desc *skbdesc = get_skb_frame_desc(skb);

	__le32 *txi = (__le32 *) skb->data;

	struct skb_frame_desc *skbdesc = get_skb_frame_desc(entry->skb);

	__le32 *txi = (__le32 *) entry->skb->data;

	u32 word;



	/*
@@ -342,7 +341,7 @@ static void rt2800usb_write_tx_desc(struct rt2x00_dev *rt2x00dev, 
	 */

	rt2x00_desc_read(txi, 0, &word);

	rt2x00_set_field32(&word, TXINFO_W0_USB_DMA_TX_PKT_LEN,

			   skb->len - TXINFO_DESC_SIZE);

			   entry->skb->len - TXINFO_DESC_SIZE);

	rt2x00_set_field32(&word, TXINFO_W0_WIV,

			   !test_bit(ENTRY_TXD_ENCRYPT_IV, &txdesc->flags));

	rt2x00_set_field32(&word, TXINFO_W0_QSEL, 2);