aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/common
diff options
context:
space:
mode:
authorOliver Endriss <o.endriss@gmx.de>2007-07-23 12:59:55 -0400
committerMauro Carvalho Chehab <mchehab@infradead.org>2007-10-09 21:03:28 -0400
commit36c15f8ee41fbc3d8eaf88bba95be3d50268d5d2 (patch)
tree8af3e4297ad04213271387df9b41a0cdfc916ca2 /drivers/media/common
parentac247433fe205acf460f05de64a30ee71ea307f2 (diff)
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>
Diffstat (limited to 'drivers/media/common')
-rw-r--r--drivers/media/common/saa7146_core.c1
-rw-r--r--drivers/media/common/saa7146_i2c.c2
2 files changed, 1 insertions, 2 deletions
diff --git a/drivers/media/common/saa7146_core.c b/drivers/media/common/saa7146_core.c
index ba6701e97671..12cda9eebd12 100644
--- a/drivers/media/common/saa7146_core.c
+++ b/drivers/media/common/saa7146_core.c
@@ -548,7 +548,6 @@ EXPORT_SYMBOL_GPL(saa7146_wait_for_debi_done);
548 548
549EXPORT_SYMBOL_GPL(saa7146_setgpio); 549EXPORT_SYMBOL_GPL(saa7146_setgpio);
550 550
551EXPORT_SYMBOL_GPL(saa7146_i2c_transfer);
552EXPORT_SYMBOL_GPL(saa7146_i2c_adapter_prepare); 551EXPORT_SYMBOL_GPL(saa7146_i2c_adapter_prepare);
553 552
554EXPORT_SYMBOL_GPL(saa7146_debug); 553EXPORT_SYMBOL_GPL(saa7146_debug);
diff --git a/drivers/media/common/saa7146_i2c.c b/drivers/media/common/saa7146_i2c.c
index 8c85efc26527..f823286341eb 100644
--- a/drivers/media/common/saa7146_i2c.c
+++ b/drivers/media/common/saa7146_i2c.c
@@ -277,7 +277,7 @@ static int saa7146_i2c_writeout(struct saa7146_dev *dev, u32* dword, int short_d
277 return 0; 277 return 0;
278} 278}
279 279
280int saa7146_i2c_transfer(struct saa7146_dev *dev, const struct i2c_msg *msgs, int num, int retries) 280static int saa7146_i2c_transfer(struct saa7146_dev *dev, const struct i2c_msg *msgs, int num, int retries)
281{ 281{
282 int i = 0, count = 0; 282 int i = 0, count = 0;
283 u32* buffer = dev->d_i2c.cpu_addr; 283 u32* buffer = dev->d_i2c.cpu_addr;