diff options
| author | Mark Brown <broonie@kernel.org> | 2024-10-22 23:18:45 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2024-10-22 23:18:45 +0100 |
| commit | 5ddc236d094d496bcd1e78aaa88bdde530073b6f (patch) | |
| tree | 2435f76086b7bbf9739c05411baa2f1520cd9618 /drivers/gpu/host1x/dev.c | |
| parent | 0d214f27c0e3d9694284c95bac1502c2d247355b (diff) | |
| parent | 602ff58ae4fe4289b0ca71cba9fb82f7de92cd64 (diff) | |
| download | linux-next-5ddc236d094d496bcd1e78aaa88bdde530073b6f.tar.gz linux-next-5ddc236d094d496bcd1e78aaa88bdde530073b6f.zip | |
regulator: init_data handling update
Merge series from Jerome Brunet <jbrunet@baylibre.com>:
This patchset groups the regulator patches around the init_data topic
discussed on pmbus write protect patchset [1]
[1]: https://lore.kernel.org/r/20240920-pmbus-wp-v1-0-d679ef31c483@baylibre.com
Diffstat (limited to 'drivers/gpu/host1x/dev.c')
| -rw-r--r-- | drivers/gpu/host1x/dev.c | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/drivers/gpu/host1x/dev.c b/drivers/gpu/host1x/dev.c index b62e4f0e8130..e98528777faa 100644 --- a/drivers/gpu/host1x/dev.c +++ b/drivers/gpu/host1x/dev.c @@ -625,12 +625,6 @@ static int host1x_probe(struct platform_device *pdev) goto free_contexts; } - err = host1x_intr_init(host); - if (err) { - dev_err(&pdev->dev, "failed to initialize interrupts\n"); - goto deinit_syncpt; - } - pm_runtime_enable(&pdev->dev); err = devm_tegra_core_dev_init_opp_table_common(&pdev->dev); @@ -642,6 +636,12 @@ static int host1x_probe(struct platform_device *pdev) if (err) goto pm_disable; + err = host1x_intr_init(host); + if (err) { + dev_err(&pdev->dev, "failed to initialize interrupts\n"); + goto pm_put; + } + host1x_debug_init(host); err = host1x_register(host); @@ -658,13 +658,11 @@ unregister: host1x_unregister(host); deinit_debugfs: host1x_debug_deinit(host); - + host1x_intr_deinit(host); +pm_put: pm_runtime_put_sync_suspend(&pdev->dev); pm_disable: pm_runtime_disable(&pdev->dev); - - host1x_intr_deinit(host); -deinit_syncpt: host1x_syncpt_deinit(host); free_contexts: host1x_memory_context_list_free(&host->context_list); |