Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

media: i2c: imx219: Name all subdev state variables 'state'

Subdev state variables are named with a mix of 'state' and 'sd_state'
through the driver. To improve consistency, name them all 'state'.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>

authored by

Laurent Pinchart and committed by
Hans Verkuil
bf313f99 0af46fbc

+7 -7
+7 -7
drivers/media/i2c/imx219.c
··· 774 774 } 775 775 776 776 static int imx219_enum_mbus_code(struct v4l2_subdev *sd, 777 - struct v4l2_subdev_state *sd_state, 777 + struct v4l2_subdev_state *state, 778 778 struct v4l2_subdev_mbus_code_enum *code) 779 779 { 780 780 struct imx219 *imx219 = to_imx219(sd); ··· 788 788 } 789 789 790 790 static int imx219_enum_frame_size(struct v4l2_subdev *sd, 791 - struct v4l2_subdev_state *sd_state, 791 + struct v4l2_subdev_state *state, 792 792 struct v4l2_subdev_frame_size_enum *fse) 793 793 { 794 794 struct imx219 *imx219 = to_imx219(sd); ··· 810 810 } 811 811 812 812 static int imx219_set_pad_format(struct v4l2_subdev *sd, 813 - struct v4l2_subdev_state *sd_state, 813 + struct v4l2_subdev_state *state, 814 814 struct v4l2_subdev_format *fmt) 815 815 { 816 816 struct imx219 *imx219 = to_imx219(sd); ··· 827 827 828 828 imx219_update_pad_format(imx219, mode, &fmt->format, fmt->format.code); 829 829 830 - format = v4l2_subdev_get_pad_format(sd, sd_state, 0); 830 + format = v4l2_subdev_get_pad_format(sd, state, 0); 831 831 *format = fmt->format; 832 832 833 833 /* ··· 837 837 bin_h = min(IMX219_PIXEL_ARRAY_WIDTH / format->width, 2U); 838 838 bin_v = min(IMX219_PIXEL_ARRAY_HEIGHT / format->height, 2U); 839 839 840 - crop = v4l2_subdev_get_pad_crop(sd, sd_state, 0); 840 + crop = v4l2_subdev_get_pad_crop(sd, state, 0); 841 841 crop->width = format->width * bin_h; 842 842 crop->height = format->height * bin_v; 843 843 crop->left = (IMX219_NATIVE_WIDTH - crop->width) / 2; ··· 872 872 } 873 873 874 874 static int imx219_get_selection(struct v4l2_subdev *sd, 875 - struct v4l2_subdev_state *sd_state, 875 + struct v4l2_subdev_state *state, 876 876 struct v4l2_subdev_selection *sel) 877 877 { 878 878 switch (sel->target) { 879 879 case V4L2_SEL_TGT_CROP: { 880 - sel->r = *v4l2_subdev_get_pad_crop(sd, sd_state, 0); 880 + sel->r = *v4l2_subdev_get_pad_crop(sd, state, 0); 881 881 return 0; 882 882 } 883 883