Commit 76adb460 authored by Laurent Pinchart's avatar Laurent Pinchart
Browse files

drm: Remove the struct drm_device platformdev field 



The field contains a pointer to the parent platform device of the DRM
device. As struct drm_device also contains a dev pointer to the struct
device embedded in the platform_device structure, the platformdev field
is redundant. Remove it and use the dev pointer directly.

Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Reviewed-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Acked-by: default avatarJyri Sarha <jsarha@ti.com>
Acked-by: Vincent Abriou <vincent.abriou@st.com> # For sti
Acked-by: Russell King <rmk+kernel@armlinux.org.uk> # For armada
Acked-by: Rob Clark <robdclark@gmail.com> # For msm
Acked-by: default avatarXinwei <Kong&lt;kong.kongxinwei@hisilicon.com>
parent 620f74f5

drivers/gpu/drm/armada/armada_drv.c

+1 −2
Original line number Diff line number Diff line
@@ -154,10 +154,9 @@ static int armada_drm_bind(struct device *dev) 
		return ret;

	}



	priv->drm.platformdev = to_platform_device(dev);

	priv->drm.dev_private = priv;



	platform_set_drvdata(priv->drm.platformdev, &priv->drm);

	dev_set_drvdata(dev, &priv->drm);



	INIT_WORK(&priv->fb_unref_work, armada_drm_unref_work);

	INIT_KFIFO(priv->fb_unref);

drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.c

+1 −1
Original line number Diff line number Diff line
@@ -434,7 +434,7 @@ fail: 


struct msm_kms *mdp4_kms_init(struct drm_device *dev)

{

	struct platform_device *pdev = dev->platformdev;

	struct platform_device *pdev = to_platform_device(dev->dev);

	struct mdp4_platform_config *config = mdp4_get_config(pdev);

	struct mdp4_kms *mdp4_kms;

	struct msm_kms *kms = NULL;

drivers/gpu/drm/msm/mdp/mdp5/mdp5_cfg.c

+1 −1
Original line number Diff line number Diff line
@@ -505,7 +505,7 @@ struct mdp5_cfg_handler *mdp5_cfg_init(struct mdp5_kms *mdp5_kms, 
		uint32_t major, uint32_t minor)

{

	struct drm_device *dev = mdp5_kms->dev;

	struct platform_device *pdev = dev->platformdev;

	struct platform_device *pdev = to_platform_device(dev->dev);

	struct mdp5_cfg_handler *cfg_handler;

	struct mdp5_cfg_platform *pconfig;

	int i, ret = 0;

drivers/gpu/drm/msm/mdp/mdp5/mdp5_mdss.c

+1 −1
Original line number Diff line number Diff line
@@ -160,7 +160,7 @@ void msm_mdss_destroy(struct drm_device *dev) 


int msm_mdss_init(struct drm_device *dev)

{

	struct platform_device *pdev = dev->platformdev;

	struct platform_device *pdev = to_platform_device(dev->dev);

	struct msm_drm_private *priv = dev->dev_private;

	struct msm_mdss *mdss;

	int ret;

drivers/gpu/drm/msm/msm_drv.c

+0 −1
Original line number Diff line number Diff line
@@ -383,7 +383,6 @@ static int msm_drm_init(struct device *dev, struct drm_driver *drv) 
	}



	platform_set_drvdata(pdev, ddev);

	ddev->platformdev = pdev;



	priv = kzalloc(sizeof(*priv), GFP_KERNEL);

	if (!priv) {

CRA Git | Maintained and supported by SUSTech CRA and CCSE