p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[media] em28xx: checkpatch cleanup: whitespaces/new lines cleanups 

This patch is basically produced while testing a tool that
Joe Perches sent upstream sometime ago:
	https://lkml.org/lkml/2014/7/11/794

I used it with those arguments:
	$ reformat_with_checkpatch.sh drivers/media/usb/em28xx/em28xx*.[ch]

It actually produced 24 patches, with is too much, and showed
interesting things: gcc produced different codes on most of the
patches, even with just linespace changes. The total code data
remained the same on all cases I checked though.

Anyway, provided that we fold the resulting patches, this tool
seems useful.

Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
This commit is contained in:
Mauro Carvalho Chehab 2014-11-28 08:34:15 -03:00
parent 1b97dc98b5
commit fdf1bc9fa2
12 changed files with 134 additions and 136 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/media/usb/em28xx/em28xx-audio.c
View File

@ -232,7 +232,6 @@ static struct snd_pcm_hardware snd_em28xx_hw_capture = {
.channels_max = 2, .channels_max = 2,
.buffer_bytes_max = 62720 * 8, /* just about the value in usbaudio.c */ .buffer_bytes_max = 62720 * 8, /* just about the value in usbaudio.c */
/* /*
* The period is 12.288 bytes. Allow a 10% of variation along its * The period is 12.288 bytes. Allow a 10% of variation along its
* value, in order to avoid overruns/underruns due to some clock * value, in order to avoid overruns/underruns due to some clock

5
drivers/media/usb/em28xx/em28xx-camera.c
View File

@ -27,7 +27,6 @@
#include "em28xx.h" #include "em28xx.h"
/* Possible i2c addresses of Micron sensors */ /* Possible i2c addresses of Micron sensors */
static unsigned short micron_sensor_addrs[] = { static unsigned short micron_sensor_addrs[] = {
0xb8 >> 1, /* MT9V111, MT9V403 */ 0xb8 >> 1, /* MT9V111, MT9V403 */
@ -43,7 +42,6 @@ static unsigned short omnivision_sensor_addrs[] = {
I2C_CLIENT_END I2C_CLIENT_END
}; };
static struct soc_camera_link camlink = { static struct soc_camera_link camlink = {
.bus_id = 0, .bus_id = 0,
.flags = 0, .flags = 0,
@ -51,7 +49,6 @@ static struct soc_camera_link camlink = {
.unbalanced_power = true, .unbalanced_power = true,
}; };
/* FIXME: Should be replaced by a proper mt9m111 driver */ /* FIXME: Should be replaced by a proper mt9m111 driver */
static int em28xx_initialize_mt9m111(struct em28xx *dev) static int em28xx_initialize_mt9m111(struct em28xx *dev)
{ {
@ -70,7 +67,6 @@ static int em28xx_initialize_mt9m111(struct em28xx *dev)
return 0; return 0;
} }
/* FIXME: Should be replaced by a proper mt9m001 driver */ /* FIXME: Should be replaced by a proper mt9m001 driver */
static int em28xx_initialize_mt9m001(struct em28xx *dev) static int em28xx_initialize_mt9m001(struct em28xx *dev)
{ {
@ -98,7 +94,6 @@ static int em28xx_initialize_mt9m001(struct em28xx *dev)
return 0; return 0;
} }
/* /*
* Probes Micron sensors with 8 bit address and 16 bit register width * Probes Micron sensors with 8 bit address and 16 bit register width
*/ */

6
drivers/media/usb/em28xx/em28xx-cards.c
View File

@ -64,7 +64,6 @@ module_param(usb_xfer_mode, int, 0444);
MODULE_PARM_DESC(usb_xfer_mode, MODULE_PARM_DESC(usb_xfer_mode,
"USB transfer mode for frame data (-1 = auto, 0 = prefer isoc, 1 = prefer bulk)"); "USB transfer mode for frame data (-1 = auto, 0 = prefer isoc, 1 = prefer bulk)");
/* Bitmask marking allocated devices from 0 to EM28XX_MAXBOARDS - 1 */ /* Bitmask marking allocated devices from 0 to EM28XX_MAXBOARDS - 1 */
static DECLARE_BITMAP(em28xx_devused, EM28XX_MAXBOARDS); static DECLARE_BITMAP(em28xx_devused, EM28XX_MAXBOARDS);
@ -301,7 +300,6 @@ static struct em28xx_reg_seq dikom_dk300_digital[] = {
{ -1, -1, -1, -1}, { -1, -1, -1, -1},
}; };
/* Reset for the most [digital] boards */ /* Reset for the most [digital] boards */
static struct em28xx_reg_seq leadership_digital[] = { static struct em28xx_reg_seq leadership_digital[] = {
{EM2874_R80_GPIO_P0_CTRL, 0x70, 0xff, 10}, {EM2874_R80_GPIO_P0_CTRL, 0x70, 0xff, 10},
@ -562,7 +560,6 @@ static struct em28xx_led pctv_80e_leds[] = {
{-1, 0, 0, 0}, {-1, 0, 0, 0},
}; };
/* /*
* Board definitions * Board definitions
*/ */
@ -2496,6 +2493,7 @@ static struct em28xx_hash_table em28xx_i2c_hash[] = {
{0x4ba50080, EM2861_BOARD_GADMEI_UTV330PLUS, TUNER_TNF_5335MF}, {0x4ba50080, EM2861_BOARD_GADMEI_UTV330PLUS, TUNER_TNF_5335MF},
{0x6b800080, EM2874_BOARD_LEADERSHIP_ISDBT, TUNER_ABSENT}, {0x6b800080, EM2874_BOARD_LEADERSHIP_ISDBT, TUNER_ABSENT},
}; };
/* NOTE: introduce a separate hash table for devices with 16 bit eeproms */ /* NOTE: introduce a separate hash table for devices with 16 bit eeproms */
int em28xx_tuner_callback(void *ptr, int component, int command, int arg) int em28xx_tuner_callback(void *ptr, int component, int command, int arg)
@ -3094,6 +3092,7 @@ static int em28xx_init_dev(struct em28xx *dev, struct usb_device *udev,
if (le16_to_cpu(dev->udev->descriptor.idVendor) if (le16_to_cpu(dev->udev->descriptor.idVendor)
== 0xeb1a) { == 0xeb1a) {
__le16 idProd = dev->udev->descriptor.idProduct; __le16 idProd = dev->udev->descriptor.idProduct;
if (le16_to_cpu(idProd) == 0x2710) if (le16_to_cpu(idProd) == 0x2710)
chip_name = "em2710"; chip_name = "em2710";
else if (le16_to_cpu(idProd) == 0x2820) else if (le16_to_cpu(idProd) == 0x2820)
@ -3420,6 +3419,7 @@ static int em28xx_usb_probe(struct usb_interface *interface,
/* Checks if audio is provided by a USB Audio Class interface */ /* Checks if audio is provided by a USB Audio Class interface */
for (i = 0; i < udev->config->desc.bNumInterfaces; i++) { for (i = 0; i < udev->config->desc.bNumInterfaces; i++) {
struct usb_interface *uif = udev->config->interface[i]; struct usb_interface *uif = udev->config->interface[i];
if (uif->altsetting[0].desc.bInterfaceClass == USB_CLASS_AUDIO) { if (uif->altsetting[0].desc.bInterfaceClass == USB_CLASS_AUDIO) {
if (has_vendor_audio) if (has_vendor_audio)
em28xx_err("em28xx: device seems to have vendor AND usb audio class interfaces !\n" em28xx_err("em28xx: device seems to have vendor AND usb audio class interfaces !\n"

7
drivers/media/usb/em28xx/em28xx-core.c
View File

@ -614,6 +614,7 @@ const struct em28xx_led *em28xx_find_led(struct em28xx *dev,
{ {
if (dev->board.leds) { if (dev->board.leds) {
u8 k = 0; u8 k = 0;
while (dev->board.leds[k].role >= 0 && while (dev->board.leds[k].role >= 0 &&
dev->board.leds[k].role < EM28XX_NUM_LED_ROLES) { dev->board.leds[k].role < EM28XX_NUM_LED_ROLES) {
if (dev->board.leds[k].role == role) if (dev->board.leds[k].role == role)
@ -658,10 +659,12 @@ int em28xx_capture_start(struct em28xx *dev, int start)
if (dev->mode == EM28XX_ANALOG_MODE) if (dev->mode == EM28XX_ANALOG_MODE)
rc = em28xx_write_reg(dev, rc = em28xx_write_reg(dev,
EM28XX_R12_VINENABLE, 0x67); EM28XX_R12_VINENABLE,
0x67);
else else
rc = em28xx_write_reg(dev, rc = em28xx_write_reg(dev,
EM28XX_R12_VINENABLE, 0x37); EM28XX_R12_VINENABLE,
0x37);
if (rc < 0) if (rc < 0)
return rc; return rc;

12
drivers/media/usb/em28xx/em28xx-dvb.c
View File

@ -63,7 +63,6 @@ MODULE_LICENSE("GPL");
MODULE_DESCRIPTION(DRIVER_DESC " - digital TV interface"); MODULE_DESCRIPTION(DRIVER_DESC " - digital TV interface");
MODULE_VERSION(EM28XX_VERSION); MODULE_VERSION(EM28XX_VERSION);
static unsigned int debug; static unsigned int debug;
module_param(debug, int, 0644); module_param(debug, int, 0644);
MODULE_PARM_DESC(debug, "enable debug messages [dvb]"); MODULE_PARM_DESC(debug, "enable debug messages [dvb]");
@ -99,7 +98,6 @@ struct em28xx_dvb {
struct i2c_client *i2c_client_tuner; struct i2c_client *i2c_client_tuner;
}; };
static inline void print_err_status(struct em28xx *dev, static inline void print_err_status(struct em28xx *dev,
int packet, int status) int packet, int status)
{ {
@ -280,7 +278,6 @@ static int em28xx_stop_feed(struct dvb_demux_feed *feed)
} }
/* ------------------------------------------------------------------ */ /* ------------------------------------------------------------------ */
static int em28xx_dvb_bus_ctrl(struct dvb_frontend *fe, int acquire) static int em28xx_dvb_bus_ctrl(struct dvb_frontend *fe, int acquire)
{ {
@ -830,6 +827,7 @@ static struct zl10353_config em28xx_zl10353_no_i2c_gate_dev = {
.no_tuner = 1, .no_tuner = 1,
.parallel_ts = 1, .parallel_ts = 1,
}; };
static struct qt1010_config em28xx_qt1010_config = { static struct qt1010_config em28xx_qt1010_config = {
.i2c_address = 0x62 .i2c_address = 0x62
}; };
@ -861,7 +859,6 @@ static const struct m88ds3103_config pctv_461e_m88ds3103_config = {
.agc = 0x99, .agc = 0x99,
}; };
static struct tda18271_std_map drx_j_std_map = { static struct tda18271_std_map drx_j_std_map = {
.atsc_6 = { .if_freq = 5000, .agc_mode = 3, .std = 0, .if_lvl = 1, .atsc_6 = { .if_freq = 5000, .agc_mode = 3, .std = 0, .if_lvl = 1,
.rfagc_top = 0x37, }, .rfagc_top = 0x37, },
@ -1182,7 +1179,8 @@ static int em28xx_dvb_init(struct em28xx *dev)
&dev->i2c_adap[dev->def_i2c_bus]); &dev->i2c_adap[dev->def_i2c_bus]);
if (dvb->fe[0] != NULL) { if (dvb->fe[0] != NULL) {
if (!dvb_attach(simple_tuner_attach, dvb->fe[0], if (!dvb_attach(simple_tuner_attach, dvb->fe[0],
&dev->i2c_adap[dev->def_i2c_bus], 0x61, TUNER_THOMSON_DTT761X)) { &dev->i2c_adap[dev->def_i2c_bus],
0x61, TUNER_THOMSON_DTT761X)) {
result = -EINVAL; result = -EINVAL;
goto out_free; goto out_free;
} }
@ -1204,7 +1202,8 @@ static int em28xx_dvb_init(struct em28xx *dev)
&dev->i2c_adap[dev->def_i2c_bus], 0x48); &dev->i2c_adap[dev->def_i2c_bus], 0x48);
if (dvb->fe[0]) { if (dvb->fe[0]) {
if (!dvb_attach(simple_tuner_attach, dvb->fe[0], if (!dvb_attach(simple_tuner_attach, dvb->fe[0],
&dev->i2c_adap[dev->def_i2c_bus], 0x60, TUNER_PHILIPS_CU1216L)) { &dev->i2c_adap[dev->def_i2c_bus],
0x60, TUNER_PHILIPS_CU1216L)) {
result = -EINVAL; result = -EINVAL;
goto out_free; goto out_free;
} }
@ -1266,6 +1265,7 @@ static int em28xx_dvb_init(struct em28xx *dev)
case EM2884_BOARD_HAUPPAUGE_WINTV_HVR_930C: case EM2884_BOARD_HAUPPAUGE_WINTV_HVR_930C:
{ {
struct xc5000_config cfg; struct xc5000_config cfg;
hauppauge_hvr930c_init(dev); hauppauge_hvr930c_init(dev);
dvb->fe[0] = dvb_attach(drxk_attach, dvb->fe[0] = dvb_attach(drxk_attach,

1
drivers/media/usb/em28xx/em28xx-i2c.c
View File

@ -593,6 +593,7 @@ static inline unsigned long em28xx_hash_mem(char *buf, int length, int bits)
unsigned long l = 0; unsigned long l = 0;
int len = 0; int len = 0;
unsigned char c; unsigned char c;
do { do {
if (len == length) { if (len == length) {
c = (char)len; c = (char)len;

3
drivers/media/usb/em28xx/em28xx-reg.h
View File

@ -49,7 +49,6 @@
#define EM28XX_CHIPCFG2_TS_PACKETSIZE_564 0x02 #define EM28XX_CHIPCFG2_TS_PACKETSIZE_564 0x02
#define EM28XX_CHIPCFG2_TS_PACKETSIZE_752 0x03 #define EM28XX_CHIPCFG2_TS_PACKETSIZE_752 0x03
/* GPIO/GPO registers */ /* GPIO/GPO registers */
#define EM2880_R04_GPO 0x04 /* em2880-em2883 only */ #define EM2880_R04_GPO 0x04 /* em2880-em2883 only */
#define EM2820_R08_GPIO_CTRL 0x08 /* em2820-em2873/83 only */ #define EM2820_R08_GPIO_CTRL 0x08 /* em2820-em2873/83 only */
@ -68,7 +67,6 @@
#define EM28XX_I2C_FREQ_400_KHZ 0x01 #define EM28XX_I2C_FREQ_400_KHZ 0x01
#define EM28XX_I2C_FREQ_100_KHZ 0x00 #define EM28XX_I2C_FREQ_100_KHZ 0x00
#define EM28XX_R0A_CHIPID 0x0a #define EM28XX_R0A_CHIPID 0x0a
#define EM28XX_R0C_USBSUSP 0x0c #define EM28XX_R0C_USBSUSP 0x0c
#define EM28XX_R0C_USBSUSP_SNAPSHOT 0x20 /* 1=button pressed, needs reset */ #define EM28XX_R0C_USBSUSP_SNAPSHOT 0x20 /* 1=button pressed, needs reset */
@ -157,7 +155,6 @@
#define EM28XX_OUTFMT_YUV422_Y1UY0V 0x15 #define EM28XX_OUTFMT_YUV422_Y1UY0V 0x15
#define EM28XX_OUTFMT_YUV411 0x18 #define EM28XX_OUTFMT_YUV411 0x18
#define EM28XX_R28_XMIN 0x28 #define EM28XX_R28_XMIN 0x28
#define EM28XX_R29_XMAX 0x29 #define EM28XX_R29_XMAX 0x29
#define EM28XX_R2A_YMIN 0x2a #define EM28XX_R2A_YMIN 0x2a

1
drivers/media/usb/em28xx/em28xx-v4l.h
View File

@ -14,7 +14,6 @@
GNU General Public License for more details. GNU General Public License for more details.
*/ */
int em28xx_start_analog_streaming(struct vb2_queue *vq, unsigned int count); int em28xx_start_analog_streaming(struct vb2_queue *vq, unsigned int count);
void em28xx_stop_vbi_streaming(struct vb2_queue *vq); void em28xx_stop_vbi_streaming(struct vb2_queue *vq);
extern struct vb2_ops em28xx_vbi_qops; extern struct vb2_ops em28xx_vbi_qops;

1
drivers/media/usb/em28xx/em28xx-vbi.c
View File

@ -92,7 +92,6 @@ vbi_buffer_queue(struct vb2_buffer *vb)
spin_unlock_irqrestore(&dev->slock, flags); spin_unlock_irqrestore(&dev->slock, flags);
} }
struct vb2_ops em28xx_vbi_qops = { struct vb2_ops em28xx_vbi_qops = {
.queue_setup = vbi_queue_setup, .queue_setup = vbi_queue_setup,
.buf_prepare = vbi_buffer_prepare, .buf_prepare = vbi_buffer_prepare,

28
drivers/media/usb/em28xx/em28xx-video.c
View File

@ -81,7 +81,6 @@ MODULE_DESCRIPTION(DRIVER_DESC " - v4l2 interface");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_VERSION(EM28XX_VERSION); MODULE_VERSION(EM28XX_VERSION);
#define EM25XX_FRMDATAHDR_BYTE1 0x02 #define EM25XX_FRMDATAHDR_BYTE1 0x02
#define EM25XX_FRMDATAHDR_BYTE2_STILL_IMAGE 0x20 #define EM25XX_FRMDATAHDR_BYTE2_STILL_IMAGE 0x20
#define EM25XX_FRMDATAHDR_BYTE2_FRAME_END 0x02 #define EM25XX_FRMDATAHDR_BYTE2_FRAME_END 0x02
@ -90,7 +89,6 @@ MODULE_VERSION(EM28XX_VERSION);
EM25XX_FRMDATAHDR_BYTE2_FRAME_END | \ EM25XX_FRMDATAHDR_BYTE2_FRAME_END | \
EM25XX_FRMDATAHDR_BYTE2_FRAME_ID) EM25XX_FRMDATAHDR_BYTE2_FRAME_ID)
static unsigned int video_nr[] = {[0 ... (EM28XX_MAXBOARDS - 1)] = -1U }; static unsigned int video_nr[] = {[0 ... (EM28XX_MAXBOARDS - 1)] = -1U };
static unsigned int vbi_nr[] = {[0 ... (EM28XX_MAXBOARDS - 1)] = -1U }; static unsigned int vbi_nr[] = {[0 ... (EM28XX_MAXBOARDS - 1)] = -1U };
static unsigned int radio_nr[] = {[0 ... (EM28XX_MAXBOARDS - 1)] = -1U }; static unsigned int radio_nr[] = {[0 ... (EM28XX_MAXBOARDS - 1)] = -1U };
@ -194,6 +192,7 @@ static int em28xx_vbi_supported(struct em28xx *dev)
static void em28xx_wake_i2c(struct em28xx *dev) static void em28xx_wake_i2c(struct em28xx *dev)
{ {
struct v4l2_device *v4l2_dev = &dev->v4l2->v4l2_dev; struct v4l2_device *v4l2_dev = &dev->v4l2->v4l2_dev;
v4l2_device_call_all(v4l2_dev, 0, core, reset, 0); v4l2_device_call_all(v4l2_dev, 0, core, reset, 0);
v4l2_device_call_all(v4l2_dev, 0, video, s_routing, v4l2_device_call_all(v4l2_dev, 0, video, s_routing,
INPUT(dev->ctl_input)->vmux, 0, 0); INPUT(dev->ctl_input)->vmux, 0, 0);
@ -831,7 +830,6 @@ static inline int em28xx_urb_data_copy(struct em28xx *dev, struct urb *urb)
return 1; return 1;
} }
static int get_ressource(enum v4l2_buf_type f_type) static int get_ressource(enum v4l2_buf_type f_type)
{ {
switch (f_type) { switch (f_type) {
@ -1003,6 +1001,7 @@ static void em28xx_stop_streaming(struct vb2_queue *vq)
} }
while (!list_empty(&vidq->active)) { while (!list_empty(&vidq->active)) {
struct em28xx_buffer *buf; struct em28xx_buffer *buf;
buf = list_entry(vidq->active.next, struct em28xx_buffer, list); buf = list_entry(vidq->active.next, struct em28xx_buffer, list);
list_del(&buf->list); list_del(&buf->list);
vb2_buffer_done(&buf->vb, VB2_BUF_STATE_ERROR); vb2_buffer_done(&buf->vb, VB2_BUF_STATE_ERROR);
@ -1033,6 +1032,7 @@ void em28xx_stop_vbi_streaming(struct vb2_queue *vq)
} }
while (!list_empty(&vbiq->active)) { while (!list_empty(&vbiq->active)) {
struct em28xx_buffer *buf; struct em28xx_buffer *buf;
buf = list_entry(vbiq->active.next, struct em28xx_buffer, list); buf = list_entry(vbiq->active.next, struct em28xx_buffer, list);
list_del(&buf->list); list_del(&buf->list);
vb2_buffer_done(&buf->vb, VB2_BUF_STATE_ERROR); vb2_buffer_done(&buf->vb, VB2_BUF_STATE_ERROR);
@ -1109,6 +1109,7 @@ static int em28xx_vb2_setup(struct em28xx *dev)
static void video_mux(struct em28xx *dev, int index) static void video_mux(struct em28xx *dev, int index)
{ {
struct v4l2_device *v4l2_dev = &dev->v4l2->v4l2_dev; struct v4l2_device *v4l2_dev = &dev->v4l2->v4l2_dev;
dev->ctl_input = index; dev->ctl_input = index;
dev->ctl_ainput = INPUT(index)->amux; dev->ctl_ainput = INPUT(index)->amux;
dev->ctl_aoutput = INPUT(index)->aout; dev->ctl_aoutput = INPUT(index)->aout;
@ -1126,7 +1127,8 @@ static void video_mux(struct em28xx *dev, int index)
} }
/* Note: this is msp3400 specific */ /* Note: this is msp3400 specific */
v4l2_device_call_all(v4l2_dev, 0, audio, s_routing, v4l2_device_call_all(v4l2_dev, 0, audio, s_routing,
dev->ctl_ainput, MSP_OUTPUT(MSP_SC_IN_DSP_SCART1), 0); dev->ctl_ainput,
MSP_OUTPUT(MSP_SC_IN_DSP_SCART1), 0);
} }
if (dev->board.adecoder != EM28XX_NOADECODER) { if (dev->board.adecoder != EM28XX_NOADECODER) {
@ -1670,6 +1672,7 @@ static int vidioc_g_register(struct file *file, void *priv,
reg->val = ret; reg->val = ret;
} else { } else {
__le16 val = 0; __le16 val = 0;
ret = dev->em28xx_read_reg_req_len(dev, USB_REQ_GET_STATUS, ret = dev->em28xx_read_reg_req_len(dev, USB_REQ_GET_STATUS,
reg->reg, (char *)&val, 2); reg->reg, (char *)&val, 2);
if (ret < 0) if (ret < 0)
@ -1700,7 +1703,6 @@ static int vidioc_s_register(struct file *file, void *priv,
} }
#endif #endif
static int vidioc_querycap(struct file *file, void *priv, static int vidioc_querycap(struct file *file, void *priv,
struct v4l2_capability *cap) struct v4l2_capability *cap)
{ {
@ -2177,7 +2179,8 @@ static unsigned short msp3400_addrs[] = {
/******************************** usb interface ******************************/ /******************************** usb interface ******************************/
static struct video_device *em28xx_vdev_init(struct em28xx *dev, static struct video_device
*em28xx_vdev_init(struct em28xx *dev,
const struct video_device *template, const struct video_device *template,
const char *type_name) const char *type_name)
{ {
@ -2345,20 +2348,23 @@ static int em28xx_v4l2_init(struct em28xx *dev)
if (dev->board.radio.type) if (dev->board.radio.type)
v4l2_i2c_new_subdev(&v4l2->v4l2_dev, v4l2_i2c_new_subdev(&v4l2->v4l2_dev,
&dev->i2c_adap[dev->def_i2c_bus], &dev->i2c_adap[dev->def_i2c_bus],
"tuner", dev->board.radio_addr, NULL); "tuner", dev->board.radio_addr,
NULL);
if (has_demod) if (has_demod)
v4l2_i2c_new_subdev(&v4l2->v4l2_dev, v4l2_i2c_new_subdev(&v4l2->v4l2_dev,
&dev->i2c_adap[dev->def_i2c_bus], "tuner", &dev->i2c_adap[dev->def_i2c_bus],
0, v4l2_i2c_tuner_addrs(ADDRS_DEMOD)); "tuner", 0,
v4l2_i2c_tuner_addrs(ADDRS_DEMOD));
if (tuner_addr == 0) { if (tuner_addr == 0) {
enum v4l2_i2c_tuner_type type = enum v4l2_i2c_tuner_type type =
has_demod ? ADDRS_TV_WITH_DEMOD : ADDRS_TV; has_demod ? ADDRS_TV_WITH_DEMOD : ADDRS_TV;
struct v4l2_subdev *sd; struct v4l2_subdev *sd;
sd = v4l2_i2c_new_subdev(&v4l2->v4l2_dev, sd = v4l2_i2c_new_subdev(&v4l2->v4l2_dev,
&dev->i2c_adap[dev->def_i2c_bus], "tuner", &dev->i2c_adap[dev->def_i2c_bus],
0, v4l2_i2c_tuner_addrs(type)); "tuner", 0,
v4l2_i2c_tuner_addrs(type));
if (sd) if (sd)
tuner_addr = v4l2_i2c_subdev_addr(sd); tuner_addr = v4l2_i2c_subdev_addr(sd);

1
drivers/media/usb/em28xx/em28xx.h
View File

@ -217,7 +217,6 @@ enum em28xx_mode {
EM28XX_DIGITAL_MODE, EM28XX_DIGITAL_MODE,
}; };
struct em28xx; struct em28xx;
struct em28xx_usb_bufs { struct em28xx_usb_bufs {