aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/video
diff options
context:
space:
mode:
authorNicholas Mc Guire <der.herr@hofr.at>2015-01-29 05:24:16 -0500
committerTomi Valkeinen <tomi.valkeinen@ti.com>2015-03-10 08:37:46 -0400
commit7dea97e0379dbb2983a9f009c7cdaeb6bbe4c98e (patch)
treefa41a66de217928d09cca6677628a8b437093f6f /drivers/video
parent17713ce09d95fa79a1bf8f8604ecea9c6e1924aa (diff)
hyperv: hyperv_fb: match wait_for_completion_timeout return type
The return type of wait_for_completion_timeout is unsigned long not int. This patch fixes up the declarations only. Signed-off-by: Nicholas Mc Guire <der.herr@hofr.at> Reviewed-by: Vitaly Kuznetsov <vkuznets@redhat.com> Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Diffstat (limited to 'drivers/video')
-rw-r--r--drivers/video/fbdev/hyperv_fb.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/video/fbdev/hyperv_fb.c b/drivers/video/fbdev/hyperv_fb.c
index 42543362f163..807ee22ef229 100644
--- a/drivers/video/fbdev/hyperv_fb.c
+++ b/drivers/video/fbdev/hyperv_fb.c
@@ -415,7 +415,8 @@ static int synthvid_negotiate_ver(struct hv_device *hdev, u32 ver)
415 struct fb_info *info = hv_get_drvdata(hdev); 415 struct fb_info *info = hv_get_drvdata(hdev);
416 struct hvfb_par *par = info->par; 416 struct hvfb_par *par = info->par;
417 struct synthvid_msg *msg = (struct synthvid_msg *)par->init_buf; 417 struct synthvid_msg *msg = (struct synthvid_msg *)par->init_buf;
418 int t, ret = 0; 418 int ret = 0;
419 unsigned long t;
419 420
420 memset(msg, 0, sizeof(struct synthvid_msg)); 421 memset(msg, 0, sizeof(struct synthvid_msg));
421 msg->vid_hdr.type = SYNTHVID_VERSION_REQUEST; 422 msg->vid_hdr.type = SYNTHVID_VERSION_REQUEST;
@@ -488,7 +489,8 @@ static int synthvid_send_config(struct hv_device *hdev)
488 struct fb_info *info = hv_get_drvdata(hdev); 489 struct fb_info *info = hv_get_drvdata(hdev);
489 struct hvfb_par *par = info->par; 490 struct hvfb_par *par = info->par;
490 struct synthvid_msg *msg = (struct synthvid_msg *)par->init_buf; 491 struct synthvid_msg *msg = (struct synthvid_msg *)par->init_buf;
491 int t, ret = 0; 492 int ret = 0;
493 unsigned long t;
492 494
493 /* Send VRAM location */ 495 /* Send VRAM location */
494 memset(msg, 0, sizeof(struct synthvid_msg)); 496 memset(msg, 0, sizeof(struct synthvid_msg));