@@ -602,18 +602,16 @@ static int atmel_qspi_probe(struct platform_device *pdev)
602
602
603
603
/* Map the registers */
604
604
aq -> regs = devm_platform_ioremap_resource_byname (pdev , "qspi_base" );
605
- if (IS_ERR (aq -> regs )) {
606
- dev_err (& pdev -> dev , "missing registers\n" );
607
- return PTR_ERR (aq -> regs );
608
- }
605
+ if (IS_ERR (aq -> regs ))
606
+ return dev_err_probe (& pdev -> dev , PTR_ERR (aq -> regs ),
607
+ "missing registers\n" );
609
608
610
609
/* Map the AHB memory */
611
610
res = platform_get_resource_byname (pdev , IORESOURCE_MEM , "qspi_mmap" );
612
611
aq -> mem = devm_ioremap_resource (& pdev -> dev , res );
613
- if (IS_ERR (aq -> mem )) {
614
- dev_err (& pdev -> dev , "missing AHB memory\n" );
615
- return PTR_ERR (aq -> mem );
616
- }
612
+ if (IS_ERR (aq -> mem ))
613
+ return dev_err_probe (& pdev -> dev , PTR_ERR (aq -> mem ),
614
+ "missing AHB memory\n" );
617
615
618
616
aq -> mmap_size = resource_size (res );
619
617
@@ -622,17 +620,15 @@ static int atmel_qspi_probe(struct platform_device *pdev)
622
620
if (IS_ERR (aq -> pclk ))
623
621
aq -> pclk = devm_clk_get (& pdev -> dev , NULL );
624
622
625
- if (IS_ERR (aq -> pclk )) {
626
- dev_err (& pdev -> dev , "missing peripheral clock\n" );
627
- return PTR_ERR (aq -> pclk );
628
- }
623
+ if (IS_ERR (aq -> pclk ))
624
+ return dev_err_probe (& pdev -> dev , PTR_ERR (aq -> pclk ),
625
+ "missing peripheral clock\n" );
629
626
630
627
/* Enable the peripheral clock */
631
628
err = clk_prepare_enable (aq -> pclk );
632
- if (err ) {
633
- dev_err (& pdev -> dev , "failed to enable the peripheral clock\n" );
634
- return err ;
635
- }
629
+ if (err )
630
+ return dev_err_probe (& pdev -> dev , err ,
631
+ "failed to enable the peripheral clock\n" );
636
632
637
633
aq -> caps = of_device_get_match_data (& pdev -> dev );
638
634
if (!aq -> caps ) {
0 commit comments