summaryrefslogtreecommitdiffstats
path: root/drivers/media/video/hdpvr/hdpvr-control.c
diff options
context:
space:
mode:
authorJanne Grunau <j@jannau.net>2009-03-27 20:09:40 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-03-30 12:43:43 -0300
commit9ef77adfb9ac170bcaf449530cf129c48547fd55 (patch)
tree686d2a00fb7e12d5416bf0327f3999612376451d /drivers/media/video/hdpvr/hdpvr-control.c
parent06630aec92d6a71658ac1538e2a65af5cfc5f2af (diff)
downloadop-kernel-dev-9ef77adfb9ac170bcaf449530cf129c48547fd55.zip
op-kernel-dev-9ef77adfb9ac170bcaf449530cf129c48547fd55.tar.gz
V4L/DVB (11246): hdpvr: convert printing macros to v4l2_* with struct v4l2_device
it gives us a nice and unique prefix per device Signed-off-by: Janne Grunau <j@jannau.net> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/hdpvr/hdpvr-control.c')
-rw-r--r--drivers/media/video/hdpvr/hdpvr-control.c22
1 files changed, 11 insertions, 11 deletions
diff --git a/drivers/media/video/hdpvr/hdpvr-control.c b/drivers/media/video/hdpvr/hdpvr-control.c
index 51de74a..0679174 100644
--- a/drivers/media/video/hdpvr/hdpvr-control.c
+++ b/drivers/media/video/hdpvr/hdpvr-control.c
@@ -40,9 +40,9 @@ int hdpvr_config_call(struct hdpvr_device *dev, uint value, u8 valbuf)
dev->usbc_buf, 1, 10000);
mutex_unlock(&dev->usbc_mutex);
- dev_dbg(&dev->udev->dev,
- "config call request for value 0x%x returned %d\n", value,
- ret);
+ v4l2_dbg(MSG_INFO, hdpvr_debug, &dev->v4l2_dev,
+ "config call request for value 0x%x returned %d\n", value,
+ ret);
return ret < 0 ? ret : 0;
}
@@ -57,7 +57,7 @@ struct hdpvr_video_info *get_video_info(struct hdpvr_device *dev)
vidinf = kzalloc(sizeof(struct hdpvr_video_info), GFP_KERNEL);
if (!vidinf) {
- dev_err(&dev->udev->dev, "out of memory");
+ v4l2_err(&dev->v4l2_dev, "out of memory\n");
goto err;
}
@@ -78,8 +78,8 @@ struct hdpvr_video_info *get_video_info(struct hdpvr_device *dev)
if (hdpvr_debug & MSG_INFO) {
hex_dump_to_buffer(dev->usbc_buf, 5, 16, 1, print_buf,
sizeof(print_buf), 0);
- dev_dbg(&dev->udev->dev, "get video info returned: %d, %s\n",
- ret, print_buf);
+ v4l2_dbg(MSG_INFO, hdpvr_debug, &dev->v4l2_dev,
+ "get video info returned: %d, %s\n", ret, print_buf);
}
#endif
mutex_unlock(&dev->usbc_mutex);
@@ -111,9 +111,9 @@ int get_input_lines_info(struct hdpvr_device *dev)
if (hdpvr_debug & MSG_INFO) {
hex_dump_to_buffer(dev->usbc_buf, 3, 16, 1, print_buf,
sizeof(print_buf), 0);
- dev_dbg(&dev->udev->dev,
- "get input lines info returned: %d, %s\n", ret,
- print_buf);
+ v4l2_dbg(MSG_INFO, hdpvr_debug, &dev->v4l2_dev,
+ "get input lines info returned: %d, %s\n", ret,
+ print_buf);
}
#endif
lines = dev->usbc_buf[1] << 8 | dev->usbc_buf[0];
@@ -155,8 +155,8 @@ int hdpvr_set_audio(struct hdpvr_device *dev, u8 input,
dev->usbc_buf[1] = 1;
else {
mutex_unlock(&dev->usbc_mutex);
- dev_err(&dev->udev->dev, "invalid audio codec %d\n",
- codec);
+ v4l2_err(&dev->v4l2_dev, "invalid audio codec %d\n",
+ codec);
ret = -EINVAL;
goto error;
}
OpenPOWER on IntegriCloud