UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

imx-drm: imx-drm-core: avoid going the long route round for drm_device 

We have the drm_device available, so rather than storing it and then
using the stored version, us the one we already have available to us.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Acked-by: Shawn Guo <shawn.guo@linaro.org>
Tested-by: Shawn Guo <shawn.guo@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Russell King 2013-12-17 19:10:47 +00:00 committed by Greg Kroah-Hartman
parent b5ea149247
commit 020a9ea7c2
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/staging/imx-drm/imx-drm-core.c
View File

@ -88,9 +88,9 @@ static int imx_drm_driver_unload(struct drm_device *drm)
imx_drm_device_put(); imx_drm_device_put();
drm_vblank_cleanup(imxdrm->drm); drm_vblank_cleanup(drm);
drm_kms_helper_poll_fini(imxdrm->drm); drm_kms_helper_poll_fini(drm);
drm_mode_config_cleanup(imxdrm->drm); drm_mode_config_cleanup(drm);
return 0; return 0;
} }
@ -424,15 +424,15 @@ static int imx_drm_driver_load(struct drm_device *drm, unsigned long flags)
mutex_lock(&imxdrm->mutex); mutex_lock(&imxdrm->mutex);
drm_kms_helper_poll_init(imxdrm->drm); drm_kms_helper_poll_init(drm);
/* setup the grouping for the legacy output */ /* setup the grouping for the legacy output */
ret = drm_mode_group_init_legacy_group(imxdrm->drm, ret = drm_mode_group_init_legacy_group(drm,
&imxdrm->drm->primary->mode_group); &drm->primary->mode_group);
if (ret) if (ret)
goto err_kms; goto err_kms;
ret = drm_vblank_init(imxdrm->drm, MAX_CRTC); ret = drm_vblank_init(drm, MAX_CRTC);
if (ret) if (ret)
goto err_kms; goto err_kms;
@ -441,7 +441,7 @@ static int imx_drm_driver_load(struct drm_device *drm, unsigned long flags)
* by drm timer once a current process gives up ownership of * by drm timer once a current process gives up ownership of
* vblank event.(after drm_vblank_put function is called) * vblank event.(after drm_vblank_put function is called)
*/ */
imxdrm->drm->vblank_disable_allowed = true; drm->vblank_disable_allowed = true;
if (!imx_drm_device_get()) { if (!imx_drm_device_get()) {
ret = -EINVAL; ret = -EINVAL;