system/linux
system/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux synced 2024-10-15 15:59:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

media: cx25840: Address several coding style issues

Browse source 
As we did a major change on this file, let's take the moment
to cleanup several coding style issues on it.

This patch was partially done with the help of two tools:

	./scripts/checkpatch.pl --fix-inplace --strict
	astyle --indent=tab=8 --style=linux

But manually adjusted in order to fit our style.

Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
This commit is contained in:
Mauro Carvalho Chehab 2019-05-28 17:42:56 -04:00
parent 63f9fa925e
commit 10a34367ce
3 changed files with 618 additions and 343 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

913
drivers/media/i2c/cx25840/cx25840-core.c
View file

File diff suppressed because it is too large Load diff

15
drivers/media/i2c/cx25840/cx25840-core.h
View file

@ -16,7 +16,6 @@
#ifndef _CX25840_CORE_H_ #ifndef _CX25840_CORE_H_
#define _CX25840_CORE_H_ #define _CX25840_CORE_H_
#include <linux/videodev2.h> #include <linux/videodev2.h>
#include <media/v4l2-device.h> #include <media/v4l2-device.h>
#include <media/v4l2-ctrls.h> #include <media/v4l2-ctrls.h>
@ -100,7 +99,7 @@ struct cx25840_state {
enum cx25840_model id; enum cx25840_model id;
u32 rev; u32 rev;
int is_initialized; int is_initialized;
unsigned vbi_regs_offset; unsigned int vbi_regs_offset;
wait_queue_head_t fw_wait; wait_queue_head_t fw_wait;
struct work_struct fw_work; struct work_struct fw_work;
struct cx25840_ir_state *ir_state; 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); int cx25840_write4(struct i2c_client *client, u16 addr, u32 value);
u8 cx25840_read(struct i2c_client *client, u16 addr); u8 cx25840_read(struct i2c_client *client, u16 addr);
u32 cx25840_read4(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, int cx25840_and_or4(struct i2c_client *client, u16 addr, u32 and_mask,
u32 or_value); u32 or_value);
void cx25840_std_setup(struct i2c_client *client); 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 */ /* cx25850-vbi.c */
int cx25840_s_raw_fmt(struct v4l2_subdev *sd, struct v4l2_vbi_format *fmt); 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_s_sliced_fmt(struct v4l2_subdev *sd,
int cx25840_g_sliced_fmt(struct v4l2_subdev *sd, struct v4l2_sliced_vbi_format *fmt); struct v4l2_sliced_vbi_format *fmt);
int cx25840_decode_vbi_line(struct v4l2_subdev *sd, struct v4l2_decode_vbi_line *vbi); 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 */ /* cx25850-ir.c */

33
include/media/drv-intf/cx25840.h
View file

@ -1,10 +1,10 @@
/* SPDX-License-Identifier: GPL-2.0-or-later */ /* SPDX-License-Identifier: GPL-2.0-or-later */
/* /*
cx25840.h - definition for cx25840/1/2/3 inputs * cx25840.h - definition for cx25840/1/2/3 inputs
*
Copyright (C) 2006 Hans Verkuil (hverkuil@xs4all.nl) * Copyright (C) 2006 Hans Verkuil (hverkuil@xs4all.nl)
*/
*/
#ifndef _CX25840_H_ #ifndef _CX25840_H_
#define _CX25840_H_ #define _CX25840_H_
@ -38,8 +38,10 @@ enum cx25840_video_input {
CX25840_COMPOSITE7, CX25840_COMPOSITE7,
CX25840_COMPOSITE8, 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_LUMA1 = 0x10,
CX25840_SVIDEO_LUMA2 = 0x20, CX25840_SVIDEO_LUMA2 = 0x20,
CX25840_SVIDEO_LUMA3 = 0x30, CX25840_SVIDEO_LUMA3 = 0x30,
@ -243,13 +245,16 @@ enum cx23885_io_pad {
CX23885_PAD_GPIO16, 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 * pvr150_workaround activates a workaround for a hardware bug that is
certain NTSC tuners (tveeprom tuner model numbers 85, 99 and 112). The * present in Hauppauge PVR-150 (and possibly PVR-500) cards that have
audio autodetect fails on some channels for these models and the workaround * certain NTSC tuners (tveeprom tuner model numbers 85, 99 and 112). The
is to select the audio standard explicitly. Many thanks to Hauppauge for * audio autodetect fails on some channels for these models and the workaround
providing this information. * is to select the audio standard explicitly. Many thanks to Hauppauge for
This platform data only needs to be supplied by the ivtv driver. */ * providing this information.
*
* This platform data only needs to be supplied by the ivtv driver.
*/
struct cx25840_platform_data { struct cx25840_platform_data {
int pvr150_workaround; int pvr150_workaround;
}; };