File tree Expand file tree Collapse file tree 1 file changed +4
-13
lines changed Expand file tree Collapse file tree 1 file changed +4
-13
lines changed Original file line number Diff line number Diff line change @@ -1436,22 +1436,17 @@ static int atmel_qspi_probe(struct platform_device *pdev)
1436
1436
1437
1437
pm_runtime_set_autosuspend_delay (& pdev -> dev , 500 );
1438
1438
pm_runtime_use_autosuspend (& pdev -> dev );
1439
- pm_runtime_set_active (& pdev -> dev );
1440
- pm_runtime_enable (& pdev -> dev );
1441
- pm_runtime_get_noresume (& pdev -> dev );
1439
+ devm_pm_runtime_set_active_enabled (& pdev -> dev );
1440
+ devm_pm_runtime_get_noresume (& pdev -> dev );
1442
1441
1443
1442
err = atmel_qspi_init (aq );
1444
1443
if (err )
1445
1444
goto dma_release ;
1446
1445
1447
1446
err = spi_register_controller (ctrl );
1448
- if (err ) {
1449
- pm_runtime_put_noidle (& pdev -> dev );
1450
- pm_runtime_disable (& pdev -> dev );
1451
- pm_runtime_set_suspended (& pdev -> dev );
1452
- pm_runtime_dont_use_autosuspend (& pdev -> dev );
1447
+ if (err )
1453
1448
goto dma_release ;
1454
- }
1449
+
1455
1450
pm_runtime_mark_last_busy (& pdev -> dev );
1456
1451
pm_runtime_put_autosuspend (& pdev -> dev );
1457
1452
@@ -1530,10 +1525,6 @@ static void atmel_qspi_remove(struct platform_device *pdev)
1530
1525
*/
1531
1526
dev_warn (& pdev -> dev , "Failed to resume device on remove\n" );
1532
1527
}
1533
-
1534
- pm_runtime_disable (& pdev -> dev );
1535
- pm_runtime_dont_use_autosuspend (& pdev -> dev );
1536
- pm_runtime_put_noidle (& pdev -> dev );
1537
1528
}
1538
1529
1539
1530
static int __maybe_unused atmel_qspi_suspend (struct device * dev )
You can’t perform that action at this time.
0 commit comments