@@ -1375,13 +1375,10 @@ static void cdns3_check_usb_interrupt_proceed(struct cdns3_device *priv_dev,
13751375 */
13761376static irqreturn_t cdns3_device_irq_handler (int irq , void * data )
13771377{
1378- struct cdns3_device * priv_dev ;
1379- struct cdns3 * cdns = data ;
1378+ struct cdns3_device * priv_dev = data ;
13801379 irqreturn_t ret = IRQ_NONE ;
13811380 u32 reg ;
13821381
1383- priv_dev = cdns -> gadget_dev ;
1384-
13851382 /* check USB device interrupt */
13861383 reg = readl (& priv_dev -> regs -> usb_ists );
13871384 if (reg ) {
@@ -1419,14 +1416,12 @@ static irqreturn_t cdns3_device_irq_handler(int irq, void *data)
14191416 */
14201417static irqreturn_t cdns3_device_thread_irq_handler (int irq , void * data )
14211418{
1422- struct cdns3_device * priv_dev ;
1423- struct cdns3 * cdns = data ;
1419+ struct cdns3_device * priv_dev = data ;
14241420 irqreturn_t ret = IRQ_NONE ;
14251421 unsigned long flags ;
14261422 int bit ;
14271423 u32 reg ;
14281424
1429- priv_dev = cdns -> gadget_dev ;
14301425 spin_lock_irqsave (& priv_dev -> lock , flags );
14311426
14321427 reg = readl (& priv_dev -> regs -> usb_ists );
@@ -2539,7 +2534,7 @@ void cdns3_gadget_exit(struct cdns3 *cdns)
25392534
25402535 priv_dev = cdns -> gadget_dev ;
25412536
2542- devm_free_irq (cdns -> dev , cdns -> dev_irq , cdns );
2537+ devm_free_irq (cdns -> dev , cdns -> dev_irq , priv_dev );
25432538
25442539 pm_runtime_mark_last_busy (cdns -> dev );
25452540 pm_runtime_put_autosuspend (cdns -> dev );
@@ -2710,7 +2705,8 @@ static int __cdns3_gadget_init(struct cdns3 *cdns)
27102705 ret = devm_request_threaded_irq (cdns -> dev , cdns -> dev_irq ,
27112706 cdns3_device_irq_handler ,
27122707 cdns3_device_thread_irq_handler ,
2713- IRQF_SHARED , dev_name (cdns -> dev ), cdns );
2708+ IRQF_SHARED , dev_name (cdns -> dev ),
2709+ cdns -> gadget_dev );
27142710
27152711 if (ret )
27162712 goto err0 ;
0 commit comments