kpriv/linux-hardened
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

drm/fsl-dcu: use variable name dev for struct drm_device

Browse source 
The driver uses different variable names for struct drm_device
across functions which is confusing. Stick to the more common
variable name dev. While at it, remove unnecessary if statement
in error handling.

Signed-off-by: Stefan Agner <stefan@agner.ch>
This commit is contained in:
Stefan Agner 2016-04-13 00:14:18 -07:00
parent b7d11305b8
commit b617966c08
1 changed files with 13 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c
View file

@ -63,40 +63,37 @@ static int fsl_dcu_drm_irq_init(struct drm_device *dev)
return ret; return ret;
} }
static int fsl_dcu_load(struct drm_device *drm, unsigned long flags) static int fsl_dcu_load(struct drm_device *dev, unsigned long flags)
{ {
struct device *dev = drm->dev; struct fsl_dcu_drm_device *fsl_dev = dev->dev_private;
struct fsl_dcu_drm_device *fsl_dev = drm->dev_private;
int ret; int ret;
ret = fsl_dcu_drm_modeset_init(fsl_dev); ret = fsl_dcu_drm_modeset_init(fsl_dev);
if (ret < 0) { if (ret < 0) {
dev_err(dev, "failed to initialize mode setting\n"); dev_err(dev->dev, "failed to initialize mode setting\n");
return ret; return ret;
} }
ret = drm_vblank_init(drm, drm->mode_config.num_crtc); ret = drm_vblank_init(dev, dev->mode_config.num_crtc);
if (ret < 0) { if (ret < 0) {
dev_err(dev, "failed to initialize vblank\n"); dev_err(dev->dev, "failed to initialize vblank\n");
goto done; goto done;
} }
drm->vblank_disable_allowed = true; dev->vblank_disable_allowed = true;
ret = fsl_dcu_drm_irq_init(drm); ret = fsl_dcu_drm_irq_init(dev);
if (ret < 0) if (ret < 0)
goto done; goto done;
drm->irq_enabled = true; dev->irq_enabled = true;
fsl_dcu_fbdev_init(drm); fsl_dcu_fbdev_init(dev);
return 0; return 0;
done: done:
if (ret) { drm_mode_config_cleanup(dev);
drm_mode_config_cleanup(drm); drm_vblank_cleanup(dev);
drm_vblank_cleanup(drm); drm_irq_uninstall(dev);
drm_irq_uninstall(drm); dev->dev_private = NULL;
drm->dev_private = NULL;
}
return ret; return ret;
} }