diff options
| author | Andrew Morton <akpm@linux-foundation.org> | 2024-01-17 23:58:28 +0300 |
|---|---|---|
| committer | Andrew Morton <akpm@linux-foundation.org> | 2024-01-17 23:58:28 +0300 |
| commit | fe33c0fbed75dd464747c0faaedf94c7d8eb4101 (patch) | |
| tree | 057a9d98ca492c55708baedcc59bf2ea3e2511c7 /drivers/memory/tegra/tegra186-emc.c | |
| parent | 5d4747a6cc8e78ce74742d557fc9b7697fcacc95 (diff) | |
| parent | 052d534373b7ed33712a63d5e17b2b6cdbce84fd (diff) | |
| download | linux-fe33c0fbed75dd464747c0faaedf94c7d8eb4101.tar.xz | |
Merge branch 'master' into mm-hotfixes-stable
Diffstat (limited to 'drivers/memory/tegra/tegra186-emc.c')
| -rw-r--r-- | drivers/memory/tegra/tegra186-emc.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/memory/tegra/tegra186-emc.c b/drivers/memory/tegra/tegra186-emc.c index 4007f4e16d74..fcd4aea48bda 100644 --- a/drivers/memory/tegra/tegra186-emc.c +++ b/drivers/memory/tegra/tegra186-emc.c @@ -378,7 +378,7 @@ put_bpmp: return err; } -static int tegra186_emc_remove(struct platform_device *pdev) +static void tegra186_emc_remove(struct platform_device *pdev) { struct tegra_mc *mc = dev_get_drvdata(pdev->dev.parent); struct tegra186_emc *emc = platform_get_drvdata(pdev); @@ -387,8 +387,6 @@ static int tegra186_emc_remove(struct platform_device *pdev) mc->bpmp = NULL; tegra_bpmp_put(emc->bpmp); - - return 0; } static const struct of_device_id tegra186_emc_of_match[] = { @@ -413,7 +411,7 @@ static struct platform_driver tegra186_emc_driver = { .sync_state = icc_sync_state, }, .probe = tegra186_emc_probe, - .remove = tegra186_emc_remove, + .remove_new = tegra186_emc_remove, }; module_platform_driver(tegra186_emc_driver); |