memory: tegra: Remove calls to dev_pm_opp_set_clkname()

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>
Reviewed-by: Dmitry Osipenko <digetx@gmail.com>
Tested-by: Dmitry Osipenko <digetx@gmail.com>
Link: https://lore.kernel.org/r/0f22cc1791d8b88c50a9790c2dc19455b34ec7b0.1611742564.git.viresh.kumar@linaro.org
Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>

diff --git a/drivers/memory/tegra/tegra124-emc.c b/drivers/memory/tegra/tegra124-emc.c
index 9706550..bee8d9f 100644 (file)
--- a/drivers/memory/tegra/tegra124-emc.c
+++ b/drivers/memory/tegra/tegra124-emc.c
@@ -1399,21 +1399,14 @@ err_msg:
 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);
@@ -1442,8 +1435,6 @@ remove_table:
        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/tegra20-emc.c b/drivers/memory/tegra/tegra20-emc.c
index 686aaf4..d653a6b 100644 (file)
--- a/drivers/memory/tegra/tegra20-emc.c
+++ b/drivers/memory/tegra/tegra20-emc.c
@@ -911,21 +911,14 @@ err_msg:
 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 @@ remove_table:
        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 44ac155..6985da0 100644 (file)
--- a/drivers/memory/tegra/tegra30-emc.c
+++ b/drivers/memory/tegra/tegra30-emc.c
@@ -1483,21 +1483,14 @@ err_msg:
 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 @@ remove_table:
        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;
 }