diff mbox series

memory: tegra: Remove calls to dev_pm_opp_set_clkname()

Message ID 1430e70777fdcf1c946ca2fef296f439762a4f21.1611295029.git.viresh.kumar@linaro.org
State New
Headers show
Series memory: tegra: Remove calls to dev_pm_opp_set_clkname() | expand

Commit Message

Viresh Kumar Jan. 22, 2021, 6 a.m. UTC
There is no point calling dev_pm_opp_set_clkname() with the "name"
parameter set to NULL, this is already done by the OPP core at setup
time and should work as it is.

Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
---
Dmitry, am I missing something obvious here ?

 drivers/memory/tegra/tegra20-emc.c | 13 ++-----------
 drivers/memory/tegra/tegra30-emc.c | 13 ++-----------
 2 files changed, 4 insertions(+), 22 deletions(-)

Comments

Dmitry Osipenko Jan. 22, 2021, 3 p.m. UTC | #1
22.01.2021 09:00, Viresh Kumar пишет:
> There is no point calling dev_pm_opp_set_clkname() with the "name"
> parameter set to NULL, this is already done by the OPP core at setup
> time and should work as it is.
> 
> Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
> ---
> Dmitry, am I missing something obvious here ?

The dev_pm_opp_set_clkname() ensures that the OPP table has a clk
assigned to the table.

The _allocate_opp_table() ignores all clk_get() errors except the
-EPROBE_DEFER.

The opp_table->clk must be not a PTR_ERR for these memory drivers.

On the other hand, the memory drivers also do the devm_clk_get()
themselves, hence technically clk_get() of _allocate_opp_table()
shouldn't fail. But I'll need to take a closer look at the clk core, to
check whether clk_get() could fail for the implicit _allocate_opp_table().

Tegra124-emc driver also has dev_pm_opp_set_clkname(), BTW.
Viresh Kumar Jan. 25, 2021, 3:10 a.m. UTC | #2
On 22-01-21, 18:00, Dmitry Osipenko wrote:
> 22.01.2021 09:00, Viresh Kumar пишет:
> > There is no point calling dev_pm_opp_set_clkname() with the "name"
> > parameter set to NULL, this is already done by the OPP core at setup
> > time and should work as it is.
> > 
> > Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
> > ---
> > Dmitry, am I missing something obvious here ?
> 
> The dev_pm_opp_set_clkname() ensures that the OPP table has a clk
> assigned to the table.
> 
> The _allocate_opp_table() ignores all clk_get() errors except the
> -EPROBE_DEFER.

That is the case for everyone relying on OPP core to get it. It should be fine
for this case as well.

> The opp_table->clk must be not a PTR_ERR for these memory drivers.
> 
> On the other hand, the memory drivers also do the devm_clk_get()
> themselves, hence technically clk_get() of _allocate_opp_table()
> shouldn't fail. But I'll need to take a closer look at the clk core, to
> check whether clk_get() could fail for the implicit _allocate_opp_table().
> 
> Tegra124-emc driver also has dev_pm_opp_set_clkname(), BTW.
diff mbox series

Patch

diff --git a/drivers/memory/tegra/tegra20-emc.c b/drivers/memory/tegra/tegra20-emc.c
index 686aaf477d8a..d653a6be8d7f 100644
--- a/drivers/memory/tegra/tegra20-emc.c
+++ b/drivers/memory/tegra/tegra20-emc.c
@@ -911,21 +911,14 @@  static int tegra_emc_interconnect_init(struct tegra_emc *emc)
 static int tegra_emc_opp_table_init(struct tegra_emc *emc)
 {
 	u32 hw_version = BIT(tegra_sku_info.soc_process_id);
-	struct opp_table *clk_opp_table, *hw_opp_table;
+	struct opp_table *hw_opp_table;
 	int err;
 
-	clk_opp_table = dev_pm_opp_set_clkname(emc->dev, NULL);
-	err = PTR_ERR_OR_ZERO(clk_opp_table);
-	if (err) {
-		dev_err(emc->dev, "failed to set OPP clk: %d\n", err);
-		return err;
-	}
-
 	hw_opp_table = dev_pm_opp_set_supported_hw(emc->dev, &hw_version, 1);
 	err = PTR_ERR_OR_ZERO(hw_opp_table);
 	if (err) {
 		dev_err(emc->dev, "failed to set OPP supported HW: %d\n", err);
-		goto put_clk_table;
+		return err;
 	}
 
 	err = dev_pm_opp_of_add_table(emc->dev);
@@ -954,8 +947,6 @@  static int tegra_emc_opp_table_init(struct tegra_emc *emc)
 	dev_pm_opp_of_remove_table(emc->dev);
 put_hw_table:
 	dev_pm_opp_put_supported_hw(hw_opp_table);
-put_clk_table:
-	dev_pm_opp_put_clkname(clk_opp_table);
 
 	return err;
 }
diff --git a/drivers/memory/tegra/tegra30-emc.c b/drivers/memory/tegra/tegra30-emc.c
index 44ac155936aa..6985da0ffb35 100644
--- a/drivers/memory/tegra/tegra30-emc.c
+++ b/drivers/memory/tegra/tegra30-emc.c
@@ -1483,21 +1483,14 @@  static int tegra_emc_interconnect_init(struct tegra_emc *emc)
 static int tegra_emc_opp_table_init(struct tegra_emc *emc)
 {
 	u32 hw_version = BIT(tegra_sku_info.soc_speedo_id);
-	struct opp_table *clk_opp_table, *hw_opp_table;
+	struct opp_table *hw_opp_table;
 	int err;
 
-	clk_opp_table = dev_pm_opp_set_clkname(emc->dev, NULL);
-	err = PTR_ERR_OR_ZERO(clk_opp_table);
-	if (err) {
-		dev_err(emc->dev, "failed to set OPP clk: %d\n", err);
-		return err;
-	}
-
 	hw_opp_table = dev_pm_opp_set_supported_hw(emc->dev, &hw_version, 1);
 	err = PTR_ERR_OR_ZERO(hw_opp_table);
 	if (err) {
 		dev_err(emc->dev, "failed to set OPP supported HW: %d\n", err);
-		goto put_clk_table;
+		return err;
 	}
 
 	err = dev_pm_opp_of_add_table(emc->dev);
@@ -1526,8 +1519,6 @@  static int tegra_emc_opp_table_init(struct tegra_emc *emc)
 	dev_pm_opp_of_remove_table(emc->dev);
 put_hw_table:
 	dev_pm_opp_put_supported_hw(hw_opp_table);
-put_clk_table:
-	dev_pm_opp_put_clkname(clk_opp_table);
 
 	return err;
 }