diff options
author | Steven Toth <stoth@kernellabs.com> | 2009-05-12 09:13:11 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-09-18 23:14:55 -0400 |
commit | 78d155693a741f19ab514393a6c4b2da7be9f2ce (patch) | |
tree | c6f68cc3220b0fc3cdc495eb737cd52195ffa70e /drivers/media/video/saa7164 | |
parent | d888ea03a0a8798e5a7632d0808cd69f577b75c5 (diff) |
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/video/saa7164')
-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) | |||
60 | ®[0], 128, buf); | 60 | ®[0], 128, buf); |
61 | } | 61 | } |
62 | 62 | ||
63 | /* Exercise the i2c interface, saa7164_cmd()/bus() layers: | ||
64 | * 1. Read the identity byte from each of the demodulators. | ||
65 | * 2. Read the entire register set from the TDA18271. | ||
66 | * TODO: This function has no purpose other than to exercise i2c. | ||
67 | */ | ||
68 | int saa7164_api_test(struct saa7164_dev *dev) | ||
69 | { | ||
70 | /* TDA10048 identities */ | ||
71 | u8 reg[] = { 0x00 }; | ||
72 | u8 data[256]; | ||
73 | dprintk(DBGLVL_API, "%s()\n", __func__); | ||
74 | /* Read all 39 bytes from the TDA18271 tuners */ | ||
75 | saa7164_api_i2c_read(&dev->i2c_bus[1], 0xc0 >> 1, 0, | ||
76 | ®[0], 39, &data[0]); | ||
77 | saa7164_api_i2c_read(&dev->i2c_bus[2], 0xc0 >> 1, 0, | ||
78 | ®[0], 39, &data[0]); | ||
79 | |||
80 | return 0; | ||
81 | } | ||
82 | 63 | ||
83 | int saa7164_api_configure_port_mpeg2ts(struct saa7164_dev *dev, | 64 | int saa7164_api_configure_port_mpeg2ts(struct saa7164_dev *dev, |
84 | struct saa7164_tsport *port, | 65 | 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, | |||
644 | */ | 644 | */ |
645 | saa7164_api_enum_subdevs(dev); | 645 | saa7164_api_enum_subdevs(dev); |
646 | 646 | ||
647 | /* Try a few API commands - just for exercise purposes */ | ||
648 | saa7164_api_test(dev); | ||
649 | |||
650 | /* Begin to create the video sub-systems and register funcs */ | 647 | /* Begin to create the video sub-systems and register funcs */ |
651 | if (saa7164_boards[dev->board].porta == SAA7164_MPEG_DVB) { | 648 | if (saa7164_boards[dev->board].porta == SAA7164_MPEG_DVB) { |
652 | if (saa7164_dvb_register(&dev->ts1) < 0) { | 649 | 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); | |||
329 | 329 | ||
330 | /* ----------------------------------------------------------- */ | 330 | /* ----------------------------------------------------------- */ |
331 | /* saa7164-api.c */ | 331 | /* saa7164-api.c */ |
332 | int saa7164_api_test(struct saa7164_dev *dev); | ||
333 | int saa7164_api_get_fw_version(struct saa7164_dev *dev, u32 *version); | 332 | int saa7164_api_get_fw_version(struct saa7164_dev *dev, u32 *version); |
334 | int saa7164_api_enum_subdevs(struct saa7164_dev *dev); | 333 | int saa7164_api_enum_subdevs(struct saa7164_dev *dev); |
335 | int saa7164_api_i2c_read(struct saa7164_i2c *bus, u8 addr, u32 reglen, u8 *reg, | 334 | int saa7164_api_i2c_read(struct saa7164_i2c *bus, u8 addr, u32 reglen, u8 *reg, |