diff options
| author | Hans Verkuil <devnull@localhost> | 2006-01-02 22:31:44 +0000 |
|---|---|---|
| committer | Hans Verkuil <devnull@localhost> | 2006-01-02 22:31:44 +0000 |
| commit | 9a57596ab92a5a0cdf8d1f205383da9b84aaf555 (patch) | |
| tree | 05581625c203f45a06fb18125bd22a6b5d652d20 /linux/drivers/media/video/cx25840/cx25840-firmware.c | |
| parent | 799ff13cd8717f515448778273a21144725c9443 (diff) | |
| download | mediapointer-dvb-s2-9a57596ab92a5a0cdf8d1f205383da9b84aaf555.tar.gz mediapointer-dvb-s2-9a57596ab92a5a0cdf8d1f205383da9b84aaf555.tar.bz2 | |
convert diagnostics over to the new v4l2-common.h macros.
- convert diagnostics over to the new v4l2-common.h macros.
- deprecated tuner_debug option, the new option is debug.
- renamed cx25840_debug to debug.
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Diffstat (limited to 'linux/drivers/media/video/cx25840/cx25840-firmware.c')
| -rw-r--r-- | linux/drivers/media/video/cx25840/cx25840-firmware.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/linux/drivers/media/video/cx25840/cx25840-firmware.c b/linux/drivers/media/video/cx25840/cx25840-firmware.c index b31d3d1ce..cae024bc7 100644 --- a/linux/drivers/media/video/cx25840/cx25840-firmware.c +++ b/linux/drivers/media/video/cx25840/cx25840-firmware.c @@ -93,11 +93,11 @@ static inline int check_fw_load(struct i2c_client *client, int size) s |= cx25840_read(client, 0x800); if (size != s) { - cx25840_err("firmware %s load failed\n", firmware); + v4l_err(client, "firmware %s load failed\n", firmware); return -EINVAL; } - cx25840_info("loaded %s firmware (%d bytes)\n", firmware, size); + v4l_info(client, "loaded %s firmware (%d bytes)\n", firmware, size); return 0; } @@ -108,7 +108,7 @@ static inline int fw_write(struct i2c_client *client, u8 * data, int size) if ((sent = i2c_master_send(client, data, size)) < size) { if (fastfw) { - cx25840_err("333MHz i2c firmware load failed\n"); + v4l_err(client, "333MHz i2c firmware load failed\n"); fastfw = 0; set_i2c_delay(client, 10); @@ -121,13 +121,12 @@ static inline int fw_write(struct i2c_client *client, u8 * data, int size) } if (i2c_master_send(client, data, size) < size) { - cx25840_err - ("100MHz i2c firmware load failed\n"); + v4l_err(client, "100MHz i2c firmware load failed\n"); return -ENOSYS; } } else { - cx25840_err("firmware load i2c failure\n"); + v4l_err(client, "firmware load i2c failure\n"); return -ENOSYS; } @@ -143,7 +142,7 @@ int cx25840_loadfw(struct i2c_client *client) int size, send, retval; if (request_firmware(&fw, firmware, FWDEV(client)) != 0) { - cx25840_err("unable to open firmware %s\n", firmware); + v4l_err(client, "unable to open firmware %s\n", firmware); return -EINVAL; } |