media: cx25840: Address several coding style issues (10a34367) · Commits · 戴 / test

drivers/media/i2c/cx25840/cx25840-core.c

+591 −324

File changed.

Preview size limit exceeded, changes collapsed.

drivers/media/i2c/cx25840/cx25840-core.h

+9 −6

Original line number	Diff line number	Diff line
		@@ -16,7 +16,6 @@
		#ifndef _CX25840_CORE_H_
		#define _CX25840_CORE_H_


		#include <linux/videodev2.h>
		#include <media/v4l2-device.h>
		#include <media/v4l2-ctrls.h>
		@@ -100,7 +99,7 @@ struct cx25840_state {
		enum cx25840_model id;
		u32 rev;
		int is_initialized;
		unsigned vbi_regs_offset;
		unsigned int vbi_regs_offset;
		wait_queue_head_t fw_wait;
		struct work_struct fw_work;
		struct cx25840_ir_state *ir_state;
		@@ -166,7 +165,8 @@ int cx25840_write(struct i2c_client *client, u16 addr, u8 value);
		int cx25840_write4(struct i2c_client *client, u16 addr, u32 value);
		u8 cx25840_read(struct i2c_client *client, u16 addr);
		u32 cx25840_read4(struct i2c_client *client, u16 addr);
		int cx25840_and_or(struct i2c_client *client, u16 addr, unsigned mask, u8 value);
		int cx25840_and_or(struct i2c_client *client, u16 addr, unsigned int mask,
		u8 value);
		int cx25840_and_or4(struct i2c_client *client, u16 addr, u32 and_mask,
		u32 or_value);
		void cx25840_std_setup(struct i2c_client *client);
		@@ -185,9 +185,12 @@ extern const struct v4l2_ctrl_ops cx25840_audio_ctrl_ops;
		/* ----------------------------------------------------------------------- */
		/* cx25850-vbi.c */
		int cx25840_s_raw_fmt(struct v4l2_subdev sd, struct v4l2_vbi_format fmt);
		int cx25840_s_sliced_fmt(struct v4l2_subdev sd, struct v4l2_sliced_vbi_format fmt);
		int cx25840_g_sliced_fmt(struct v4l2_subdev sd, struct v4l2_sliced_vbi_format fmt);
		int cx25840_decode_vbi_line(struct v4l2_subdev sd, struct v4l2_decode_vbi_line vbi);
		int cx25840_s_sliced_fmt(struct v4l2_subdev *sd,
		struct v4l2_sliced_vbi_format *fmt);
		int cx25840_g_sliced_fmt(struct v4l2_subdev *sd,
		struct v4l2_sliced_vbi_format *fmt);
		int cx25840_decode_vbi_line(struct v4l2_subdev *sd,
		struct v4l2_decode_vbi_line *vbi);

		/* ----------------------------------------------------------------------- */
		/* cx25850-ir.c */

include/media/drv-intf/cx25840.h

+19 −14

Original line number	Diff line number	Diff line
		/* SPDX-License-Identifier: GPL-2.0-or-later */
		/*
		cx25840.h - definition for cx25840/1/2/3 inputs

		Copyright (C) 2006 Hans Verkuil (hverkuil@xs4all.nl)

		/*
		* cx25840.h - definition for cx25840/1/2/3 inputs
		*
		* Copyright (C) 2006 Hans Verkuil (hverkuil@xs4all.nl)
		*/

		#ifndef _CX25840_H_
		@@ -38,8 +38,10 @@ enum cx25840_video_input {
		CX25840_COMPOSITE7,
		CX25840_COMPOSITE8,

		/* S-Video inputs consist of one luma input (In1-In8) ORed with one
		chroma input (In5-In8) */
		/*
		* S-Video inputs consist of one luma input (In1-In8) ORed with one
		* chroma input (In5-In8)
		*/
		CX25840_SVIDEO_LUMA1 = 0x10,
		CX25840_SVIDEO_LUMA2 = 0x20,
		CX25840_SVIDEO_LUMA3 = 0x30,
		@@ -243,13 +245,16 @@ enum cx23885_io_pad {
		CX23885_PAD_GPIO16,
		};

		/* pvr150_workaround activates a workaround for a hardware bug that is
		present in Hauppauge PVR-150 (and possibly PVR-500) cards that have
		certain NTSC tuners (tveeprom tuner model numbers 85, 99 and 112). The
		audio autodetect fails on some channels for these models and the workaround
		is to select the audio standard explicitly. Many thanks to Hauppauge for
		providing this information.
		This platform data only needs to be supplied by the ivtv driver. */
		/*
		* pvr150_workaround activates a workaround for a hardware bug that is
		* present in Hauppauge PVR-150 (and possibly PVR-500) cards that have
		* certain NTSC tuners (tveeprom tuner model numbers 85, 99 and 112). The
		* audio autodetect fails on some channels for these models and the workaround
		* is to select the audio standard explicitly. Many thanks to Hauppauge for
		* providing this information.
		*
		* This platform data only needs to be supplied by the ivtv driver.
		*/
		struct cx25840_platform_data {
		int pvr150_workaround;
		};

Admin message