提交 a6e65072 编写于 作者: S Sachin Kamat 提交者: Inki Dae

drm/exynos: Use devm_* functions in exynos_hdmi.c

devm_* functions are device managed functions and make error handling
and cleanup cleaner and simpler.
Signed-off-by: NSachin Kamat <sachin.kamat@linaro.org>
Signed-off-by: NSachin Kamat <sachin.kamat@samsung.com>
Signed-off-by: NInki Dae <inki.dae@samsung.com>
Signed-off-by: NKyungmin Park <kyungmin.park@samsung.com>
上级 edc57266
...@@ -63,7 +63,6 @@ struct hdmi_context { ...@@ -63,7 +63,6 @@ struct hdmi_context {
bool dvi_mode; bool dvi_mode;
struct mutex hdmi_mutex; struct mutex hdmi_mutex;
struct resource *regs_res;
void __iomem *regs; void __iomem *regs;
unsigned int external_irq; unsigned int external_irq;
unsigned int internal_irq; unsigned int internal_irq;
...@@ -2280,16 +2279,17 @@ static int __devinit hdmi_probe(struct platform_device *pdev) ...@@ -2280,16 +2279,17 @@ static int __devinit hdmi_probe(struct platform_device *pdev)
return -EINVAL; return -EINVAL;
} }
drm_hdmi_ctx = kzalloc(sizeof(*drm_hdmi_ctx), GFP_KERNEL); drm_hdmi_ctx = devm_kzalloc(&pdev->dev, sizeof(*drm_hdmi_ctx),
GFP_KERNEL);
if (!drm_hdmi_ctx) { if (!drm_hdmi_ctx) {
DRM_ERROR("failed to allocate common hdmi context.\n"); DRM_ERROR("failed to allocate common hdmi context.\n");
return -ENOMEM; return -ENOMEM;
} }
hdata = kzalloc(sizeof(struct hdmi_context), GFP_KERNEL); hdata = devm_kzalloc(&pdev->dev, sizeof(struct hdmi_context),
GFP_KERNEL);
if (!hdata) { if (!hdata) {
DRM_ERROR("out of memory\n"); DRM_ERROR("out of memory\n");
kfree(drm_hdmi_ctx);
return -ENOMEM; return -ENOMEM;
} }
...@@ -2318,26 +2318,18 @@ static int __devinit hdmi_probe(struct platform_device *pdev) ...@@ -2318,26 +2318,18 @@ static int __devinit hdmi_probe(struct platform_device *pdev)
goto err_resource; goto err_resource;
} }
hdata->regs_res = request_mem_region(res->start, resource_size(res), hdata->regs = devm_request_and_ioremap(&pdev->dev, res);
dev_name(dev));
if (!hdata->regs_res) {
DRM_ERROR("failed to claim register region\n");
ret = -ENOENT;
goto err_resource;
}
hdata->regs = ioremap(res->start, resource_size(res));
if (!hdata->regs) { if (!hdata->regs) {
DRM_ERROR("failed to map registers\n"); DRM_ERROR("failed to map registers\n");
ret = -ENXIO; ret = -ENXIO;
goto err_req_region; goto err_resource;
} }
/* DDC i2c driver */ /* DDC i2c driver */
if (i2c_add_driver(&ddc_driver)) { if (i2c_add_driver(&ddc_driver)) {
DRM_ERROR("failed to register ddc i2c driver\n"); DRM_ERROR("failed to register ddc i2c driver\n");
ret = -ENOENT; ret = -ENOENT;
goto err_iomap; goto err_resource;
} }
hdata->ddc_port = hdmi_ddc; hdata->ddc_port = hdmi_ddc;
...@@ -2398,16 +2390,9 @@ static int __devinit hdmi_probe(struct platform_device *pdev) ...@@ -2398,16 +2390,9 @@ static int __devinit hdmi_probe(struct platform_device *pdev)
i2c_del_driver(&hdmiphy_driver); i2c_del_driver(&hdmiphy_driver);
err_ddc: err_ddc:
i2c_del_driver(&ddc_driver); i2c_del_driver(&ddc_driver);
err_iomap:
iounmap(hdata->regs);
err_req_region:
release_mem_region(hdata->regs_res->start,
resource_size(hdata->regs_res));
err_resource: err_resource:
hdmi_resources_cleanup(hdata); hdmi_resources_cleanup(hdata);
err_data: err_data:
kfree(hdata);
kfree(drm_hdmi_ctx);
return ret; return ret;
} }
...@@ -2425,18 +2410,11 @@ static int __devexit hdmi_remove(struct platform_device *pdev) ...@@ -2425,18 +2410,11 @@ static int __devexit hdmi_remove(struct platform_device *pdev)
hdmi_resources_cleanup(hdata); hdmi_resources_cleanup(hdata);
iounmap(hdata->regs);
release_mem_region(hdata->regs_res->start,
resource_size(hdata->regs_res));
/* hdmiphy i2c driver */ /* hdmiphy i2c driver */
i2c_del_driver(&hdmiphy_driver); i2c_del_driver(&hdmiphy_driver);
/* DDC i2c driver */ /* DDC i2c driver */
i2c_del_driver(&ddc_driver); i2c_del_driver(&ddc_driver);
kfree(hdata);
return 0; return 0;
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册