diff options
| author | Yuxi Sun <b36102@freescale.com> | 2011-05-18 14:02:45 +0800 |
|---|---|---|
| committer | Jason Liu <r64343@freescale.com> | 2012-01-09 20:08:39 +0800 |
| commit | f16600ede736421409490c1c9421a043dec348ac (patch) | |
| tree | 2b1d4cc97061381981d250ce9b85f669665dc342 /drivers/media/video/mxc/capture/ov5640.c | |
| parent | 3504aa9fe829f9a3b952e28c0176f1735d96de83 (diff) | |
ENGR00143550 camera: change camera platform data name and remove unused function
Change camera platform data name from mxc_camera_platform_data to
fsl_mxc_camera_platform_data in accordence with include/linux/fsl_devices.h
and remove unused function gpio_sensor_active(),gpio_sensor_inactive().
Signed-off-by: Yuxi Sun <b36102@freescale.com>
Diffstat (limited to 'drivers/media/video/mxc/capture/ov5640.c')
| -rw-r--r-- | drivers/media/video/mxc/capture/ov5640.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/drivers/media/video/mxc/capture/ov5640.c b/drivers/media/video/mxc/capture/ov5640.c index cd4b61b460c9..69bbd2a678d5 100644 --- a/drivers/media/video/mxc/capture/ov5640.c +++ b/drivers/media/video/mxc/capture/ov5640.c @@ -747,7 +747,7 @@ static struct regulator *io_regulator; static struct regulator *core_regulator; static struct regulator *analog_regulator; static struct regulator *gpo_regulator; -static struct mxc_camera_platform_data *camera_plat; +static struct fsl_mxc_camera_platform_data *camera_plat; static int ov5640_probe(struct i2c_client *adapter, const struct i2c_device_id *device_id); @@ -773,8 +773,6 @@ static struct i2c_driver ov5640_i2c_driver = { .id_table = ov5640_id, }; -extern void gpio_sensor_active(unsigned int csi_index); -extern void gpio_sensor_inactive(unsigned int csi); static s32 ov5640_write_reg(u16 reg, u8 val) { @@ -908,7 +906,6 @@ static int ioctl_s_power(struct v4l2_int_device *s, int on) struct sensor *sensor = s->priv; if (on && !sensor->on) { - gpio_sensor_active(ov5640_data.csi); if (io_regulator) if (regulator_enable(io_regulator) != 0) return -EIO; @@ -934,7 +931,6 @@ static int ioctl_s_power(struct v4l2_int_device *s, int on) regulator_disable(io_regulator); if (gpo_regulator) regulator_disable(gpo_regulator); - gpio_sensor_inactive(ov5640_data.csi); } sensor->on = on; @@ -1264,7 +1260,6 @@ static int ioctl_dev_init(struct v4l2_int_device *s) u32 tgt_fps; /* target frames per secound */ enum ov5640_frame_rate frame_rate; - gpio_sensor_active(ov5640_data.csi); ov5640_data.on = true; /* mclk */ @@ -1299,8 +1294,6 @@ static int ioctl_dev_init(struct v4l2_int_device *s) */ static int ioctl_dev_exit(struct v4l2_int_device *s) { - gpio_sensor_inactive(ov5640_data.csi); - return 0; } @@ -1358,7 +1351,7 @@ static int ov5640_probe(struct i2c_client *client, const struct i2c_device_id *id) { int retval; - struct mxc_camera_platform_data *plat_data = client->dev.platform_data; + struct fsl_mxc_camera_platform_data *plat_data = client->dev.platform_data; /* Set initial values for the sensor struct. */ memset(&ov5640_data, 0, sizeof(ov5640_data)); |