summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Vetter2014-01-23 16:28:50 +0100
committerDaniel Vetter2014-03-13 12:48:42 +0100
commitba0c2422d7cda623acbbcde24542b52c4999bc84 (patch)
tree5bab0e71b5a6e915347828be669b135e0e4b147c
parentdrm/modes: remove drm_mode_height/width (diff)
downloadkernel-qcow2-linux-ba0c2422d7cda623acbbcde24542b52c4999bc84.tar.gz
kernel-qcow2-linux-ba0c2422d7cda623acbbcde24542b52c4999bc84.tar.xz
kernel-qcow2-linux-ba0c2422d7cda623acbbcde24542b52c4999bc84.zip
drm/modes: drop return value from drm_display_mode_from_videomode
It never fails and no one ever checked anyway. Reviewed-by: Alex Deucher <alexander.deucher@amd.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
-rw-r--r--drivers/gpu/drm/drm_modes.c6
-rw-r--r--include/drm/drm_modes.h4
2 files changed, 4 insertions, 6 deletions
diff --git a/drivers/gpu/drm/drm_modes.c b/drivers/gpu/drm/drm_modes.c
index ee3e969beeb1..df358f657a13 100644
--- a/drivers/gpu/drm/drm_modes.c
+++ b/drivers/gpu/drm/drm_modes.c
@@ -562,8 +562,8 @@ drm_gtf_mode(struct drm_device *dev, int hdisplay, int vdisplay, int vrefresh,
EXPORT_SYMBOL(drm_gtf_mode);
#ifdef CONFIG_VIDEOMODE_HELPERS
-int drm_display_mode_from_videomode(const struct videomode *vm,
- struct drm_display_mode *dmode)
+void drm_display_mode_from_videomode(const struct videomode *vm,
+ struct drm_display_mode *dmode)
{
dmode->hdisplay = vm->hactive;
dmode->hsync_start = dmode->hdisplay + vm->hfront_porch;
@@ -593,8 +593,6 @@ int drm_display_mode_from_videomode(const struct videomode *vm,
if (vm->flags & DISPLAY_FLAGS_DOUBLECLK)
dmode->flags |= DRM_MODE_FLAG_DBLCLK;
drm_mode_set_name(dmode);
-
- return 0;
}
EXPORT_SYMBOL_GPL(drm_display_mode_from_videomode);
diff --git a/include/drm/drm_modes.h b/include/drm/drm_modes.h
index 2769b05f7458..b23628b22cff 100644
--- a/include/drm/drm_modes.h
+++ b/include/drm/drm_modes.h
@@ -188,8 +188,8 @@ struct drm_display_mode *drm_gtf_mode_complex(struct drm_device *dev,
int margins,
int GTF_M, int GTF_2C,
int GTF_K, int GTF_2J);
-int drm_display_mode_from_videomode(const struct videomode *vm,
- struct drm_display_mode *dmode);
+void drm_display_mode_from_videomode(const struct videomode *vm,
+ struct drm_display_mode *dmode);
int of_get_drm_display_mode(struct device_node *np,
struct drm_display_mode *dmode,
int index);