Commit ecf9cd48 authored by Eric Anholt's avatar Eric Anholt Committed by Rob Clark
Browse files

drm/msm: Garbage collect unused resource _len fields. 



Nothing was using the lengths of these ioremaps.

Signed-off-by: default avatarEric Anholt <eric@anholt.net>
Signed-off-by: default avatarRob Clark <robdclark@chromium.org>
parent b8afe9f8

drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c

+0 −21
Original line number Diff line number Diff line
@@ -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);

drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h

+0 −1
Original line number Diff line number Diff line
@@ -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;

drivers/gpu/drm/msm/disp/dpu1/dpu_mdss.c

+0 −9
Original line number Diff line number Diff line
@@ -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;