]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
memory: samsung: exynos5422-dmc: simplify dmc->dev usage
authorKrzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Fri, 16 Aug 2024 10:54:27 +0000 (12:54 +0200)
committerKrzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Wed, 21 Aug 2024 11:23:32 +0000 (13:23 +0200)
Store 'dmc->dev' in local 'dev' variable, to make several pieces of code
using it shorter and easier to read.

Reviewed-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Link: https://lore.kernel.org/r/20240816-cleanup-h-of-node-put-memory-v2-3-9eed0ee16b78@linaro.org
Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
drivers/memory/samsung/exynos5422-dmc.c

index da7ecd921c72abff78d2bd403a4f6deb209b781e..48ef41b8eaa03380b05e1d3f9cd7a95690a792f7 100644 (file)
@@ -339,19 +339,20 @@ static int exynos5_switch_timing_regs(struct exynos5_dmc *dmc, bool set)
 static int exynos5_init_freq_table(struct exynos5_dmc *dmc,
                                   struct devfreq_dev_profile *profile)
 {
+       struct device *dev = dmc->dev;
        int i, ret;
        int idx;
        unsigned long freq;
 
-       ret = devm_pm_opp_of_add_table(dmc->dev);
+       ret = devm_pm_opp_of_add_table(dev);
        if (ret < 0) {
-               dev_err(dmc->dev, "Failed to get OPP table\n");
+               dev_err(dev, "Failed to get OPP table\n");
                return ret;
        }
 
-       dmc->opp_count = dev_pm_opp_get_opp_count(dmc->dev);
+       dmc->opp_count = dev_pm_opp_get_opp_count(dev);
 
-       dmc->opp = devm_kmalloc_array(dmc->dev, dmc->opp_count,
+       dmc->opp = devm_kmalloc_array(dev, dmc->opp_count,
                                      sizeof(struct dmc_opp_table), GFP_KERNEL);
        if (!dmc->opp)
                return -ENOMEM;
@@ -360,7 +361,7 @@ static int exynos5_init_freq_table(struct exynos5_dmc *dmc,
        for (i = 0, freq = ULONG_MAX; i < dmc->opp_count; i++, freq--) {
                struct dev_pm_opp *opp;
 
-               opp = dev_pm_opp_find_freq_floor(dmc->dev, &freq);
+               opp = dev_pm_opp_find_freq_floor(dev, &freq);
                if (IS_ERR(opp))
                        return PTR_ERR(opp);
 
@@ -1175,49 +1176,50 @@ static int create_timings_aligned(struct exynos5_dmc *dmc, u32 *reg_timing_row,
 static int of_get_dram_timings(struct exynos5_dmc *dmc)
 {
        int ret = 0;
+       struct device *dev = dmc->dev;
        int idx;
        struct device_node *np_ddr;
        u32 freq_mhz, clk_period_ps;
 
-       np_ddr = of_parse_phandle(dmc->dev->of_node, "device-handle", 0);
+       np_ddr = of_parse_phandle(dev->of_node, "device-handle", 0);
        if (!np_ddr) {
-               dev_warn(dmc->dev, "could not find 'device-handle' in DT\n");
+               dev_warn(dev, "could not find 'device-handle' in DT\n");
                return -EINVAL;
        }
 
-       dmc->timing_row = devm_kmalloc_array(dmc->dev, TIMING_COUNT,
+       dmc->timing_row = devm_kmalloc_array(dev, TIMING_COUNT,
                                             sizeof(u32), GFP_KERNEL);
        if (!dmc->timing_row) {
                ret = -ENOMEM;
                goto put_node;
        }
 
-       dmc->timing_data = devm_kmalloc_array(dmc->dev, TIMING_COUNT,
+       dmc->timing_data = devm_kmalloc_array(dev, TIMING_COUNT,
                                              sizeof(u32), GFP_KERNEL);
        if (!dmc->timing_data) {
                ret = -ENOMEM;
                goto put_node;
        }
 
-       dmc->timing_power = devm_kmalloc_array(dmc->dev, TIMING_COUNT,
+       dmc->timing_power = devm_kmalloc_array(dev, TIMING_COUNT,
                                               sizeof(u32), GFP_KERNEL);
        if (!dmc->timing_power) {
                ret = -ENOMEM;
                goto put_node;
        }
 
-       dmc->timings = of_lpddr3_get_ddr_timings(np_ddr, dmc->dev,
+       dmc->timings = of_lpddr3_get_ddr_timings(np_ddr, dev,
                                                 DDR_TYPE_LPDDR3,
                                                 &dmc->timings_arr_size);
        if (!dmc->timings) {
-               dev_warn(dmc->dev, "could not get timings from DT\n");
+               dev_warn(dev, "could not get timings from DT\n");
                ret = -EINVAL;
                goto put_node;
        }
 
-       dmc->min_tck = of_lpddr3_get_min_tck(np_ddr, dmc->dev);
+       dmc->min_tck = of_lpddr3_get_min_tck(np_ddr, dev);
        if (!dmc->min_tck) {
-               dev_warn(dmc->dev, "could not get tck from DT\n");
+               dev_warn(dev, "could not get tck from DT\n");
                ret = -EINVAL;
                goto put_node;
        }
@@ -1254,34 +1256,34 @@ put_node:
 static int exynos5_dmc_init_clks(struct exynos5_dmc *dmc)
 {
        int ret;
+       struct device *dev = dmc->dev;
        unsigned long target_volt = 0;
        unsigned long target_rate = 0;
        unsigned int tmp;
 
-       dmc->fout_spll = devm_clk_get(dmc->dev, "fout_spll");
+       dmc->fout_spll = devm_clk_get(dev, "fout_spll");
        if (IS_ERR(dmc->fout_spll))
                return PTR_ERR(dmc->fout_spll);
 
-       dmc->fout_bpll = devm_clk_get(dmc->dev, "fout_bpll");
+       dmc->fout_bpll = devm_clk_get(dev, "fout_bpll");
        if (IS_ERR(dmc->fout_bpll))
                return PTR_ERR(dmc->fout_bpll);
 
-       dmc->mout_mclk_cdrex = devm_clk_get(dmc->dev, "mout_mclk_cdrex");
+       dmc->mout_mclk_cdrex = devm_clk_get(dev, "mout_mclk_cdrex");
        if (IS_ERR(dmc->mout_mclk_cdrex))
                return PTR_ERR(dmc->mout_mclk_cdrex);
 
-       dmc->mout_bpll = devm_clk_get(dmc->dev, "mout_bpll");
+       dmc->mout_bpll = devm_clk_get(dev, "mout_bpll");
        if (IS_ERR(dmc->mout_bpll))
                return PTR_ERR(dmc->mout_bpll);
 
-       dmc->mout_mx_mspll_ccore = devm_clk_get(dmc->dev,
-                                               "mout_mx_mspll_ccore");
+       dmc->mout_mx_mspll_ccore = devm_clk_get(dev, "mout_mx_mspll_ccore");
        if (IS_ERR(dmc->mout_mx_mspll_ccore))
                return PTR_ERR(dmc->mout_mx_mspll_ccore);
 
-       dmc->mout_spll = devm_clk_get(dmc->dev, "ff_dout_spll2");
+       dmc->mout_spll = devm_clk_get(dev, "ff_dout_spll2");
        if (IS_ERR(dmc->mout_spll)) {
-               dmc->mout_spll = devm_clk_get(dmc->dev, "mout_sclk_spll");
+               dmc->mout_spll = devm_clk_get(dev, "mout_sclk_spll");
                if (IS_ERR(dmc->mout_spll))
                        return PTR_ERR(dmc->mout_spll);
        }
@@ -1329,38 +1331,37 @@ static int exynos5_dmc_init_clks(struct exynos5_dmc *dmc)
  */
 static int exynos5_performance_counters_init(struct exynos5_dmc *dmc)
 {
+       struct device *dev = dmc->dev;
        int ret, i;
 
-       dmc->num_counters = devfreq_event_get_edev_count(dmc->dev,
-                                                       "devfreq-events");
+       dmc->num_counters = devfreq_event_get_edev_count(dev, "devfreq-events");
        if (dmc->num_counters < 0) {
-               dev_err(dmc->dev, "could not get devfreq-event counters\n");
+               dev_err(dev, "could not get devfreq-event counters\n");
                return dmc->num_counters;
        }
 
-       dmc->counter = devm_kcalloc(dmc->dev, dmc->num_counters,
+       dmc->counter = devm_kcalloc(dev, dmc->num_counters,
                                    sizeof(*dmc->counter), GFP_KERNEL);
        if (!dmc->counter)
                return -ENOMEM;
 
        for (i = 0; i < dmc->num_counters; i++) {
                dmc->counter[i] =
-                       devfreq_event_get_edev_by_phandle(dmc->dev,
-                                               "devfreq-events", i);
+                       devfreq_event_get_edev_by_phandle(dev, "devfreq-events", i);
                if (IS_ERR_OR_NULL(dmc->counter[i]))
                        return -EPROBE_DEFER;
        }
 
        ret = exynos5_counters_enable_edev(dmc);
        if (ret < 0) {
-               dev_err(dmc->dev, "could not enable event counter\n");
+               dev_err(dev, "could not enable event counter\n");
                return ret;
        }
 
        ret = exynos5_counters_set_event(dmc);
        if (ret < 0) {
                exynos5_counters_disable_edev(dmc);
-               dev_err(dmc->dev, "could not set event counter\n");
+               dev_err(dev, "could not set event counter\n");
                return ret;
        }