From: Malcolm Priestley <tvboxspy@gmail.com>
Date: Wed, 16 Jul 2014 21:22:03 +0000 (+0100)
Subject: staging: vt6656: replace DBG_PRT error messages
X-Git-Tag: v3.17-rc1~123^2~530
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=b4ae135e7cd9274494aa57e912d1cf7b836e7ec4;p=karo-tx-linux.git

staging: vt6656: replace DBG_PRT error messages

replace with dev_err

Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/drivers/staging/vt6656/main_usb.c b/drivers/staging/vt6656/main_usb.c
index 021e8928db50..ed56b603bb39 100644
--- a/drivers/staging/vt6656/main_usb.c
+++ b/drivers/staging/vt6656/main_usb.c
@@ -61,9 +61,6 @@
 #include "channel.h"
 #include "int.h"
 
-/* static int msglevel = MSG_LEVEL_DEBUG; */
-static int msglevel = MSG_LEVEL_INFO;
-
 /*
  * define module options
  */
@@ -567,8 +564,7 @@ static bool device_alloc_bufs(struct vnt_private *priv)
 		/* allocate URBs */
 		tx_context->urb = usb_alloc_urb(0, GFP_ATOMIC);
 		if (!tx_context->urb) {
-			DBG_PRT(MSG_LEVEL_ERR,
-				KERN_ERR "alloc tx urb failed\n");
+			dev_err(&priv->usb->dev, "alloc tx urb failed\n");
 			goto free_tx;
 		}
 
@@ -590,15 +586,13 @@ static bool device_alloc_bufs(struct vnt_private *priv)
 		/* allocate URBs */
 		rcb->pUrb = usb_alloc_urb(0, GFP_ATOMIC);
 		if (rcb->pUrb == NULL) {
-			DBG_PRT(MSG_LEVEL_ERR, KERN_ERR
-				" Failed to alloc rx urb\n");
+			dev_err(&priv->usb->dev, "Failed to alloc rx urb\n");
 			goto free_rx_tx;
 		}
 
 		rcb->skb = dev_alloc_skb(priv->rx_buf_sz);
 		if (rcb->skb == NULL) {
-			DBG_PRT(MSG_LEVEL_ERR, KERN_ERR
-						" Failed to alloc rx skb\n");
+			dev_err(&priv->usb->dev, "Failed to alloc rx skb\n");
 			goto free_rx_tx;
 		}
 
@@ -611,13 +605,13 @@ static bool device_alloc_bufs(struct vnt_private *priv)
 
 	priv->pInterruptURB = usb_alloc_urb(0, GFP_ATOMIC);
 	if (priv->pInterruptURB == NULL) {
-		DBG_PRT(MSG_LEVEL_ERR, KERN_ERR"Failed to alloc int urb\n");
+		dev_err(&priv->usb->dev, "Failed to alloc int urb\n");
 		goto free_rx_tx;
 	}
 
 	priv->int_buf.data_buf = kmalloc(MAX_INTERRUPT_SIZE, GFP_KERNEL);
 	if (priv->int_buf.data_buf == NULL) {
-		DBG_PRT(MSG_LEVEL_ERR, KERN_ERR"Failed to alloc int buf\n");
+		dev_err(&priv->usb->dev, "Failed to alloc int buf\n");
 		usb_free_urb(priv->pInterruptURB);
 		goto free_rx_tx;
 	}