File tree Expand file tree Collapse file tree 1 file changed +7
-18
lines changed Expand file tree Collapse file tree 1 file changed +7
-18
lines changed Original file line number Diff line number Diff line change @@ -506,11 +506,11 @@ static int sf_pdma_probe(struct platform_device *pdev)
506
506
res = platform_get_resource (pdev , IORESOURCE_MEM , 0 );
507
507
pdma -> membase = devm_ioremap_resource (& pdev -> dev , res );
508
508
if (IS_ERR (pdma -> membase ))
509
- goto ERR_MEMBASE ;
509
+ return PTR_ERR ( pdma -> membase ) ;
510
510
511
511
ret = sf_pdma_irq_init (pdev , pdma );
512
512
if (ret )
513
- goto ERR_INITIRQ ;
513
+ return ret ;
514
514
515
515
sf_pdma_setup_chans (pdma );
516
516
@@ -544,24 +544,13 @@ static int sf_pdma_probe(struct platform_device *pdev)
544
544
"Failed to set DMA mask. Fall back to default.\n" );
545
545
546
546
ret = dma_async_device_register (& pdma -> dma_dev );
547
- if (ret )
548
- goto ERR_REG_DMADEVICE ;
547
+ if (ret ) {
548
+ dev_err (& pdev -> dev ,
549
+ "Can't register SiFive Platform DMA. (%d)\n" , ret );
550
+ return ret ;
551
+ }
549
552
550
553
return 0 ;
551
-
552
- ERR_MEMBASE :
553
- devm_kfree (& pdev -> dev , pdma );
554
- return PTR_ERR (pdma -> membase );
555
-
556
- ERR_INITIRQ :
557
- devm_kfree (& pdev -> dev , pdma );
558
- return ret ;
559
-
560
- ERR_REG_DMADEVICE :
561
- devm_kfree (& pdev -> dev , pdma );
562
- dev_err (& pdev -> dev ,
563
- "Can't register SiFive Platform DMA. (%d)\n" , ret );
564
- return ret ;
565
554
}
566
555
567
556
static int sf_pdma_remove (struct platform_device * pdev )
You can’t perform that action at this time.
0 commit comments