evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

imx-drm: imx-drm-core: move allocation of imxdrm device to driver load function

Browse source 
It is now no longer necessary to keep this structure around; we can
allocate it upon DRM driver load and destroy it thereafter without
affecting the other components now.

Acked-by: Philipp Zabel <p.zabel@pengutronix.de>
Acked-by: Shawn Guo <shawn.guo@linaro.org>
Reviewed-by: Fabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
This commit is contained in:
Russell King 2013-11-03 15:31:22 +00:00
parent ccec7f621d
commit b85f2b5d87
1 changed files with 6 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
drivers/staging/imx-drm/imx-drm-core.c
View file

@ -38,7 +38,6 @@ struct imx_drm_crtc;
struct imx_drm_device { struct imx_drm_device {
struct drm_device *drm; struct drm_device *drm;
struct device *dev;
struct imx_drm_crtc *crtc[MAX_CRTC]; struct imx_drm_crtc *crtc[MAX_CRTC];
int pipes; int pipes;
struct drm_fbdev_cma *fbhelper; struct drm_fbdev_cma *fbhelper;
@ -206,13 +205,6 @@ int imx_drm_connector_mode_valid(struct drm_connector *connector,
} }
EXPORT_SYMBOL(imx_drm_connector_mode_valid); EXPORT_SYMBOL(imx_drm_connector_mode_valid);
static struct imx_drm_device *imx_drm_device;
static struct imx_drm_device *__imx_drm_device(void)
{
return imx_drm_device;
}
void imx_drm_connector_destroy(struct drm_connector *connector) void imx_drm_connector_destroy(struct drm_connector *connector)
{ {
drm_sysfs_connector_remove(connector); drm_sysfs_connector_remove(connector);
@ -236,10 +228,14 @@ static struct drm_mode_config_funcs imx_drm_mode_config_funcs = {
*/ */
static int imx_drm_driver_load(struct drm_device *drm, unsigned long flags) static int imx_drm_driver_load(struct drm_device *drm, unsigned long flags)
{ {
struct imx_drm_device *imxdrm = __imx_drm_device(); struct imx_drm_device *imxdrm;
struct drm_connector *connector; struct drm_connector *connector;
int ret; int ret;
imxdrm = devm_kzalloc(drm->dev, sizeof(*imxdrm), GFP_KERNEL);
if (!imxdrm)
return -ENOMEM;
imxdrm->drm = drm; imxdrm->drm = drm;
drm->dev_private = imxdrm; drm->dev_private = imxdrm;
@ -604,8 +600,6 @@ static int imx_drm_platform_probe(struct platform_device *pdev)
if (ret) if (ret)
return ret; return ret;
imx_drm_device->dev = &pdev->dev;
return component_master_add(&pdev->dev, &imx_drm_ops); return component_master_add(&pdev->dev, &imx_drm_ops);
} }
@ -630,36 +624,7 @@ static struct platform_driver imx_drm_pdrv = {
.of_match_table = imx_drm_dt_ids, .of_match_table = imx_drm_dt_ids,
}, },
}; };
module_platform_driver(imx_drm_pdrv);
static int __init imx_drm_init(void)
{
int ret;
imx_drm_device = kzalloc(sizeof(*imx_drm_device), GFP_KERNEL);
if (!imx_drm_device)
return -ENOMEM;
ret = platform_driver_register(&imx_drm_pdrv);
if (ret)
goto err_pdrv;
return 0;
err_pdrv:
kfree(imx_drm_device);
return ret;
}
static void __exit imx_drm_exit(void)
{
platform_driver_unregister(&imx_drm_pdrv);
kfree(imx_drm_device);
}
module_init(imx_drm_init);
module_exit(imx_drm_exit);
MODULE_AUTHOR("Sascha Hauer <s.hauer@pengutronix.de>"); MODULE_AUTHOR("Sascha Hauer <s.hauer@pengutronix.de>");
MODULE_DESCRIPTION("i.MX drm driver core"); MODULE_DESCRIPTION("i.MX drm driver core");