From a581c72a8e9e9955714e8f3b62c46312bea3f6ba Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Wed, 25 Apr 2012 14:48:47 -0700 Subject: USB: ov534_9.c: remove err() usage err() was a very old USB-specific macro that I thought had gone away. This patch removes it from being used in the driver and uses dev_err() instead. CC: Jean-Francois Moine CC: Mauro Carvalho Chehab Signed-off-by: Greg Kroah-Hartman --- drivers/media/video/gspca/ov534_9.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'drivers/media/video') diff --git a/drivers/media/video/gspca/ov534_9.c b/drivers/media/video/gspca/ov534_9.c index e6601b88603..b5797308a39 100644 --- a/drivers/media/video/gspca/ov534_9.c +++ b/drivers/media/video/gspca/ov534_9.c @@ -1376,7 +1376,7 @@ static int sd_init(struct gspca_dev *gspca_dev) ARRAY_SIZE(ov562x_init_2)); reg_w(gspca_dev, 0xe0, 0x00); } else { - err("Unknown sensor %04x", sensor_id); + pr_err("Unknown sensor %04x", sensor_id); return -EINVAL; } -- cgit v1.2.3-70-g09d2 From d372c4197d642763a6fde0ed3baa7cfce78df22d Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Wed, 25 Apr 2012 14:48:49 -0700 Subject: USB: hdpvr-core.c: remove err() usage err() was a very old USB-specific macro that I thought had gone away. This patch removes it from being used in the driver and uses dev_err() instead. CC: Mauro Carvalho Chehab CC: Jarod Wilson CC: Taylor Ralph CC: Andrew Morton CC: Rusty Russell Signed-off-by: Greg Kroah-Hartman --- drivers/media/video/hdpvr/hdpvr-core.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'drivers/media/video') diff --git a/drivers/media/video/hdpvr/hdpvr-core.c b/drivers/media/video/hdpvr/hdpvr-core.c index 6510110f53d..304f43ef59e 100644 --- a/drivers/media/video/hdpvr/hdpvr-core.c +++ b/drivers/media/video/hdpvr/hdpvr-core.c @@ -303,7 +303,7 @@ static int hdpvr_probe(struct usb_interface *interface, /* allocate memory for our device state and initialize it */ dev = kzalloc(sizeof(*dev), GFP_KERNEL); if (!dev) { - err("Out of memory"); + dev_err(&interface->dev, "Out of memory\n"); goto error; } @@ -311,7 +311,7 @@ static int hdpvr_probe(struct usb_interface *interface, /* register v4l2_device early so it can be used for printks */ if (v4l2_device_register(&interface->dev, &dev->v4l2_dev)) { - err("v4l2_device_register failed"); + dev_err(&interface->dev, "v4l2_device_register failed\n"); goto error; } -- cgit v1.2.3-70-g09d2