In the etnaviv_pdev_probe(), etnaviv_gpu_platform_probe() function, the
value of '&pdev->dev' has been cached to the 'dev' local auto variable.
But part of callers use 'dev' as argument, while the rest use '&pdev->dev'.

To keep it consistent, use 'dev' uniformly.

Signed-off-by: Sui Jingfeng <sui.jingf...@linux.dev>
---
 drivers/gpu/drm/etnaviv/etnaviv_drv.c | 10 +++++-----
 drivers/gpu/drm/etnaviv/etnaviv_gpu.c | 16 ++++++++--------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/drivers/gpu/drm/etnaviv/etnaviv_drv.c 
b/drivers/gpu/drm/etnaviv/etnaviv_drv.c
index 986fd68b489a..863faac2ea19 100644
--- a/drivers/gpu/drm/etnaviv/etnaviv_drv.c
+++ b/drivers/gpu/drm/etnaviv/etnaviv_drv.c
@@ -614,7 +614,7 @@ static int etnaviv_pdev_probe(struct platform_device *pdev)
                        if (!of_device_is_available(core_node))
                                continue;
 
-                       drm_of_component_match_add(&pdev->dev, &match,
+                       drm_of_component_match_add(dev, &match,
                                                   component_compare_of, 
core_node);
                }
        } else {
@@ -637,9 +637,9 @@ static int etnaviv_pdev_probe(struct platform_device *pdev)
         * bit to make sure we are allocating the command buffers and
         * TLBs in the lower 4 GiB address space.
         */
-       if (dma_set_mask(&pdev->dev, DMA_BIT_MASK(40)) ||
-           dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(32))) {
-               dev_dbg(&pdev->dev, "No suitable DMA available\n");
+       if (dma_set_mask(dev, DMA_BIT_MASK(40)) ||
+           dma_set_coherent_mask(dev, DMA_BIT_MASK(32))) {
+               dev_dbg(dev, "No suitable DMA available\n");
                return -ENODEV;
        }
 
@@ -650,7 +650,7 @@ static int etnaviv_pdev_probe(struct platform_device *pdev)
         */
        first_node = etnaviv_of_first_available_node();
        if (first_node) {
-               of_dma_configure(&pdev->dev, first_node, true);
+               of_dma_configure(dev, first_node, true);
                of_node_put(first_node);
        }
 
diff --git a/drivers/gpu/drm/etnaviv/etnaviv_gpu.c 
b/drivers/gpu/drm/etnaviv/etnaviv_gpu.c
index aa15682f94db..3a14e187388a 100644
--- a/drivers/gpu/drm/etnaviv/etnaviv_gpu.c
+++ b/drivers/gpu/drm/etnaviv/etnaviv_gpu.c
@@ -1891,7 +1891,7 @@ static int etnaviv_gpu_platform_probe(struct 
platform_device *pdev)
        if (!gpu)
                return -ENOMEM;
 
-       gpu->dev = &pdev->dev;
+       gpu->dev = dev;
        mutex_init(&gpu->lock);
        mutex_init(&gpu->sched_lock);
 
@@ -1905,8 +1905,8 @@ static int etnaviv_gpu_platform_probe(struct 
platform_device *pdev)
        if (gpu->irq < 0)
                return gpu->irq;
 
-       err = devm_request_irq(&pdev->dev, gpu->irq, irq_handler, 0,
-                              dev_name(gpu->dev), gpu);
+       err = devm_request_irq(dev, gpu->irq, irq_handler, 0,
+                              dev_name(dev), gpu);
        if (err) {
                dev_err(dev, "failed to request IRQ%u: %d\n", gpu->irq, err);
                return err;
@@ -1925,13 +1925,13 @@ static int etnaviv_gpu_platform_probe(struct 
platform_device *pdev)
         * autosuspend delay is rather arbitary: no measurements have
         * yet been performed to determine an appropriate value.
         */
-       pm_runtime_use_autosuspend(gpu->dev);
-       pm_runtime_set_autosuspend_delay(gpu->dev, 200);
-       pm_runtime_enable(gpu->dev);
+       pm_runtime_use_autosuspend(dev);
+       pm_runtime_set_autosuspend_delay(dev, 200);
+       pm_runtime_enable(dev);
 
-       err = component_add(&pdev->dev, &gpu_ops);
+       err = component_add(dev, &gpu_ops);
        if (err < 0) {
-               dev_err(&pdev->dev, "failed to register component: %d\n", err);
+               dev_err(dev, "failed to register component: %d\n", err);
                return err;
        }
 
-- 
2.34.1

Reply via email to