Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Viresh Kumar and committed by
Krzysztof Kozlowski
25d98770 6ce84ab6

+6 -33
+2 -11
drivers/memory/tegra/tegra124-emc.c
··· 1399 1399 static int tegra_emc_opp_table_init(struct tegra_emc *emc) 1400 1400 { 1401 1401 u32 hw_version = BIT(tegra_sku_info.soc_speedo_id); 1402 - struct opp_table *clk_opp_table, *hw_opp_table; 1402 + struct opp_table *hw_opp_table; 1403 1403 int err; 1404 - 1405 - clk_opp_table = dev_pm_opp_set_clkname(emc->dev, NULL); 1406 - err = PTR_ERR_OR_ZERO(clk_opp_table); 1407 - if (err) { 1408 - dev_err(emc->dev, "failed to set OPP clk: %d\n", err); 1409 - return err; 1410 - } 1411 1404 1412 1405 hw_opp_table = dev_pm_opp_set_supported_hw(emc->dev, &hw_version, 1); 1413 1406 err = PTR_ERR_OR_ZERO(hw_opp_table); 1414 1407 if (err) { 1415 1408 dev_err(emc->dev, "failed to set OPP supported HW: %d\n", err); 1416 - goto put_clk_table; 1409 + return err; 1417 1410 } 1418 1411 1419 1412 err = dev_pm_opp_of_add_table(emc->dev); ··· 1435 1442 dev_pm_opp_of_remove_table(emc->dev); 1436 1443 put_hw_table: 1437 1444 dev_pm_opp_put_supported_hw(hw_opp_table); 1438 - put_clk_table: 1439 - dev_pm_opp_put_clkname(clk_opp_table); 1440 1445 1441 1446 return err; 1442 1447 }
+2 -11
drivers/memory/tegra/tegra20-emc.c
··· 911 911 static int tegra_emc_opp_table_init(struct tegra_emc *emc) 912 912 { 913 913 u32 hw_version = BIT(tegra_sku_info.soc_process_id); 914 - struct opp_table *clk_opp_table, *hw_opp_table; 914 + struct opp_table *hw_opp_table; 915 915 int err; 916 - 917 - clk_opp_table = dev_pm_opp_set_clkname(emc->dev, NULL); 918 - err = PTR_ERR_OR_ZERO(clk_opp_table); 919 - if (err) { 920 - dev_err(emc->dev, "failed to set OPP clk: %d\n", err); 921 - return err; 922 - } 923 916 924 917 hw_opp_table = dev_pm_opp_set_supported_hw(emc->dev, &hw_version, 1); 925 918 err = PTR_ERR_OR_ZERO(hw_opp_table); 926 919 if (err) { 927 920 dev_err(emc->dev, "failed to set OPP supported HW: %d\n", err); 928 - goto put_clk_table; 921 + return err; 929 922 } 930 923 931 924 err = dev_pm_opp_of_add_table(emc->dev); ··· 947 954 dev_pm_opp_of_remove_table(emc->dev); 948 955 put_hw_table: 949 956 dev_pm_opp_put_supported_hw(hw_opp_table); 950 - put_clk_table: 951 - dev_pm_opp_put_clkname(clk_opp_table); 952 957 953 958 return err; 954 959 }
+2 -11
drivers/memory/tegra/tegra30-emc.c
··· 1483 1483 static int tegra_emc_opp_table_init(struct tegra_emc *emc) 1484 1484 { 1485 1485 u32 hw_version = BIT(tegra_sku_info.soc_speedo_id); 1486 - struct opp_table *clk_opp_table, *hw_opp_table; 1486 + struct opp_table *hw_opp_table; 1487 1487 int err; 1488 - 1489 - clk_opp_table = dev_pm_opp_set_clkname(emc->dev, NULL); 1490 - err = PTR_ERR_OR_ZERO(clk_opp_table); 1491 - if (err) { 1492 - dev_err(emc->dev, "failed to set OPP clk: %d\n", err); 1493 - return err; 1494 - } 1495 1488 1496 1489 hw_opp_table = dev_pm_opp_set_supported_hw(emc->dev, &hw_version, 1); 1497 1490 err = PTR_ERR_OR_ZERO(hw_opp_table); 1498 1491 if (err) { 1499 1492 dev_err(emc->dev, "failed to set OPP supported HW: %d\n", err); 1500 - goto put_clk_table; 1493 + return err; 1501 1494 } 1502 1495 1503 1496 err = dev_pm_opp_of_add_table(emc->dev); ··· 1519 1526 dev_pm_opp_of_remove_table(emc->dev); 1520 1527 put_hw_table: 1521 1528 dev_pm_opp_put_supported_hw(hw_opp_table); 1522 - put_clk_table: 1523 - dev_pm_opp_put_clkname(clk_opp_table); 1524 1529 1525 1530 return err; 1526 1531 }