From: Kieran Bingham <kieran.bingham+renesas@xxxxxxxxxxxxxxxx> This boolean is a flag used to handle the regulator when our multi-max9286 workaround is in place. It shouldn't be in the upstream driver, and is moved out. Signed-off-by: Kieran Bingham <kieran.bingham+renesas@xxxxxxxxxxxxxxxx> --- drivers/media/i2c/max9286.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/drivers/media/i2c/max9286.c b/drivers/media/i2c/max9286.c index 6d63b4ca0a42..69e81b879a9b 100644 --- a/drivers/media/i2c/max9286.c +++ b/drivers/media/i2c/max9286.c @@ -149,7 +149,6 @@ struct max9286_priv { struct v4l2_subdev sd; struct media_pad pads[MAX9286_N_PADS]; struct regulator *regulator; - bool poc_enabled; struct gpio_chip gpio; u8 gpio_state; @@ -1060,8 +1059,6 @@ static int max9286_init(struct device *dev) return ret; } - priv->poc_enabled = true; - ret = max9286_setup(priv); if (ret) { dev_err(dev, "Unable to setup max9286\n"); @@ -1093,7 +1090,6 @@ static int max9286_init(struct device *dev) max9286_v4l2_unregister(priv); err_regulator: regulator_disable(priv->regulator); - priv->poc_enabled = false; return ret; } @@ -1318,8 +1314,7 @@ static int max9286_remove(struct i2c_client *client) max9286_v4l2_unregister(priv); - if (priv->poc_enabled) - regulator_disable(priv->regulator); + regulator_disable(priv->regulator); gpiod_set_value_cansleep(priv->gpiod_pwdn, 0); -- 2.26.0