]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
drm/msm/hdmi: Simplify with local 'dev' variable
authorKrzysztof Kozlowski <krzysztof.kozlowski@oss.qualcomm.com>
Wed, 11 Mar 2026 20:17:27 +0000 (21:17 +0100)
committerDmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
Wed, 25 Mar 2026 06:06:09 +0000 (08:06 +0200)
msm_hdmi_dev_probe() function already stores pdev->dev in local
variable, so use it directly to make code simpler.

Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@oss.qualcomm.com>
Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
Patchwork: https://patchwork.freedesktop.org/patch/711171/
Link: https://lore.kernel.org/r/20260311-drm-msm-hdmi-cleanup-v1-3-c5535245f6de@oss.qualcomm.com
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
drivers/gpu/drm/msm/hdmi/hdmi.c

index 6e31db76392393580b0298dd8e1068b6b4fd77fc..d5587495bca05ed6b0201f412375e443ead549d9 100644 (file)
@@ -278,7 +278,7 @@ static int msm_hdmi_dev_probe(struct platform_device *pdev)
        if (!config)
                return -EINVAL;
 
-       hdmi = devm_kzalloc(&pdev->dev, sizeof(*hdmi), GFP_KERNEL);
+       hdmi = devm_kzalloc(dev, sizeof(*hdmi), GFP_KERNEL);
        if (!hdmi)
                return -ENOMEM;
 
@@ -304,7 +304,7 @@ static int msm_hdmi_dev_probe(struct platform_device *pdev)
 
        hdmi->qfprom_mmio = msm_ioremap(pdev, "qfprom_physical");
        if (IS_ERR(hdmi->qfprom_mmio)) {
-               DRM_DEV_INFO(&pdev->dev, "can't find qfprom resource\n");
+               DRM_DEV_INFO(dev, "can't find qfprom resource\n");
                hdmi->qfprom_mmio = NULL;
        }
 
@@ -312,8 +312,7 @@ static int msm_hdmi_dev_probe(struct platform_device *pdev)
        if (hdmi->irq < 0)
                return hdmi->irq;
 
-       hdmi->pwr_regs = devm_kcalloc(&pdev->dev,
-                                     config->pwr_reg_cnt,
+       hdmi->pwr_regs = devm_kcalloc(dev, config->pwr_reg_cnt,
                                      sizeof(hdmi->pwr_regs[0]),
                                      GFP_KERNEL);
        if (!hdmi->pwr_regs)
@@ -322,12 +321,11 @@ static int msm_hdmi_dev_probe(struct platform_device *pdev)
        for (i = 0; i < config->pwr_reg_cnt; i++)
                hdmi->pwr_regs[i].supply = config->pwr_reg_names[i];
 
-       ret = devm_regulator_bulk_get(&pdev->dev, config->pwr_reg_cnt, hdmi->pwr_regs);
+       ret = devm_regulator_bulk_get(dev, config->pwr_reg_cnt, hdmi->pwr_regs);
        if (ret)
                return dev_err_probe(dev, ret, "failed to get pwr regulators\n");
 
-       hdmi->pwr_clks = devm_kcalloc(&pdev->dev,
-                                     config->pwr_clk_cnt,
+       hdmi->pwr_clks = devm_kcalloc(dev, config->pwr_clk_cnt,
                                      sizeof(hdmi->pwr_clks[0]),
                                      GFP_KERNEL);
        if (!hdmi->pwr_clks)
@@ -336,16 +334,16 @@ static int msm_hdmi_dev_probe(struct platform_device *pdev)
        for (i = 0; i < config->pwr_clk_cnt; i++)
                hdmi->pwr_clks[i].id = config->pwr_clk_names[i];
 
-       ret = devm_clk_bulk_get(&pdev->dev, config->pwr_clk_cnt, hdmi->pwr_clks);
+       ret = devm_clk_bulk_get(dev, config->pwr_clk_cnt, hdmi->pwr_clks);
        if (ret)
                return ret;
 
-       hdmi->extp_clk = devm_clk_get_optional(&pdev->dev, "extp");
+       hdmi->extp_clk = devm_clk_get_optional(dev, "extp");
        if (IS_ERR(hdmi->extp_clk))
                return dev_err_probe(dev, PTR_ERR(hdmi->extp_clk),
                                     "failed to get extp clock\n");
 
-       hdmi->hpd_gpiod = devm_gpiod_get_optional(&pdev->dev, "hpd", GPIOD_IN);
+       hdmi->hpd_gpiod = devm_gpiod_get_optional(dev, "hpd", GPIOD_IN);
        /* This will catch e.g. -EPROBE_DEFER */
        if (IS_ERR(hdmi->hpd_gpiod))
                return dev_err_probe(dev, PTR_ERR(hdmi->hpd_gpiod),
@@ -361,13 +359,13 @@ static int msm_hdmi_dev_probe(struct platform_device *pdev)
        if (ret)
                return ret;
 
-       ret = devm_pm_runtime_enable(&pdev->dev);
+       ret = devm_pm_runtime_enable(dev);
        if (ret)
                goto err_put_phy;
 
        platform_set_drvdata(pdev, hdmi);
 
-       ret = component_add(&pdev->dev, &msm_hdmi_ops);
+       ret = component_add(dev, &msm_hdmi_ops);
        if (ret)
                goto err_put_phy;