USB: hdpvr-core.c: remove err() usage
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 25 Apr 2012 21:48:49 +0000 (14:48 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 25 Apr 2012 21:48:49 +0000 (14:48 -0700)
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 <mchehab@infradead.org>
CC: Jarod Wilson <jarod@redhat.com>
CC: Taylor Ralph <tralph@mythtv.org>
CC: Andrew Morton <akpm@linux-foundation.org>
CC: Rusty Russell <rusty@rustcorp.com.au>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/media/video/hdpvr/hdpvr-core.c

index 6510110f53d0d6754af0b74a8eec7ce0820fa725..304f43ef59eb16a8778d2adbc43baf4743187a9b 100644 (file)
@@ -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;
        }