mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-30 14:19:16 +00:00
V4L/DVB (5934): dvb-ttpci/saa7146: Replace saa7146_i2c_transfer by generic i2c_transfer
Convert av7110_v4l.c to use i2c_transfer() instead of saa7146_i2c_transfer(). Make saa7146_i2c_transfer() static. Signed-off-by: Oliver Endriss <o.endriss@gmx.de> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
This commit is contained in:
parent
ac247433fe
commit
36c15f8ee4
4 changed files with 5 additions and 5 deletions
|
@ -548,7 +548,6 @@ EXPORT_SYMBOL_GPL(saa7146_wait_for_debi_done);
|
||||||
|
|
||||||
EXPORT_SYMBOL_GPL(saa7146_setgpio);
|
EXPORT_SYMBOL_GPL(saa7146_setgpio);
|
||||||
|
|
||||||
EXPORT_SYMBOL_GPL(saa7146_i2c_transfer);
|
|
||||||
EXPORT_SYMBOL_GPL(saa7146_i2c_adapter_prepare);
|
EXPORT_SYMBOL_GPL(saa7146_i2c_adapter_prepare);
|
||||||
|
|
||||||
EXPORT_SYMBOL_GPL(saa7146_debug);
|
EXPORT_SYMBOL_GPL(saa7146_debug);
|
||||||
|
|
|
@ -277,7 +277,7 @@ static int saa7146_i2c_writeout(struct saa7146_dev *dev, u32* dword, int short_d
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
int saa7146_i2c_transfer(struct saa7146_dev *dev, const struct i2c_msg *msgs, int num, int retries)
|
static int saa7146_i2c_transfer(struct saa7146_dev *dev, const struct i2c_msg *msgs, int num, int retries)
|
||||||
{
|
{
|
||||||
int i = 0, count = 0;
|
int i = 0, count = 0;
|
||||||
u32* buffer = dev->d_i2c.cpu_addr;
|
u32* buffer = dev->d_i2c.cpu_addr;
|
||||||
|
|
|
@ -129,23 +129,25 @@ static struct v4l2_input inputs[4] = {
|
||||||
|
|
||||||
static int ves1820_writereg(struct saa7146_dev *dev, u8 addr, u8 reg, u8 data)
|
static int ves1820_writereg(struct saa7146_dev *dev, u8 addr, u8 reg, u8 data)
|
||||||
{
|
{
|
||||||
|
struct av7110 *av7110 = dev->ext_priv;
|
||||||
u8 buf[] = { 0x00, reg, data };
|
u8 buf[] = { 0x00, reg, data };
|
||||||
struct i2c_msg msg = { .addr = addr, .flags = 0, .buf = buf, .len = 3 };
|
struct i2c_msg msg = { .addr = addr, .flags = 0, .buf = buf, .len = 3 };
|
||||||
|
|
||||||
dprintk(4, "dev: %p\n", dev);
|
dprintk(4, "dev: %p\n", dev);
|
||||||
|
|
||||||
if (1 != saa7146_i2c_transfer(dev, &msg, 1, 1))
|
if (1 != i2c_transfer(&av7110->i2c_adap, &msg, 1))
|
||||||
return -1;
|
return -1;
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int tuner_write(struct saa7146_dev *dev, u8 addr, u8 data [4])
|
static int tuner_write(struct saa7146_dev *dev, u8 addr, u8 data [4])
|
||||||
{
|
{
|
||||||
|
struct av7110 *av7110 = dev->ext_priv;
|
||||||
struct i2c_msg msg = { .addr = addr, .flags = 0, .buf = data, .len = 4 };
|
struct i2c_msg msg = { .addr = addr, .flags = 0, .buf = data, .len = 4 };
|
||||||
|
|
||||||
dprintk(4, "dev: %p\n", dev);
|
dprintk(4, "dev: %p\n", dev);
|
||||||
|
|
||||||
if (1 != saa7146_i2c_transfer(dev, &msg, 1, 1))
|
if (1 != i2c_transfer(&av7110->i2c_adap, &msg, 1))
|
||||||
return -1;
|
return -1;
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
|
@ -146,7 +146,6 @@ struct saa7146_dev
|
||||||
|
|
||||||
/* from saa7146_i2c.c */
|
/* from saa7146_i2c.c */
|
||||||
int saa7146_i2c_adapter_prepare(struct saa7146_dev *dev, struct i2c_adapter *i2c_adapter, u32 bitrate);
|
int saa7146_i2c_adapter_prepare(struct saa7146_dev *dev, struct i2c_adapter *i2c_adapter, u32 bitrate);
|
||||||
int saa7146_i2c_transfer(struct saa7146_dev *saa, const struct i2c_msg *msgs, int num, int retries);
|
|
||||||
|
|
||||||
/* from saa7146_core.c */
|
/* from saa7146_core.c */
|
||||||
extern struct list_head saa7146_devices;
|
extern struct list_head saa7146_devices;
|
||||||
|
|
Loading…
Reference in a new issue