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

Commit ae5bb272 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "usb: dwc3: Remove tasklet bottom half handler"

parents c174c683 1cb5c91b

drivers/usb/dwc3/core.h

+0 −1
Original line number Diff line number Diff line
@@ -1005,7 +1005,6 @@ struct dwc3 { 


	/* IRQ timing statistics */

	int			irq;

	struct tasklet_struct	bh;

	unsigned long		irq_cnt;

	unsigned                bh_completion_time[MAX_INTR_STATS];

	unsigned                bh_handled_evt_cnt[MAX_INTR_STATS];

drivers/usb/dwc3/gadget.c

+2 −19
Original line number Diff line number Diff line
@@ -2141,8 +2141,6 @@ static int dwc3_gadget_stop(struct usb_gadget *g) 
		atomic_read(&dwc->dev->power.usage_count));

	dwc3_gadget_disable_irq(dwc);



	tasklet_kill(&dwc->bh);



	spin_lock_irqsave(&dwc->lock, flags);



	__dwc3_gadget_ep_disable(dwc->eps[0]);
@@ -3380,15 +3378,6 @@ static irqreturn_t dwc3_process_event_buf(struct dwc3 *dwc, u32 buf) 
	return ret;

}



static void dwc3_interrupt_bh(unsigned long param)

{

	struct dwc3 *dwc = (struct dwc3 *) param;



	pm_runtime_get(dwc->dev);

	dwc3_thread_interrupt(dwc->irq, dwc);

	enable_irq(dwc->irq);

}



static irqreturn_t dwc3_thread_interrupt(int irq, void *_dwc)

{

	struct dwc3 *dwc = _dwc;
@@ -3412,7 +3401,6 @@ static irqreturn_t dwc3_thread_interrupt(int irq, void *_dwc) 
	dwc->bh_completion_time[dwc->bh_dbg_index] = temp_time;

	dwc->bh_dbg_index = (dwc->bh_dbg_index + 1) % 10;



	pm_runtime_put(dwc->dev);

	return ret;

}
@@ -3478,10 +3466,8 @@ irqreturn_t dwc3_interrupt(int irq, void *_dwc) 
	dwc->irq_event_count[dwc->irq_dbg_index] = temp_cnt / 4;

	dwc->irq_dbg_index = (dwc->irq_dbg_index + 1) % MAX_INTR_STATS;



	if (ret == IRQ_WAKE_THREAD) {

		disable_irq_nosync(irq);

		tasklet_schedule(&dwc->bh);

	}

	if (ret == IRQ_WAKE_THREAD)

		dwc3_thread_interrupt(dwc->irq, dwc);



	return IRQ_HANDLED;

}
@@ -3529,9 +3515,6 @@ int dwc3_gadget_init(struct dwc3 *dwc) 
		goto err3;

	}



	dwc->bh.func = dwc3_interrupt_bh;

	dwc->bh.data = (unsigned long)dwc;



	dwc->gadget.ops			= &dwc3_gadget_ops;

	dwc->gadget.speed		= USB_SPEED_UNKNOWN;

	dwc->gadget.sg_supported	= true;