media/i2c: cleanup mira220 driver.

- For now, only support RGB format.
- Remove commented out code.
- Remove unused code such as mira220_resume and suspend
- change order of CLK and REG perparation
- Mira220-> streaming removed.

Author: philippe baetens

drivers/media/i2c/mira220.c

@@ -1003,13 +1003,9 @@ static const char *const mira220_supply_name[] = {
 #define MIRA220_NUM_SUPPLIES ARRAY_SIZE(mira220_supply_name)
 
 
-// The supported formats. All flip/mirror combinations have the same byte order because the sensor
-// is monochrome
+// Mira220 comes in monochrome and RGB variants. This driver implements the RGB variant.
 
 static const u32 codes[] = {
-	//MEDIA_BUS_FMT_Y8_1X8,
-	//MEDIA_BUS_FMT_Y10_1X10,
-	//MEDIA_BUS_FMT_Y12_1X12,
 	MEDIA_BUS_FMT_SGRBG8_1X8,
 	MEDIA_BUS_FMT_SGRBG10_1X10,
 	MEDIA_BUS_FMT_SGRBG12_1X12,
@@ -1051,7 +1047,6 @@ struct mira220 {
 	struct clk *xclk; /* system clock to MIRA220 */
 	u32 xclk_freq;
 
-	//struct gpio_desc *reset_gpio;
 	struct regulator_bulk_data supplies[MIRA220_NUM_SUPPLIES];
 
 	struct v4l2_ctrl_handler ctrl_handler;
@@ -1071,11 +1066,6 @@ struct mira220 {
 
 	struct mutex mutex;
 
-	/* Streaming on/off */
-	bool streaming;
-
-	/* User specified I2C device address */
-	u32 tbd_client_i2c_addr;
 	struct regmap *regmap;
 };
 
@@ -1096,19 +1086,20 @@ static int mira220_power_on(struct device *dev)
 	if (ret) {
 		dev_err(&client->dev, "%s: failed to enable regulators\n",
 			__func__);
-		return ret;
+		goto reg_off;
 	}
 	ret = clk_prepare_enable(mira220->xclk);
 	if (ret) {
 		dev_err(&client->dev, "%s: failed to enable clock\n", __func__);
-		goto reg_off;
+		goto clk_off;
 	}
-	// gpiod_set_value_cansleep(mira220->reset_gpio, 1);
 	usleep_range(MIRA220_XCLR_MIN_DELAY_US,
 		     MIRA220_XCLR_MIN_DELAY_US + MIRA220_XCLR_DELAY_RANGE_US);
 
 	return 0;
 
+clk_off:
+	clk_disable_unprepare(mira220->xclk);
 reg_off:
 	ret = regulator_bulk_disable(MIRA220_NUM_SUPPLIES, mira220->supplies);
 	return ret;
@@ -1121,8 +1112,8 @@ static int mira220_power_off(struct device *dev)
 	struct mira220 *mira220 = to_mira220(sd);
 	(void)mira220;
 
-	regulator_bulk_disable(MIRA220_NUM_SUPPLIES, mira220->supplies);
 	clk_disable_unprepare(mira220->xclk);
+	regulator_bulk_disable(MIRA220_NUM_SUPPLIES, mira220->supplies);
 
 	return 0;
 }
@@ -1337,7 +1328,6 @@ static int mira220_set_ctrl(struct v4l2_ctrl *ctrl)
 
 	switch (ctrl->id) {
 	case V4L2_CID_ANALOGUE_GAIN:
-		// ret = mira220_write_analog_gain_reg(mira220, ctrl->val);
 		break;
 	case V4L2_CID_EXPOSURE:
 		ret = mira220_write_exposure_reg(mira220, ctrl->val);
@@ -1684,7 +1674,6 @@ static int mira220_start_streaming(struct mira220 *mira220)
 	reg_list = &mira220->mode->reg_list;
 	ret = cci_multi_reg_write(mira220->regmap, reg_list->regs,
 				  reg_list->num_of_regs, NULL);
-	// ret = mira220_write_regs(mira220, reg_list->regs, reg_list->num_of_regs);
 	if (ret) {
 		dev_err(&client->dev, "%s failed to set mode\n", __func__);
 		goto err_rpm_put;
@@ -1742,10 +1731,6 @@ static int mira220_set_stream(struct v4l2_subdev *sd, int enable)
 	int ret = 0;
 
 	mutex_lock(&mira220->mutex);
-	if (mira220->streaming == enable) {
-		mutex_unlock(&mira220->mutex);
-		return 0;
-	}
 
 	if (enable) {
 		/*
@@ -1759,8 +1744,6 @@ static int mira220_set_stream(struct v4l2_subdev *sd, int enable)
 		mira220_stop_streaming(mira220);
 	}
 
-	mira220->streaming = enable;
-
 	mutex_unlock(&mira220->mutex);
 
 	return ret;
@@ -1771,40 +1754,6 @@ static int mira220_set_stream(struct v4l2_subdev *sd, int enable)
 	return ret;
 }
 
-static int __maybe_unused mira220_suspend(struct device *dev)
-{
-	struct i2c_client *client = to_i2c_client(dev);
-	struct v4l2_subdev *sd = i2c_get_clientdata(client);
-	struct mira220 *mira220 = to_mira220(sd);
-
-	if (mira220->streaming)
-		mira220_stop_streaming(mira220);
-
-	return 0;
-}
-
-static int __maybe_unused mira220_resume(struct device *dev)
-{
-	struct i2c_client *client = to_i2c_client(dev);
-	struct v4l2_subdev *sd = i2c_get_clientdata(client);
-	struct mira220 *mira220 = to_mira220(sd);
-	int ret;
-
-	if (mira220->streaming) {
-		ret = mira220_start_streaming(mira220);
-		if (ret)
-			goto error;
-	}
-
-	return 0;
-
-error:
-	mira220_stop_streaming(mira220);
-	mira220->streaming = false;
-
-	return ret;
-}
-
 static int mira220_get_regulators(struct mira220 *mira220)
 {
 	struct i2c_client *client = v4l2_get_subdevdata(&mira220->sd);
@@ -1941,10 +1890,6 @@ static int mira220_init_controls(struct mira220 *mira220)
 				  mira220->mode->hblank, mira220->mode->hblank,
 				  1, mira220->mode->hblank);
 
-	// Make the vblank control read only. This could be changed to allow changing framerate in
-	// runtime, but would require adapting other settings
-	// mira220->vblank->flags |= V4L2_CTRL_FLAG_READ_ONLY;
-
 	// Exposure is indicated in number of lines here
 	// Max is determined by vblank + vsize and Tglob.
 	max_exposure = mira220_calculate_max_exposure_time(