Commit 2ce216ed authored by Robin Murphy's avatar Robin Murphy Committed by Qiang Yu
Browse files

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: default avatarRobin Murphy <robin.murphy@arm.com>
Signed-off-by: default avatarQiang Yu <yuq825@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/8d9073cc91c10fc70910587fd1794e0e8f32b467.1587509150.git.robin.murphy@arm.com
parent 21d81f88

drivers/gpu/drm/lima/lima_devfreq.c

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

drivers/gpu/drm/lima/lima_device.c

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

drivers/gpu/drm/lima/lima_device.h

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

drivers/gpu/drm/lima/lima_drv.c

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

CRA Git | Maintained and supported by SUSTech CRA and CCSE