openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

media: staging: atomisp: Remove ->power_ctrl() callback 

There is redundant callback which does nothing in upstreamed version of
the driver.

Remove it along with user call places.

Mostly done with help of coccinelle.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
This commit is contained in:
Andy Shevchenko 2017-09-27 14:25:03 -04:00 committed by Mauro Carvalho Chehab
parent 32471bdaa2
commit ab9a68834a
8 changed files with 4 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/staging/media/atomisp/i2c/atomisp-gc0310.c
View File

@ -737,10 +737,6 @@ static int power_ctrl(struct v4l2_subdev *sd, bool flag)
if (!dev || !dev->platform_data)
return -ENODEV;
/* Non-gmin platforms use the legacy callback */
if (dev->platform_data->power_ctrl)
return dev->platform_data->power_ctrl(sd, flag);
if (flag) {
/* The upstream module driver (written to Crystal
* Cove) had this logic to pulse the rails low first.

4
drivers/staging/media/atomisp/i2c/atomisp-gc2235.c
View File

@ -547,10 +547,6 @@ static int power_ctrl(struct v4l2_subdev *sd, bool flag)
if (!dev || !dev->platform_data)
return -ENODEV;
/* Non-gmin platforms use the legacy callback */
if (dev->platform_data->power_ctrl)
return dev->platform_data->power_ctrl(sd, flag);
if (flag) {
ret = dev->platform_data->v1p8_ctrl(sd, 1);
usleep_range(60, 90);

4
drivers/staging/media/atomisp/i2c/atomisp-mt9m114.c
View File

@ -454,10 +454,6 @@ static int power_ctrl(struct v4l2_subdev *sd, bool flag)
if (!dev || !dev->platform_data)
return -ENODEV;
/* Non-gmin platforms use the legacy callback */
if (dev->platform_data->power_ctrl)
return dev->platform_data->power_ctrl(sd, flag);
if (flag) {
ret = dev->platform_data->v2p8_ctrl(sd, 1);
if (ret == 0) {

4
drivers/staging/media/atomisp/i2c/atomisp-ov2680.c
View File

@ -846,10 +846,6 @@ static int power_ctrl(struct v4l2_subdev *sd, bool flag)
if (!dev || !dev->platform_data)
return -ENODEV;
/* Non-gmin platforms use the legacy callback */
if (dev->platform_data->power_ctrl)
return dev->platform_data->power_ctrl(sd, flag);
if (flag) {
ret |= dev->platform_data->v1p8_ctrl(sd, 1);
ret |= dev->platform_data->v2p8_ctrl(sd, 1);

4
drivers/staging/media/atomisp/i2c/atomisp-ov2722.c
View File

@ -650,10 +650,6 @@ static int power_ctrl(struct v4l2_subdev *sd, bool flag)
if (!dev || !dev->platform_data)
return -ENODEV;
/* Non-gmin platforms use the legacy callback */
if (dev->platform_data->power_ctrl)
return dev->platform_data->power_ctrl(sd, flag);
if (flag) {
ret = dev->platform_data->v1p8_ctrl(sd, 1);
if (ret == 0) {

4
drivers/staging/media/atomisp/i2c/ov5693/atomisp-ov5693.c
View File

@ -1297,10 +1297,6 @@ static int power_ctrl(struct v4l2_subdev *sd, bool flag)
if (!dev || !dev->platform_data)
return -ENODEV;
/* Non-gmin platforms use the legacy callback */
if (dev->platform_data->power_ctrl)
return dev->platform_data->power_ctrl(sd, flag);
/* This driver assumes "internal DVDD, PWDNB tied to DOVDD".
* In this set up only gpio0 (XSHUTDN) should be available
* but in some products (for example ECS) gpio1 (PWDNB) is

4
drivers/staging/media/atomisp/i2c/ov8858.c
View File

@ -712,10 +712,6 @@ static int __power_ctrl(struct v4l2_subdev *sd, bool flag)
if (!dev || !dev->platform_data)
return -ENODEV;
/* Non-gmin platforms use the legacy callback */
if (dev->platform_data->power_ctrl)
return dev->platform_data->power_ctrl(sd, flag);
if (dev->platform_data->v1p2_ctrl) {
ret = dev->platform_data->v1p2_ctrl(sd, flag);
if (ret) {

8
drivers/staging/media/atomisp/include/linux/atomisp_platform.h
View File

@ -206,7 +206,6 @@ struct camera_vcm_control {
struct camera_sensor_platform_data {
int (*flisclk_ctrl)(struct v4l2_subdev *subdev, int flag);
int (*power_ctrl)(struct v4l2_subdev *subdev, int flag);
int (*csi_cfg)(struct v4l2_subdev *subdev, int flag);
bool (*low_fps)(void);
int (*platform_init)(struct i2c_client *);
@ -214,9 +213,10 @@ struct camera_sensor_platform_data {
char *(*msr_file_name)(void);
struct atomisp_camera_caps *(*get_camera_caps)(void);
/* New G-Min power and GPIO interface, replaces
* power/gpio_ctrl with methods to control individual
* lines as implemented on all known camera modules. */
/*
* New G-Min power and GPIO interface to control individual
* lines as implemented on all known camera modules.
*/
int (*gpio0_ctrl)(struct v4l2_subdev *subdev, int on);
int (*gpio1_ctrl)(struct v4l2_subdev *subdev, int on);
int (*v1p8_ctrl)(struct v4l2_subdev *subdev, int on);