Skip to content

Commit

Permalink
mt76: usb: rely on mt76_for_each_q_rx
Browse files Browse the repository at this point in the history
Rely on mt76_for_each_q_rx whenever possible in order to simply the code

Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
Signed-off-by: Felix Fietkau <nbd@nbd.name>
  • Loading branch information
LorenzoBianconi authored and nbd168 committed Jun 16, 2020
1 parent 0ed6a33 commit 2a52eab
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 32 deletions.
3 changes: 0 additions & 3 deletions debugfs.c
Expand Up @@ -54,9 +54,6 @@ static int mt76_rx_queues_read(struct seq_file *s, void *data)
mt76_for_each_q_rx(dev, i) {
struct mt76_queue *q = &dev->q_rx[i];

if (!q->ndesc)
continue;

queued = mt76_is_usb(dev) ? q->ndesc - q->queued : q->queued;
seq_printf(s, "%d: queued=%d head=%d tail=%d\n",
i, queued, q->head, q->tail);
Expand Down
41 changes: 12 additions & 29 deletions usb.c
Expand Up @@ -672,17 +672,11 @@ mt76u_process_rx_queue(struct mt76_dev *dev, struct mt76_queue *q)
static void mt76u_rx_tasklet(unsigned long data)
{
struct mt76_dev *dev = (struct mt76_dev *)data;
struct mt76_queue *q;
int i;

rcu_read_lock();
for (i = 0; i < __MT_RXQ_MAX; i++) {
q = &dev->q_rx[i];
if (!q->ndesc)
continue;

mt76u_process_rx_queue(dev, q);
}
mt76_for_each_q_rx(dev, i)
mt76u_process_rx_queue(dev, &dev->q_rx[i]);
rcu_read_unlock();
}

Expand Down Expand Up @@ -756,27 +750,19 @@ mt76u_free_rx_queue(struct mt76_dev *dev, struct mt76_queue *q)

static void mt76u_free_rx(struct mt76_dev *dev)
{
struct mt76_queue *q;
int i;

for (i = 0; i < __MT_RXQ_MAX; i++) {
q = &dev->q_rx[i];
if (!q->ndesc)
continue;

mt76u_free_rx_queue(dev, q);
}
mt76_for_each_q_rx(dev, i)
mt76u_free_rx_queue(dev, &dev->q_rx[i]);
}

void mt76u_stop_rx(struct mt76_dev *dev)
{
struct mt76_queue *q;
int i, j;
int i;

for (i = 0; i < __MT_RXQ_MAX; i++) {
q = &dev->q_rx[i];
if (!q->ndesc)
continue;
mt76_for_each_q_rx(dev, i) {
struct mt76_queue *q = &dev->q_rx[i];
int j;

for (j = 0; j < q->ndesc; j++)
usb_poison_urb(q->entry[j].urb);
Expand All @@ -788,14 +774,11 @@ EXPORT_SYMBOL_GPL(mt76u_stop_rx);

int mt76u_resume_rx(struct mt76_dev *dev)
{
struct mt76_queue *q;
int i, j, err;

for (i = 0; i < __MT_RXQ_MAX; i++) {
q = &dev->q_rx[i];
int i;

if (!q->ndesc)
continue;
mt76_for_each_q_rx(dev, i) {
struct mt76_queue *q = &dev->q_rx[i];
int err, j;

for (j = 0; j < q->ndesc; j++)
usb_unpoison_urb(q->entry[j].urb);
Expand Down

0 comments on commit 2a52eab

Please sign in to comment.