openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

drm: platform: Don't initialize driver-private data 

Platform device drivers usually use the driver-private data for their
own purposes. Having it overwritten by drm_platform_init() is confusing
and error-prone.

Signed-off-by: Thierry Reding <thierry.reding@avionic-design.de>
Signed-off-by: Dave Airlie <airlied@redhat.com>
This commit is contained in:
Thierry Reding 2012-10-15 18:03:42 +00:00 committed by Dave Airlie
parent 08bce0ac3b
commit a16d4f8601
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/gpu/drm/drm_platform.c
View File

@ -64,7 +64,6 @@ int drm_get_platform_dev(struct platform_device *platdev,
} }
if (drm_core_check_feature(dev, DRIVER_MODESET)) { if (drm_core_check_feature(dev, DRIVER_MODESET)) {
dev_set_drvdata(&platdev->dev, dev);
ret = drm_get_minor(dev, &dev->control, DRM_MINOR_CONTROL); ret = drm_get_minor(dev, &dev->control, DRM_MINOR_CONTROL);
if (ret) if (ret)
goto err_g1; goto err_g1;

12
drivers/gpu/drm/shmobile/shmob_drm_drv.c
View File

@ -201,6 +201,8 @@ static int shmob_drm_load(struct drm_device *dev, unsigned long flags)
goto done; goto done;
} }
platform_set_drvdata(pdev, sdev);
done: done:
if (ret) if (ret)
shmob_drm_unload(dev); shmob_drm_unload(dev);
@ -299,11 +301,9 @@ static struct drm_driver shmob_drm_driver = {
#if CONFIG_PM_SLEEP #if CONFIG_PM_SLEEP
static int shmob_drm_pm_suspend(struct device *dev) static int shmob_drm_pm_suspend(struct device *dev)
{ {
struct platform_device *pdev = to_platform_device(dev); struct shmob_drm_device *sdev = dev_get_drvdata(dev);
struct drm_device *ddev = platform_get_drvdata(pdev);
struct shmob_drm_device *sdev = ddev->dev_private;
drm_kms_helper_poll_disable(ddev); drm_kms_helper_poll_disable(sdev->ddev);
shmob_drm_crtc_suspend(&sdev->crtc); shmob_drm_crtc_suspend(&sdev->crtc);
return 0; return 0;
@ -311,9 +311,7 @@ static int shmob_drm_pm_suspend(struct device *dev)
static int shmob_drm_pm_resume(struct device *dev) static int shmob_drm_pm_resume(struct device *dev)
{ {
struct platform_device *pdev = to_platform_device(dev); struct shmob_drm_device *sdev = dev_get_drvdata(dev);
struct drm_device *ddev = platform_get_drvdata(pdev);
struct shmob_drm_device *sdev = ddev->dev_private;
mutex_lock(&sdev->ddev->mode_config.mutex); mutex_lock(&sdev->ddev->mode_config.mutex);
shmob_drm_crtc_resume(&sdev->crtc); shmob_drm_crtc_resume(&sdev->crtc);