Commit ab9a6883 authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Mauro Carvalho Chehab

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: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: default avatarSakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@s-opensource.com>
parent 32471bda
...@@ -737,10 +737,6 @@ static int power_ctrl(struct v4l2_subdev *sd, bool flag) ...@@ -737,10 +737,6 @@ static int power_ctrl(struct v4l2_subdev *sd, bool flag)
if (!dev || !dev->platform_data) if (!dev || !dev->platform_data)
return -ENODEV; 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) { if (flag) {
/* The upstream module driver (written to Crystal /* The upstream module driver (written to Crystal
* Cove) had this logic to pulse the rails low first. * Cove) had this logic to pulse the rails low first.
......
...@@ -547,10 +547,6 @@ static int power_ctrl(struct v4l2_subdev *sd, bool flag) ...@@ -547,10 +547,6 @@ static int power_ctrl(struct v4l2_subdev *sd, bool flag)
if (!dev || !dev->platform_data) if (!dev || !dev->platform_data)
return -ENODEV; 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) { if (flag) {
ret = dev->platform_data->v1p8_ctrl(sd, 1); ret = dev->platform_data->v1p8_ctrl(sd, 1);
usleep_range(60, 90); usleep_range(60, 90);
......
...@@ -454,10 +454,6 @@ static int power_ctrl(struct v4l2_subdev *sd, bool flag) ...@@ -454,10 +454,6 @@ static int power_ctrl(struct v4l2_subdev *sd, bool flag)
if (!dev || !dev->platform_data) if (!dev || !dev->platform_data)
return -ENODEV; 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) { if (flag) {
ret = dev->platform_data->v2p8_ctrl(sd, 1); ret = dev->platform_data->v2p8_ctrl(sd, 1);
if (ret == 0) { if (ret == 0) {
......
...@@ -846,10 +846,6 @@ static int power_ctrl(struct v4l2_subdev *sd, bool flag) ...@@ -846,10 +846,6 @@ static int power_ctrl(struct v4l2_subdev *sd, bool flag)
if (!dev || !dev->platform_data) if (!dev || !dev->platform_data)
return -ENODEV; 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) { if (flag) {
ret |= dev->platform_data->v1p8_ctrl(sd, 1); ret |= dev->platform_data->v1p8_ctrl(sd, 1);
ret |= dev->platform_data->v2p8_ctrl(sd, 1); ret |= dev->platform_data->v2p8_ctrl(sd, 1);
......
...@@ -650,10 +650,6 @@ static int power_ctrl(struct v4l2_subdev *sd, bool flag) ...@@ -650,10 +650,6 @@ static int power_ctrl(struct v4l2_subdev *sd, bool flag)
if (!dev || !dev->platform_data) if (!dev || !dev->platform_data)
return -ENODEV; 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) { if (flag) {
ret = dev->platform_data->v1p8_ctrl(sd, 1); ret = dev->platform_data->v1p8_ctrl(sd, 1);
if (ret == 0) { if (ret == 0) {
......
...@@ -1297,10 +1297,6 @@ static int power_ctrl(struct v4l2_subdev *sd, bool flag) ...@@ -1297,10 +1297,6 @@ static int power_ctrl(struct v4l2_subdev *sd, bool flag)
if (!dev || !dev->platform_data) if (!dev || !dev->platform_data)
return -ENODEV; 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". /* This driver assumes "internal DVDD, PWDNB tied to DOVDD".
* In this set up only gpio0 (XSHUTDN) should be available * In this set up only gpio0 (XSHUTDN) should be available
* but in some products (for example ECS) gpio1 (PWDNB) is * but in some products (for example ECS) gpio1 (PWDNB) is
......
...@@ -712,10 +712,6 @@ static int __power_ctrl(struct v4l2_subdev *sd, bool flag) ...@@ -712,10 +712,6 @@ static int __power_ctrl(struct v4l2_subdev *sd, bool flag)
if (!dev || !dev->platform_data) if (!dev || !dev->platform_data)
return -ENODEV; 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) { if (dev->platform_data->v1p2_ctrl) {
ret = dev->platform_data->v1p2_ctrl(sd, flag); ret = dev->platform_data->v1p2_ctrl(sd, flag);
if (ret) { if (ret) {
......
...@@ -206,7 +206,6 @@ struct camera_vcm_control { ...@@ -206,7 +206,6 @@ struct camera_vcm_control {
struct camera_sensor_platform_data { struct camera_sensor_platform_data {
int (*flisclk_ctrl)(struct v4l2_subdev *subdev, int flag); 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); int (*csi_cfg)(struct v4l2_subdev *subdev, int flag);
bool (*low_fps)(void); bool (*low_fps)(void);
int (*platform_init)(struct i2c_client *); int (*platform_init)(struct i2c_client *);
...@@ -214,9 +213,10 @@ struct camera_sensor_platform_data { ...@@ -214,9 +213,10 @@ struct camera_sensor_platform_data {
char *(*msr_file_name)(void); char *(*msr_file_name)(void);
struct atomisp_camera_caps *(*get_camera_caps)(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 * New G-Min power and GPIO interface to control individual
* lines as implemented on all known camera modules. */ * lines as implemented on all known camera modules.
*/
int (*gpio0_ctrl)(struct v4l2_subdev *subdev, int on); int (*gpio0_ctrl)(struct v4l2_subdev *subdev, int on);
int (*gpio1_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); int (*v1p8_ctrl)(struct v4l2_subdev *subdev, int on);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment