drm/msm: Garbage collect unused resource _len fields.

Nothing was using the lengths of these ioremaps.

Signed-off-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Rob Clark <robdclark@chromium.org>

diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c
index f2bbce42c760e2b2e9dbaf0fec8ec55eb1d78f29..88bcd9c7ec596ea8b13f9ce574aa6350bc156af5 100644 (file)
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c
@@ -46,20 +46,6 @@
 static int dpu_kms_hw_init(struct msm_kms *kms);
 static void _dpu_kms_mmu_destroy(struct dpu_kms *dpu_kms);
 
-static unsigned long dpu_iomap_size(struct platform_device *pdev,
-                                   const char *name)
-{
-       struct resource *res;
-
-       res = platform_get_resource_byname(pdev, IORESOURCE_MEM, name);
-       if (!res) {
-               DRM_ERROR("failed to get memory resource: %s\n", name);
-               return 0;
-       }
-
-       return resource_size(res);
-}
-
 #ifdef CONFIG_DEBUG_FS
 static int _dpu_danger_signal_status(struct seq_file *s,
                bool danger_status)
@@ -845,7 +831,6 @@ static int dpu_kms_hw_init(struct msm_kms *kms)
                goto error;
        }
        DRM_DEBUG("mapped dpu address space @%pK\n", dpu_kms->mmio);
-       dpu_kms->mmio_len = dpu_iomap_size(dpu_kms->pdev, "mdp");
 
        dpu_kms->vbif[VBIF_RT] = msm_ioremap(dpu_kms->pdev, "vbif", "vbif");
        if (IS_ERR(dpu_kms->vbif[VBIF_RT])) {
@@ -854,22 +839,16 @@ static int dpu_kms_hw_init(struct msm_kms *kms)
                dpu_kms->vbif[VBIF_RT] = NULL;
                goto error;
        }
-       dpu_kms->vbif_len[VBIF_RT] = dpu_iomap_size(dpu_kms->pdev, "vbif");
        dpu_kms->vbif[VBIF_NRT] = msm_ioremap(dpu_kms->pdev, "vbif_nrt", "vbif_nrt");
        if (IS_ERR(dpu_kms->vbif[VBIF_NRT])) {
                dpu_kms->vbif[VBIF_NRT] = NULL;
                DPU_DEBUG("VBIF NRT is not defined");
-       } else {
-               dpu_kms->vbif_len[VBIF_NRT] = dpu_iomap_size(dpu_kms->pdev,
-                                                            "vbif_nrt");
        }
 
        dpu_kms->reg_dma = msm_ioremap(dpu_kms->pdev, "regdma", "regdma");
        if (IS_ERR(dpu_kms->reg_dma)) {
                dpu_kms->reg_dma = NULL;
                DPU_DEBUG("REG_DMA is not defined");
-       } else {
-               dpu_kms->reg_dma_len = dpu_iomap_size(dpu_kms->pdev, "regdma");
        }
 
        pm_runtime_get_sync(&dpu_kms->pdev->dev);

diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h
index 7400cd758a49f2e5759ffc7e7d984cb129b96142..e140cd633071d66bede81272e909b359950157ad 100644 (file)
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h
@@ -100,7 +100,6 @@ struct dpu_kms {
 
        /* io/register spaces: */
        void __iomem *mmio, *vbif[VBIF_MAX], *reg_dma;
-       unsigned long mmio_len, vbif_len[VBIF_MAX], reg_dma_len;
 
        struct regulator *vdd;
        struct regulator *mmagic;

diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_mdss.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_mdss.c
index 80d3cfc140070d0cd3006981fb473a3cc453710e..9f20b84d5c0a1c34a2f4bd07b7de5efa1d9d41b1 100644 (file)
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_mdss.c
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_mdss.c
@@ -37,7 +37,6 @@ struct dpu_mdss_hw_init_handler {
 struct dpu_mdss {
        struct msm_mdss base;
        void __iomem *mmio;
-       unsigned long mmio_len;
        struct dss_module_power mp;
        struct dpu_irq_controller irq_controller;
        struct icc_path *path[2];
@@ -292,7 +291,6 @@ int dpu_mdss_init(struct drm_device *dev)
 {
        struct platform_device *pdev = to_platform_device(dev->dev);
        struct msm_drm_private *priv = dev->dev_private;
-       struct resource *res;
        struct dpu_mdss *dpu_mdss;
        struct dss_module_power *mp;
        int ret = 0;
@@ -308,13 +306,6 @@ int dpu_mdss_init(struct drm_device *dev)
 
        DRM_DEBUG("mapped mdss address space @%pK\n", dpu_mdss->mmio);
 
-       res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "mdss");
-       if (!res) {
-               DRM_ERROR("failed to get memory resource for mdss\n");
-               return -ENOMEM;
-       }
-       dpu_mdss->mmio_len = resource_size(res);
-
        ret = dpu_mdss_parse_data_bus_icc_path(dev, dpu_mdss);
        if (ret)
                return ret;