You've already forked linux-apfs
mirror of
https://github.com/linux-apfs/linux-apfs.git
synced 2026-05-01 15:00:59 -07:00
v4l-dvb: remove legacy checks to allow support for kernels < 2.6.10
Also remove some blank lines that were used to split compat code at -devel tree. Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
This commit is contained in:
Hans Verkuil
committed by
Mauro Carvalho Chehab
Mauro Carvalho Chehab
parent
e01117c816
commit
f87086e302
@@ -66,7 +66,6 @@ void ir_input_init(struct input_dev *dev, struct ir_input_state *ir,
|
||||
if (ir_codes)
|
||||
memcpy(ir->ir_codes, ir_codes, sizeof(ir->ir_codes));
|
||||
|
||||
|
||||
dev->keycode = ir->ir_codes;
|
||||
dev->keycodesize = sizeof(IR_KEYTAB_TYPE);
|
||||
dev->keycodemax = IR_KEYTAB_SIZE;
|
||||
|
||||
@@ -20,11 +20,7 @@ int dvb_usb_i2c_init(struct dvb_usb_device *d)
|
||||
}
|
||||
|
||||
strncpy(d->i2c_adap.name, d->desc->name, sizeof(d->i2c_adap.name));
|
||||
#ifdef I2C_ADAP_CLASS_TV_DIGITAL
|
||||
d->i2c_adap.class = I2C_ADAP_CLASS_TV_DIGITAL,
|
||||
#else
|
||||
d->i2c_adap.class = I2C_CLASS_TV_DIGITAL,
|
||||
#endif
|
||||
d->i2c_adap.algo = d->props.i2c_algo;
|
||||
d->i2c_adap.algo_data = NULL;
|
||||
d->i2c_adap.dev.parent = &d->udev->dev;
|
||||
|
||||
@@ -2471,11 +2471,7 @@ static int __devinit av7110_attach(struct saa7146_dev* dev,
|
||||
get recognized before the main driver is fully loaded */
|
||||
saa7146_write(dev, GPIO_CTRL, 0x500000);
|
||||
|
||||
#ifdef I2C_ADAP_CLASS_TV_DIGITAL
|
||||
av7110->i2c_adap.class = I2C_ADAP_CLASS_TV_DIGITAL;
|
||||
#else
|
||||
av7110->i2c_adap.class = I2C_CLASS_TV_DIGITAL;
|
||||
#endif
|
||||
strlcpy(av7110->i2c_adap.name, pci_ext->ext_priv, sizeof(av7110->i2c_adap.name));
|
||||
|
||||
saa7146_i2c_adapter_prepare(dev, &av7110->i2c_adap, SAA7146_I2C_BUS_BIT_RATE_120); /* 275 kHz */
|
||||
|
||||
@@ -497,11 +497,7 @@ int ttpci_budget_init(struct budget *budget, struct saa7146_dev *dev,
|
||||
if (bi->type != BUDGET_FS_ACTIVY)
|
||||
saa7146_write(dev, GPIO_CTRL, 0x500000); /* GPIO 3 = 1 */
|
||||
|
||||
#ifdef I2C_ADAP_CLASS_TV_DIGITAL
|
||||
budget->i2c_adap.class = I2C_ADAP_CLASS_TV_DIGITAL;
|
||||
#else
|
||||
budget->i2c_adap.class = I2C_CLASS_TV_DIGITAL;
|
||||
#endif
|
||||
|
||||
strlcpy(budget->i2c_adap.name, budget->card->name, sizeof(budget->i2c_adap.name));
|
||||
|
||||
|
||||
@@ -1693,11 +1693,7 @@ static int ttusb_probe(struct usb_interface *intf, const struct usb_device_id *i
|
||||
|
||||
i2c_set_adapdata(&ttusb->i2c_adap, ttusb);
|
||||
|
||||
#ifdef I2C_ADAP_CLASS_TV_DIGITAL
|
||||
ttusb->i2c_adap.class = I2C_ADAP_CLASS_TV_DIGITAL;
|
||||
#else
|
||||
ttusb->i2c_adap.class = I2C_CLASS_TV_DIGITAL;
|
||||
#endif
|
||||
ttusb->i2c_adap.algo = &ttusb_dec_algo;
|
||||
ttusb->i2c_adap.algo_data = NULL;
|
||||
ttusb->i2c_adap.dev.parent = &udev->dev;
|
||||
|
||||
@@ -179,7 +179,6 @@ static int bt832_attach(struct i2c_adapter *adap, int addr, int kind)
|
||||
|
||||
v4l_info(&t->client,"chip found @ 0x%x\n", addr<<1);
|
||||
|
||||
|
||||
if(! bt832_init(&t->client)) {
|
||||
bt832_detach(&t->client);
|
||||
return -1;
|
||||
|
||||
@@ -299,7 +299,6 @@ extern int bttv_write_gpio(unsigned int card,
|
||||
/* ---------------------------------------------------------- */
|
||||
/* sysfs/driver-moded based gpio access interface */
|
||||
|
||||
|
||||
struct bttv_sub_device {
|
||||
struct device dev;
|
||||
struct bttv_core *core;
|
||||
|
||||
@@ -39,7 +39,6 @@
|
||||
#include <linux/scatterlist.h>
|
||||
#include <asm/io.h>
|
||||
#include <media/v4l2-common.h>
|
||||
|
||||
#include <linux/device.h>
|
||||
#include <media/videobuf-dma-sg.h>
|
||||
#include <media/tveeprom.h>
|
||||
@@ -263,12 +262,10 @@ extern struct videobuf_queue_ops bttv_vbi_qops;
|
||||
/* ---------------------------------------------------------- */
|
||||
/* bttv-gpio.c */
|
||||
|
||||
|
||||
extern struct bus_type bttv_sub_bus_type;
|
||||
int bttv_sub_add_device(struct bttv_core *core, char *name);
|
||||
int bttv_sub_del_devices(struct bttv_core *core);
|
||||
|
||||
|
||||
/* ---------------------------------------------------------- */
|
||||
/* bttv-driver.c */
|
||||
|
||||
|
||||
@@ -173,4 +173,3 @@ static struct v4l2_i2c_driver_data v4l2_i2c_data = {
|
||||
.probe = cs5345_probe,
|
||||
.id_table = cs5345_id,
|
||||
};
|
||||
|
||||
|
||||
@@ -43,7 +43,6 @@ MODULE_PARM_DESC(debug, "Debugging messages\n\t\t\t0=Off (default), 1=On");
|
||||
|
||||
static unsigned short normal_i2c[] = { 0x22 >> 1, I2C_CLIENT_END };
|
||||
|
||||
|
||||
I2C_CLIENT_INSMOD;
|
||||
|
||||
/* ----------------------------------------------------------------------- */
|
||||
@@ -189,4 +188,3 @@ static struct v4l2_i2c_driver_data v4l2_i2c_data = {
|
||||
.probe = cs53l32a_probe,
|
||||
.id_table = cs53l32a_id,
|
||||
};
|
||||
|
||||
|
||||
@@ -230,9 +230,7 @@ struct cx18_dvb {
|
||||
struct dvb_net dvbnet;
|
||||
int enabled;
|
||||
int feeding;
|
||||
|
||||
struct mutex feedlock;
|
||||
|
||||
};
|
||||
|
||||
struct cx18; /* forward reference */
|
||||
|
||||
@@ -39,10 +39,6 @@
|
||||
#define GETSCL_BIT 0x0004
|
||||
#define GETSDL_BIT 0x0008
|
||||
|
||||
#ifndef I2C_ADAP_CLASS_TV_ANALOG
|
||||
#define I2C_ADAP_CLASS_TV_ANALOG I2C_CLASS_TV_ANALOG
|
||||
#endif
|
||||
|
||||
#define CX18_CS5345_I2C_ADDR 0x4c
|
||||
|
||||
/* This array should match the CX18_HW_ defines */
|
||||
|
||||
@@ -50,7 +50,6 @@ MODULE_LICENSE("GPL");
|
||||
|
||||
static unsigned short normal_i2c[] = { 0x88 >> 1, I2C_CLIENT_END };
|
||||
|
||||
|
||||
int cx25840_debug;
|
||||
|
||||
module_param_named(debug,cx25840_debug, int, 0644);
|
||||
|
||||
@@ -82,7 +82,6 @@ typedef struct cx88_audio_dev snd_cx88_card_t;
|
||||
|
||||
|
||||
|
||||
|
||||
/****************************************************************************
|
||||
Module global static vars
|
||||
****************************************************************************/
|
||||
|
||||
@@ -103,7 +103,6 @@ static int attach_inform(struct i2c_client *client)
|
||||
|
||||
dprintk(1, "%s i2c attach [addr=0x%x,client=%s]\n",
|
||||
client->driver->driver.name, client->addr, client->name);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
@@ -30,7 +30,6 @@
|
||||
#include "cx88.h"
|
||||
#include "cx88-vp3054-i2c.h"
|
||||
|
||||
|
||||
MODULE_DESCRIPTION("driver for cx2388x VP3054 design");
|
||||
MODULE_AUTHOR("Chris Pascoe <c.pascoe@itee.uq.edu.au>");
|
||||
MODULE_LICENSE("GPL");
|
||||
|
||||
@@ -432,7 +432,6 @@ static u32 functionality(struct i2c_adapter *adap)
|
||||
return I2C_FUNC_SMBUS_EMUL;
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* attach_inform()
|
||||
* gets called when a device attaches to the i2c bus
|
||||
|
||||
@@ -2186,3 +2186,4 @@ module_exit(sd_mod_exit);
|
||||
|
||||
module_param(frame_rate, int, 0644);
|
||||
MODULE_PARM_DESC(frame_rate, "Frame rate (5, 10, 15, 20 or 30 fps)");
|
||||
|
||||
|
||||
@@ -635,7 +635,6 @@ struct ivtv {
|
||||
spinlock_t lock; /* lock access to this struct */
|
||||
struct mutex serialize_lock; /* mutex used to serialize open/close/start/stop/ioctl operations */
|
||||
|
||||
|
||||
/* Streams */
|
||||
int stream_buf_size[IVTV_MAX_STREAMS]; /* stream buffer size */
|
||||
struct ivtv_stream streams[IVTV_MAX_STREAMS]; /* stream data */
|
||||
|
||||
@@ -75,10 +75,6 @@
|
||||
#define IVTV_REG_I2C_GETSCL_OFFSET 0x7008
|
||||
#define IVTV_REG_I2C_GETSDA_OFFSET 0x700c
|
||||
|
||||
#ifndef I2C_ADAP_CLASS_TV_ANALOG
|
||||
#define I2C_ADAP_CLASS_TV_ANALOG I2C_CLASS_TV_ANALOG
|
||||
#endif /* I2C_ADAP_CLASS_TV_ANALOG */
|
||||
|
||||
#define IVTV_CS53L32A_I2C_ADDR 0x11
|
||||
#define IVTV_M52790_I2C_ADDR 0x48
|
||||
#define IVTV_CX25840_I2C_ADDR 0x44
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user