drm/msm: Remove uneeded platform dev members

Commit eeb754746b14 ("drm/msm/gpu: use pm-runtime") adds a pointer
for the GPU platform device to the msm_gpu struct so we can
happily remove the same pointers from the individual GPU
structs.

Signed-off-by: Jordan Crouse <jcrouse@codeaurora.org>
Signed-off-by: Rob Clark <robdclark@gmail.com>

diff --git a/drivers/gpu/drm/msm/adreno/a3xx_gpu.c b/drivers/gpu/drm/msm/adreno/a3xx_gpu.c
index 0e3828ed1e4608db344d8b33ec834104361a11e8..7791313405b5fc26d7d5954aa8cff6483c25c907 100644 (file)
--- a/drivers/gpu/drm/msm/adreno/a3xx_gpu.c
+++ b/drivers/gpu/drm/msm/adreno/a3xx_gpu.c
@@ -486,8 +486,6 @@ struct msm_gpu *a3xx_gpu_init(struct drm_device *dev)
        adreno_gpu = &a3xx_gpu->base;
        gpu = &adreno_gpu->base;
 
-       a3xx_gpu->pdev = pdev;
-
        gpu->perfcntrs = perfcntrs;
        gpu->num_perfcntrs = ARRAY_SIZE(perfcntrs);
 

diff --git a/drivers/gpu/drm/msm/adreno/a3xx_gpu.h b/drivers/gpu/drm/msm/adreno/a3xx_gpu.h
index 85ff66cbddd60b726d721a7aa8c52dfcaf7fca14..ab60dc9e344ecde6d058a175f6f134b90bee6a61 100644 (file)
--- a/drivers/gpu/drm/msm/adreno/a3xx_gpu.h
+++ b/drivers/gpu/drm/msm/adreno/a3xx_gpu.h
@@ -28,7 +28,6 @@
 
 struct a3xx_gpu {
        struct adreno_gpu base;
-       struct platform_device *pdev;
 
        /* if OCMEM is used for GMEM: */
        uint32_t ocmem_base;

diff --git a/drivers/gpu/drm/msm/adreno/a4xx_gpu.c b/drivers/gpu/drm/msm/adreno/a4xx_gpu.c
index 19abf229b08d4d57069f39d7bcc1ddc8be5f4ce3..58341ef6f15bd482e1ce5d0577ae6cfeb741a6e8 100644 (file)
--- a/drivers/gpu/drm/msm/adreno/a4xx_gpu.c
+++ b/drivers/gpu/drm/msm/adreno/a4xx_gpu.c
@@ -568,8 +568,6 @@ struct msm_gpu *a4xx_gpu_init(struct drm_device *dev)
        adreno_gpu = &a4xx_gpu->base;
        gpu = &adreno_gpu->base;
 
-       a4xx_gpu->pdev = pdev;
-
        gpu->perfcntrs = NULL;
        gpu->num_perfcntrs = 0;
 

diff --git a/drivers/gpu/drm/msm/adreno/a4xx_gpu.h b/drivers/gpu/drm/msm/adreno/a4xx_gpu.h
index 01247204ac9264ff6ae3a31e26d07b32afbd489f..f757184328a360316e95b5e748c426e3622cfbc9 100644 (file)
--- a/drivers/gpu/drm/msm/adreno/a4xx_gpu.h
+++ b/drivers/gpu/drm/msm/adreno/a4xx_gpu.h
@@ -23,7 +23,6 @@
 
 struct a4xx_gpu {
        struct adreno_gpu base;
-       struct platform_device *pdev;
 
        /* if OCMEM is used for GMEM: */
        uint32_t ocmem_base;

diff --git a/drivers/gpu/drm/msm/adreno/a5xx_gpu.c b/drivers/gpu/drm/msm/adreno/a5xx_gpu.c
index f9eae03aa1dcaef072974d60216fb6b09ef81e66..3192cbc49f67d3fac55af435e52776455d283b24 100644 (file)
--- a/drivers/gpu/drm/msm/adreno/a5xx_gpu.c
+++ b/drivers/gpu/drm/msm/adreno/a5xx_gpu.c
@@ -373,7 +373,7 @@ static int a5xx_zap_shader_init(struct msm_gpu *gpu)
        static bool loaded;
        struct adreno_gpu *adreno_gpu = to_adreno_gpu(gpu);
        struct a5xx_gpu *a5xx_gpu = to_a5xx_gpu(adreno_gpu);
-       struct platform_device *pdev = a5xx_gpu->pdev;
+       struct platform_device *pdev = gpu->pdev;
        int ret;
 
        /*
@@ -1015,7 +1015,6 @@ struct msm_gpu *a5xx_gpu_init(struct drm_device *dev)
        adreno_gpu = &a5xx_gpu->base;
        gpu = &adreno_gpu->base;
 
-       a5xx_gpu->pdev = pdev;
        adreno_gpu->registers = a5xx_registers;
        adreno_gpu->reg_offsets = a5xx_register_offsets;
 

diff --git a/drivers/gpu/drm/msm/adreno/a5xx_gpu.h b/drivers/gpu/drm/msm/adreno/a5xx_gpu.h
index 1137092241d593c34e4607e3c723acfb74861972..e94451685bf821679668e28acba2948e6114761f 100644 (file)
--- a/drivers/gpu/drm/msm/adreno/a5xx_gpu.h
+++ b/drivers/gpu/drm/msm/adreno/a5xx_gpu.h
@@ -23,7 +23,6 @@
 
 struct a5xx_gpu {
        struct adreno_gpu base;
-       struct platform_device *pdev;
 
        struct drm_gem_object *pm4_bo;
        uint64_t pm4_iova;