diff options
| author | Steven Toth <stoth@kernellabs.com> | 2009-05-12 15:13:11 +0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-09-19 05:14:55 +0200 |
| commit | 78d155693a741f19ab514393a6c4b2da7be9f2ce (patch) | |
| tree | c6f68cc3220b0fc3cdc495eb737cd52195ffa70e /drivers/media | |
| parent | V4L/DVB (12929): SAA7164: OOPS avoidance during interrupt handling (diff) | |
| download | linux-78d155693a741f19ab514393a6c4b2da7be9f2ce.tar.xz linux-78d155693a741f19ab514393a6c4b2da7be9f2ce.zip | |
V4L/DVB (12930): SAA7164: Removed spurious I2C errors during driver load with DVB-T boards.
Signed-off-by: Steven Toth <stoth@kernellabs.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media')
| -rw-r--r-- | drivers/media/video/saa7164/saa7164-api.c | 19 | ||||
| -rw-r--r-- | drivers/media/video/saa7164/saa7164-core.c | 3 | ||||
| -rw-r--r-- | drivers/media/video/saa7164/saa7164.h | 1 |
3 files changed, 0 insertions, 23 deletions
diff --git a/drivers/media/video/saa7164/saa7164-api.c b/drivers/media/video/saa7164/saa7164-api.c index 105b68ef61e6..bb6df1b276be 100644 --- a/drivers/media/video/saa7164/saa7164-api.c +++ b/drivers/media/video/saa7164/saa7164-api.c @@ -60,25 +60,6 @@ int saa7164_api_read_eeprom(struct saa7164_dev *dev, u8 *buf, int buflen) ®[0], 128, buf); } -/* Exercise the i2c interface, saa7164_cmd()/bus() layers: - * 1. Read the identity byte from each of the demodulators. - * 2. Read the entire register set from the TDA18271. - * TODO: This function has no purpose other than to exercise i2c. - */ -int saa7164_api_test(struct saa7164_dev *dev) -{ - /* TDA10048 identities */ - u8 reg[] = { 0x00 }; - u8 data[256]; - dprintk(DBGLVL_API, "%s()\n", __func__); - /* Read all 39 bytes from the TDA18271 tuners */ - saa7164_api_i2c_read(&dev->i2c_bus[1], 0xc0 >> 1, 0, - ®[0], 39, &data[0]); - saa7164_api_i2c_read(&dev->i2c_bus[2], 0xc0 >> 1, 0, - ®[0], 39, &data[0]); - - return 0; -} int saa7164_api_configure_port_mpeg2ts(struct saa7164_dev *dev, struct saa7164_tsport *port, diff --git a/drivers/media/video/saa7164/saa7164-core.c b/drivers/media/video/saa7164/saa7164-core.c index 15ea90731ba7..0f3ebcdef126 100644 --- a/drivers/media/video/saa7164/saa7164-core.c +++ b/drivers/media/video/saa7164/saa7164-core.c @@ -644,9 +644,6 @@ static int __devinit saa7164_initdev(struct pci_dev *pci_dev, */ saa7164_api_enum_subdevs(dev); - /* Try a few API commands - just for exercise purposes */ - saa7164_api_test(dev); - /* Begin to create the video sub-systems and register funcs */ if (saa7164_boards[dev->board].porta == SAA7164_MPEG_DVB) { if (saa7164_dvb_register(&dev->ts1) < 0) { diff --git a/drivers/media/video/saa7164/saa7164.h b/drivers/media/video/saa7164/saa7164.h index 2d4d47ba3c1a..dd8991b28018 100644 --- a/drivers/media/video/saa7164/saa7164.h +++ b/drivers/media/video/saa7164/saa7164.h @@ -329,7 +329,6 @@ void saa7164_cmd_signal(struct saa7164_dev *dev, u8 seqno); /* ----------------------------------------------------------- */ /* saa7164-api.c */ -int saa7164_api_test(struct saa7164_dev *dev); int saa7164_api_get_fw_version(struct saa7164_dev *dev, u32 *version); int saa7164_api_enum_subdevs(struct saa7164_dev *dev); int saa7164_api_i2c_read(struct saa7164_i2c *bus, u8 addr, u32 reglen, u8 *reg, |