drm/lima: Clean up redundant pdev pointer

There's no point explicitly tracking the platform device when it can be
trivially derived from the regular device pointer in the couple of
places it's ever used.

Signed-off-by: Robin Murphy <robin.murphy@arm.com>
Signed-off-by: Qiang Yu <yuq825@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/8d9073cc91c10fc70910587fd1794e0e8f32b467.1587509150.git.robin.murphy@arm.com

diff --git a/drivers/gpu/drm/lima/lima_devfreq.c b/drivers/gpu/drm/lima/lima_devfreq.c
index 8c4d21d075295d383a986ea4658608b029510336..1d479b5924fe90fab57d49dd7f77f21515a7d785 100644 (file)
--- a/drivers/gpu/drm/lima/lima_devfreq.c
+++ b/drivers/gpu/drm/lima/lima_devfreq.c
@@ -101,13 +101,12 @@ void lima_devfreq_fini(struct lima_device *ldev)
        }
 
        if (devfreq->devfreq) {
-               devm_devfreq_remove_device(&ldev->pdev->dev,
-                                          devfreq->devfreq);
+               devm_devfreq_remove_device(ldev->dev, devfreq->devfreq);
                devfreq->devfreq = NULL;
        }
 
        if (devfreq->opp_of_table_added) {
-               dev_pm_opp_of_remove_table(&ldev->pdev->dev);
+               dev_pm_opp_of_remove_table(ldev->dev);
                devfreq->opp_of_table_added = false;
        }
 
@@ -125,7 +124,7 @@ void lima_devfreq_fini(struct lima_device *ldev)
 int lima_devfreq_init(struct lima_device *ldev)
 {
        struct thermal_cooling_device *cooling;
-       struct device *dev = &ldev->pdev->dev;
+       struct device *dev = ldev->dev;
        struct opp_table *opp_table;
        struct devfreq *devfreq;
        struct lima_devfreq *ldevfreq = &ldev->devfreq;

diff --git a/drivers/gpu/drm/lima/lima_device.c b/drivers/gpu/drm/lima/lima_device.c
index c334d297796a3c255e29012d2ef17d3525bd188e..29285dedd124cbca42c5a3d5fc528e13d1c1296e 100644 (file)
--- a/drivers/gpu/drm/lima/lima_device.c
+++ b/drivers/gpu/drm/lima/lima_device.c
@@ -297,8 +297,8 @@ static void lima_fini_pp_pipe(struct lima_device *dev)
 
 int lima_device_init(struct lima_device *ldev)
 {
+       struct platform_device *pdev = to_platform_device(ldev->dev);
        int err, i;
-       struct resource *res;
 
        dma_set_coherent_mask(ldev->dev, DMA_BIT_MASK(32));
 
@@ -329,8 +329,7 @@ int lima_device_init(struct lima_device *ldev)
        } else
                ldev->va_end = LIMA_VA_RESERVE_END;
 
-       res = platform_get_resource(ldev->pdev, IORESOURCE_MEM, 0);
-       ldev->iomem = devm_ioremap_resource(ldev->dev, res);
+       ldev->iomem = devm_platform_ioremap_resource(pdev, 0);
        if (IS_ERR(ldev->iomem)) {
                dev_err(ldev->dev, "fail to ioremap iomem\n");
                err = PTR_ERR(ldev->iomem);

diff --git a/drivers/gpu/drm/lima/lima_device.h b/drivers/gpu/drm/lima/lima_device.h
index 06fd9636dd7210100c2b69df0c2aa863ee0db825..99b1fb147dad0eb39bc5b068e1656aa221ad115b 100644 (file)
--- a/drivers/gpu/drm/lima/lima_device.h
+++ b/drivers/gpu/drm/lima/lima_device.h
@@ -76,7 +76,6 @@ enum lima_pipe_id {
 struct lima_device {
        struct device *dev;
        struct drm_device *ddev;
-       struct platform_device *pdev;
 
        enum lima_gpu_id id;
        u32 gp_version;

diff --git a/drivers/gpu/drm/lima/lima_drv.c b/drivers/gpu/drm/lima/lima_drv.c
index bbbdc8455e2ff95140d619a9f936eface9d94e01..4e5dd75822c0f292e5208cf62b70326aff602acc 100644 (file)
--- a/drivers/gpu/drm/lima/lima_drv.c
+++ b/drivers/gpu/drm/lima/lima_drv.c
@@ -380,7 +380,6 @@ static int lima_pdev_probe(struct platform_device *pdev)
                goto err_out0;
        }
 
-       ldev->pdev = pdev;
        ldev->dev = &pdev->dev;
        ldev->id = (enum lima_gpu_id)of_device_get_match_data(&pdev->dev);