From: Kitae Kim Date: Tue, 22 Jan 2013 11:04:52 +0000 (+0900) Subject: kernel: remove compile warnings. X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f9b514541127f46381b37d77cd0fcc85d9e46e9b;p=sdk%2Femulator%2Femulator-kernel.git kernel: remove compile warnings. remove warnings at virtio-keyboard, virtio-esm, virtio-gl, maru_codec. Signed-off-by: Kitae Kim --- diff --git a/drivers/char/virtio-gl.c b/drivers/char/virtio-gl.c index b71a2b50dccb..647ff691c2b0 100755 --- a/drivers/char/virtio-gl.c +++ b/drivers/char/virtio-gl.c @@ -223,8 +223,7 @@ static int glmem_mmap(struct file *filp, struct vm_area_struct *vma) return 0; } -// FIX ME : fsync parameter 2,3 parameter missing -static int glmem_fsync(struct file *filp, int datasync) +static int glmem_fsync(struct file *filp, loff_t *start, loff_t *end, int datasync) { struct virtio_gl_data *gldata = to_virtio_gl_data(filp); diff --git a/drivers/maru/maru_codec.c b/drivers/maru/maru_codec.c index ec691faa1793..04bbf7cfc765 100644 --- a/drivers/maru/maru_codec.c +++ b/drivers/maru/maru_codec.c @@ -143,7 +143,7 @@ static long svcodec_ioctl(struct file *file, } else if (cmd == CODEC_CMD_GET_MMAP_OFFSET) { value = readl(svcodec->ioaddr + cmd); CODEC_LOG(KERN_DEBUG, - "ioctl: get mmap offset: %d.\n", value); + "ioctl: get mmap offset: %ld.\n", value); } else { CODEC_LOG(KERN_INFO, "ioctl: no command available.\n"); diff --git a/drivers/maru/maru_virtio_esm.c b/drivers/maru/maru_virtio_esm.c index f2cb2d54b929..27b6b88804dd 100644 --- a/drivers/maru/maru_virtio_esm.c +++ b/drivers/maru/maru_virtio_esm.c @@ -100,7 +100,7 @@ static ssize_t esm_read(struct file *f, char __user *buf, size_t len, loff_t *of return 0; } -static ssize_t esm_write(struct inode *i, const char __user *ubuf, size_t len, loff_t *off) +static ssize_t esm_write(struct file *f, const char __user *ubuf, size_t len, loff_t *off) { int err = 0; ssize_t ret = 0; @@ -120,7 +120,11 @@ static ssize_t esm_write(struct inode *i, const char __user *ubuf, size_t len, l } buf[len - 1] = '\0'; - kstrtou16(buf, 10, &vesm->progress.percentage); + ret = kstrtou16(buf, 10, &vesm->progress.percentage); + if (ret < 0) { + VESM_LOG(KERN_ERR, "failed to convert string to integer.\n"); + return ret; + } VESM_LOG(KERN_DEBUG, "boot up progress is [%u] percent done.\n", vesm->progress.percentage); diff --git a/drivers/maru/maru_virtio_keyboard.c b/drivers/maru/maru_virtio_keyboard.c index 15af27a70cbc..be2f68d925ff 100644 --- a/drivers/maru/maru_virtio_keyboard.c +++ b/drivers/maru/maru_virtio_keyboard.c @@ -175,7 +175,7 @@ static int virtio_keyboard_probe(struct virtio_device *vdev) sizeof(struct EmulKbdEvent)); } - ret = virtqueue_add_buf(vkbd->vq, &vkbd->sg, 0, 10, (void *)(10), GFP_ATOMIC); + ret = virtqueue_add_buf(vkbd->vq, vkbd->sg, 0, 10, (void *)(10), GFP_ATOMIC); if (ret < 0) { VKBD_LOG(KERN_ERR, "failed to add buffer to virtqueue.\n"); kfree(vkbd);