[PATCH] ARM: OMAP: camera: c99 style structure

I have attached the patch to update the structures in 16xxcam.c and
sensor file to c99 way and fixes compilation of drivers on h3.

Signed-off-by: Komal Shah <komal_shah802003@yahoo.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

diff --git a/drivers/media/video/omap/camera_core.c b/drivers/media/video/omap/camera_core.c
index 077d2b0b3a93b94c876391708c3320514faf0c02..e9e84b11d167878e6353d6a4db7f58ae1080c711 100644 (file)
--- a/drivers/media/video/omap/camera_core.c
+++ b/drivers/media/video/omap/camera_core.c
@@ -32,7 +32,7 @@
 #include <linux/ctype.h>
 #include <linux/pagemap.h>
 #include <linux/mm.h>
-#include <linux/device.h>
+#include <linux/platform_device.h>
 #include <linux/delay.h>
 #include <linux/interrupt.h>
 #include <linux/videodev.h>

diff --git a/drivers/media/video/omap/omap16xxcam.c b/drivers/media/video/omap/omap16xxcam.c
index 6f85bd25f01e74aa6ec355de0f2ba272f72cdb4a..b2798905e2182252722045744a83e23a562e6b58 100644 (file)
--- a/drivers/media/video/omap/omap16xxcam.c
+++ b/drivers/media/video/omap/omap16xxcam.c
@@ -566,18 +566,18 @@ omap16xxcam_init(void)
 }
 
 struct camera_hardware camera_hardware_if = {
-       version         : 0x01, 
-       name            : "OMAP16xx Camera Parallel", 
-       init            : omap16xxcam_init,
-       cleanup         : omap16xxcam_cleanup,
-       open            : omap16xxcam_open, 
-       close           : omap16xxcam_close,
-       enable          : omap16xxcam_enable, 
-       disable         : omap16xxcam_disable,
-       abort           : omap16xxcam_abort,
-       set_xclk        : omap16xxcam_set_xclk,
-       init_dma        : omap16xxcam_init_dma,
-       start_dma       : omap16xxcam_start_dma,
-       finish_dma      : omap16xxcam_finish_dma,
+       .version        = 0x01,
+       .name           = "OMAP16xx Camera Parallel",
+       .init           = omap16xxcam_init,
+       .cleanup        = omap16xxcam_cleanup,
+       .open           = omap16xxcam_open,
+       .close          = omap16xxcam_close,
+       .enable         = omap16xxcam_enable,
+       .disable        = omap16xxcam_disable,
+       .abort          = omap16xxcam_abort,
+       .set_xclk       = omap16xxcam_set_xclk,
+       .init_dma       = omap16xxcam_init_dma,
+       .start_dma      = omap16xxcam_start_dma,
+       .finish_dma     = omap16xxcam_finish_dma,
 };
 

diff --git a/drivers/media/video/omap/sensor_ov9640.c b/drivers/media/video/omap/sensor_ov9640.c
index c48f401ef923cde7c70ad437807aae6d46f5ac75..9b4606fedbfb4f0afa172f6ab6818a27f858f72f 100644 (file)
--- a/drivers/media/video/omap/sensor_ov9640.c
+++ b/drivers/media/video/omap/sensor_ov9640.c
@@ -1152,19 +1152,19 @@ ov9640sensor_init(struct v4l2_pix_format *pix)
 }
 
 struct camera_sensor camera_sensor_if = {
-       version:        0x01,
-       name:           "OV9640",
-       init:           ov9640sensor_init,
-       cleanup:        ov9640sensor_cleanup, 
-       enum_pixformat: ov9640sensor_enum_pixformat,
-       try_format:     ov9640sensor_try_format,
-       calc_xclk:      ov9640sensor_calc_xclk,
-       configure:      ov9640sensor_configure,
-       query_control:  ov9640sensor_query_control, 
-       get_control:    ov9640sensor_get_control, 
-       set_control:    ov9640sensor_set_control,
-       power_on:       ov9640sensor_power_on,
-       power_off:      ov9640sensor_power_off,
+       .version        = 0x01,
+       .name           = "OV9640",
+       .init           = ov9640sensor_init,
+       .cleanup        = ov9640sensor_cleanup,
+       .enum_pixformat = ov9640sensor_enum_pixformat,
+       .try_format     = ov9640sensor_try_format,
+       .calc_xclk      = ov9640sensor_calc_xclk,
+       .configure      = ov9640sensor_configure,
+       .query_control  = ov9640sensor_query_control,
+       .get_control    = ov9640sensor_get_control,
+       .set_control    = ov9640sensor_set_control,
+       .power_on       = ov9640sensor_power_on,
+       .power_off      = ov9640sensor_power_off,
 };
 
 void print_ov9640_regs(void *priv)

diff --git a/drivers/net/irda/omap1610-ir.c b/drivers/net/irda/omap1610-ir.c
index 8d503ba033b861dd393f676ec85b0ab249e6ec9c..88163b78ca30ae6d4178eebf4e178f7817010bf1 100644 (file)
--- a/drivers/net/irda/omap1610-ir.c
+++ b/drivers/net/irda/omap1610-ir.c
@@ -54,6 +54,7 @@
 #include <linux/delay.h>
 #include <linux/ioport.h>
 #include <linux/dma-mapping.h>
+#include <linux/platform_device.h>
 
 #include <net/irda/irda.h>
 #include <net/irda/irmod.h>