Commit ad298055 authored by Frank Schaefer's avatar Frank Schaefer Committed by Mauro Carvalho Chehab
Browse files

[media] em28xx-video: simplify usage of the pointer to struct... 


[media] em28xx-video: simplify usage of the pointer to struct v4l2_ctrl_handler in em28xx_v4l2_init()

The local var hdl is already pointing to &dev->ctrl_handler.
Use it, instead of dereferencing it all the time.

Code cleanup. No functional changes.

Signed-off-by: default avatarFrank Schäfer <fschaefer.oss@googlemail.com>
Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <m.chehab@samsung.com>
parent 6743033e

drivers/media/usb/em28xx/em28xx-video.c

+14 −14
Original line number Diff line number Diff line
@@ -2399,35 +2399,35 @@ static int em28xx_v4l2_init(struct em28xx *dev) 
	/* Add image controls */

	/* NOTE: at this point, the subdevices are already registered, so bridge

	 * controls are only added/enabled when no subdevice provides them */

	if (NULL == v4l2_ctrl_find(&dev->ctrl_handler, V4L2_CID_CONTRAST))

		v4l2_ctrl_new_std(&dev->ctrl_handler, &em28xx_ctrl_ops,

	if (NULL == v4l2_ctrl_find(hdl, V4L2_CID_CONTRAST))

		v4l2_ctrl_new_std(hdl, &em28xx_ctrl_ops,

				  V4L2_CID_CONTRAST,

				  0, 0x1f, 1, CONTRAST_DEFAULT);

	if (NULL == v4l2_ctrl_find(&dev->ctrl_handler, V4L2_CID_BRIGHTNESS))

		v4l2_ctrl_new_std(&dev->ctrl_handler, &em28xx_ctrl_ops,

	if (NULL == v4l2_ctrl_find(hdl, V4L2_CID_BRIGHTNESS))

		v4l2_ctrl_new_std(hdl, &em28xx_ctrl_ops,

				  V4L2_CID_BRIGHTNESS,

				  -0x80, 0x7f, 1, BRIGHTNESS_DEFAULT);

	if (NULL == v4l2_ctrl_find(&dev->ctrl_handler, V4L2_CID_SATURATION))

		v4l2_ctrl_new_std(&dev->ctrl_handler, &em28xx_ctrl_ops,

	if (NULL == v4l2_ctrl_find(hdl, V4L2_CID_SATURATION))

		v4l2_ctrl_new_std(hdl, &em28xx_ctrl_ops,

				  V4L2_CID_SATURATION,

				  0, 0x1f, 1, SATURATION_DEFAULT);

	if (NULL == v4l2_ctrl_find(&dev->ctrl_handler, V4L2_CID_BLUE_BALANCE))

		v4l2_ctrl_new_std(&dev->ctrl_handler, &em28xx_ctrl_ops,

	if (NULL == v4l2_ctrl_find(hdl, V4L2_CID_BLUE_BALANCE))

		v4l2_ctrl_new_std(hdl, &em28xx_ctrl_ops,

				  V4L2_CID_BLUE_BALANCE,

				  -0x30, 0x30, 1, BLUE_BALANCE_DEFAULT);

	if (NULL == v4l2_ctrl_find(&dev->ctrl_handler, V4L2_CID_RED_BALANCE))

		v4l2_ctrl_new_std(&dev->ctrl_handler, &em28xx_ctrl_ops,

	if (NULL == v4l2_ctrl_find(hdl, V4L2_CID_RED_BALANCE))

		v4l2_ctrl_new_std(hdl, &em28xx_ctrl_ops,

				  V4L2_CID_RED_BALANCE,

				  -0x30, 0x30, 1, RED_BALANCE_DEFAULT);

	if (NULL == v4l2_ctrl_find(&dev->ctrl_handler, V4L2_CID_SHARPNESS))

		v4l2_ctrl_new_std(&dev->ctrl_handler, &em28xx_ctrl_ops,

	if (NULL == v4l2_ctrl_find(hdl, V4L2_CID_SHARPNESS))

		v4l2_ctrl_new_std(hdl, &em28xx_ctrl_ops,

				  V4L2_CID_SHARPNESS,

				  0, 0x0f, 1, SHARPNESS_DEFAULT);



	/* Reset image controls */

	em28xx_colorlevels_set_default(dev);

	v4l2_ctrl_handler_setup(&dev->ctrl_handler);

	ret = dev->ctrl_handler.error;

	v4l2_ctrl_handler_setup(hdl);

	ret = hdl->error;

	if (ret)

		goto unregister_dev;

CRA Git | Maintained and supported by SUSTech CRA and CCSE