Commit b4ae135e authored by Malcolm Priestley's avatar Malcolm Priestley Committed by Greg Kroah-Hartman

staging: vt6656: replace DBG_PRT error messages

replace with dev_err
Signed-off-by: default avatarMalcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 4e62dcc9
...@@ -61,9 +61,6 @@ ...@@ -61,9 +61,6 @@
#include "channel.h" #include "channel.h"
#include "int.h" #include "int.h"
/* static int msglevel = MSG_LEVEL_DEBUG; */
static int msglevel = MSG_LEVEL_INFO;
/* /*
* define module options * define module options
*/ */
...@@ -567,8 +564,7 @@ static bool device_alloc_bufs(struct vnt_private *priv) ...@@ -567,8 +564,7 @@ static bool device_alloc_bufs(struct vnt_private *priv)
/* allocate URBs */ /* allocate URBs */
tx_context->urb = usb_alloc_urb(0, GFP_ATOMIC); tx_context->urb = usb_alloc_urb(0, GFP_ATOMIC);
if (!tx_context->urb) { if (!tx_context->urb) {
DBG_PRT(MSG_LEVEL_ERR, dev_err(&priv->usb->dev, "alloc tx urb failed\n");
KERN_ERR "alloc tx urb failed\n");
goto free_tx; goto free_tx;
} }
...@@ -590,15 +586,13 @@ static bool device_alloc_bufs(struct vnt_private *priv) ...@@ -590,15 +586,13 @@ static bool device_alloc_bufs(struct vnt_private *priv)
/* allocate URBs */ /* allocate URBs */
rcb->pUrb = usb_alloc_urb(0, GFP_ATOMIC); rcb->pUrb = usb_alloc_urb(0, GFP_ATOMIC);
if (rcb->pUrb == NULL) { if (rcb->pUrb == NULL) {
DBG_PRT(MSG_LEVEL_ERR, KERN_ERR dev_err(&priv->usb->dev, "Failed to alloc rx urb\n");
" Failed to alloc rx urb\n");
goto free_rx_tx; goto free_rx_tx;
} }
rcb->skb = dev_alloc_skb(priv->rx_buf_sz); rcb->skb = dev_alloc_skb(priv->rx_buf_sz);
if (rcb->skb == NULL) { if (rcb->skb == NULL) {
DBG_PRT(MSG_LEVEL_ERR, KERN_ERR dev_err(&priv->usb->dev, "Failed to alloc rx skb\n");
" Failed to alloc rx skb\n");
goto free_rx_tx; goto free_rx_tx;
} }
...@@ -611,13 +605,13 @@ static bool device_alloc_bufs(struct vnt_private *priv) ...@@ -611,13 +605,13 @@ static bool device_alloc_bufs(struct vnt_private *priv)
priv->pInterruptURB = usb_alloc_urb(0, GFP_ATOMIC); priv->pInterruptURB = usb_alloc_urb(0, GFP_ATOMIC);
if (priv->pInterruptURB == NULL) { 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; goto free_rx_tx;
} }
priv->int_buf.data_buf = kmalloc(MAX_INTERRUPT_SIZE, GFP_KERNEL); priv->int_buf.data_buf = kmalloc(MAX_INTERRUPT_SIZE, GFP_KERNEL);
if (priv->int_buf.data_buf == NULL) { 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); usb_free_urb(priv->pInterruptURB);
goto free_rx_tx; goto free_rx_tx;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment