aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/video/fbdev/omap2/dss/hdmi_wp.c
diff options
context:
space:
mode:
authorTomi Valkeinen <tomi.valkeinen@ti.com>2014-05-23 14:37:44 +0300
committerTomi Valkeinen <tomi.valkeinen@ti.com>2014-05-23 14:37:44 +0300
commitfc2daf3b1df0fd751df7dd16652f45fa407bd1cb (patch)
treef1b9c88205bd27a3ae8284d1a42b8928fa852428 /drivers/video/fbdev/omap2/dss/hdmi_wp.c
parentOMAPDSS: panel NEC-NL8048HL11 DT support (diff)
downloadlinux-dev-fc2daf3b1df0fd751df7dd16652f45fa407bd1cb.tar.xz
linux-dev-fc2daf3b1df0fd751df7dd16652f45fa407bd1cb.zip
OMAPDSS: HDMI: cleanup WP ioremaps
Commit 59b3d38a3691396783df108e6afbba30656edccb missed cleaning up the hdmi_wp.c file. Clean up hdmi_wp.c the same way as the others. Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Diffstat (limited to 'drivers/video/fbdev/omap2/dss/hdmi_wp.c')
-rw-r--r--drivers/video/fbdev/omap2/dss/hdmi_wp.c21
1 files changed, 3 insertions, 18 deletions
diff --git a/drivers/video/fbdev/omap2/dss/hdmi_wp.c b/drivers/video/fbdev/omap2/dss/hdmi_wp.c
index a16a190e191d..b4520972ef3e 100644
--- a/drivers/video/fbdev/omap2/dss/hdmi_wp.c
+++ b/drivers/video/fbdev/omap2/dss/hdmi_wp.c
@@ -243,29 +243,14 @@ int hdmi_wp_audio_core_req_enable(struct hdmi_wp_data *wp, bool enable)
int hdmi_wp_init(struct platform_device *pdev, struct hdmi_wp_data *wp)
{
struct resource *res;
- struct resource temp_res;
res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "wp");
if (!res) {
- DSSDBG("can't get WP mem resource by name\n");
- /*
- * if hwmod/DT doesn't have the memory resource information
- * split into HDMI sub blocks by name, we try again by getting
- * the platform's first resource. this code will be removed when
- * the driver can get the mem resources by name
- */
- res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
- if (!res) {
- DSSERR("can't get WP mem resource\n");
- return -EINVAL;
- }
-
- temp_res.start = res->start;
- temp_res.end = temp_res.start + WP_SIZE - 1;
- res = &temp_res;
+ DSSERR("can't get WP mem resource\n");
+ return -EINVAL;
}
- wp->base = devm_ioremap(&pdev->dev, res->start, resource_size(res));
+ wp->base = devm_ioremap_resource(&pdev->dev, res);
if (!wp->base) {
DSSERR("can't ioremap HDMI WP\n");
return -ENOMEM;