1 files changed, 3 insertions, 3 deletions

diff --git a/drivers/staging/dream/camera/msm_camera.c b/drivers/staging/dream/camera/msm_camera.c
index 7d938772eacc..4f808dc2ca48 100644
--- a/drivers/staging/dream/camera/msm_camera.c
+++ b/drivers/staging/dream/camera/msm_camera.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2008-2009 QUALCOMM Incorporated.
  */
 
-//FIXME: most allocations need not be GFP_ATOMIC
+/* FIXME: most allocations need not be GFP_ATOMIC */
 /* FIXME: management of mutexes */
 /* FIXME: msm_pmem_region_lookup return values */
 /* FIXME: way too many copy to/from user */
@@ -361,7 +361,7 @@ static int __msm_get_frame(struct msm_sync *sync,
         if (!frame->buffer) {
                 pr_err("%s: cannot get frame, invalid lookup address "
                         "y=%x cbcr=%x offset=%d\n",
-                        __FUNCTION__,
+                        __func__,
                         pphy->y_phy,
                         pphy->cbcr_phy,
                         frame->y_off);
@@ -455,7 +455,7 @@ static int msm_disable_vfe(struct msm_sync *sync, void __user *arg)
         return rc;
 }
 
-static struct msm_queue_cmd* __msm_control(struct msm_sync *sync,
+static struct msm_queue_cmd *__msm_control(struct msm_sync *sync,
                 struct msm_control_device_queue *queue,
                 struct msm_queue_cmd *qcmd,
                 int timeout)