diff options
| author | Malcolm Priestley <tvboxspy@gmail.com> | 2014-06-04 18:25:30 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-06-19 15:59:49 -0700 |
| commit | 9197f35ba26d266bd8cf873782fc221f0a280743 (patch) | |
| tree | 7262e8513b59f2b3769cfc263f5471a2b3a5b3d4 /drivers/staging/vt6656/firmware.c | |
| parent | 0fe8b957a2c6b4a5262051dac0fdd5b7d0c72d43 (diff) | |
| download | op-kernel-dev-9197f35ba26d266bd8cf873782fc221f0a280743.zip op-kernel-dev-9197f35ba26d266bd8cf873782fc221f0a280743.tar.gz | |
staging: vt6656: firmware.c replace DBG_PRT debug messages
Replace with dev_dbg
Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/vt6656/firmware.c')
| -rw-r--r-- | drivers/staging/vt6656/firmware.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/drivers/staging/vt6656/firmware.c b/drivers/staging/vt6656/firmware.c index a74a42d..83680bc 100644 --- a/drivers/staging/vt6656/firmware.c +++ b/drivers/staging/vt6656/firmware.c @@ -35,9 +35,6 @@ #include "firmware.h" #include "usbpipe.h" -static int msglevel = MSG_LEVEL_INFO; -/* static int msglevel = MSG_LEVEL_DEBUG; */ - #define FIRMWARE_VERSION 0x133 /* version 1.51 */ #define FIRMWARE_NAME "vntwusb.fw" @@ -53,7 +50,7 @@ int FIRMWAREbDownload(struct vnt_private *priv) u16 length; int ii, rc; - DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"---->Download firmware\n"); + dev_dbg(dev, "---->Download firmware\n"); rc = request_firmware(&fw, FIRMWARE_NAME, dev); if (rc) { @@ -77,8 +74,8 @@ int FIRMWAREbDownload(struct vnt_private *priv) length, buffer); - DBG_PRT(MSG_LEVEL_DEBUG, - KERN_INFO"Download firmware...%d %zu\n", ii, fw->size); + dev_dbg(dev, "Download firmware...%d %zu\n", ii, fw->size); + if (status != STATUS_SUCCESS) goto free_fw; } @@ -98,7 +95,7 @@ int FIRMWAREbBrach2Sram(struct vnt_private *priv) { int status; - DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"---->Branch to Sram\n"); + dev_dbg(&priv->usb->dev, "---->Branch to Sram\n"); status = vnt_control_out(priv, 1, @@ -123,18 +120,21 @@ int FIRMWAREbCheckVersion(struct vnt_private *priv) 2, (u8 *) &(priv->wFirmwareVersion)); - DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Firmware Version [%04x]\n", + dev_dbg(&priv->usb->dev, "Firmware Version [%04x]\n", priv->wFirmwareVersion); + if (status != STATUS_SUCCESS) { - DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Firmware Invalid.\n"); + dev_dbg(&priv->usb->dev, "Firmware Invalid.\n"); return false; } if (priv->wFirmwareVersion == 0xFFFF) { - DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"In Loader.\n"); + dev_dbg(&priv->usb->dev, "In Loader.\n"); return false; } - DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Firmware Version [%04x]\n", + + dev_dbg(&priv->usb->dev, "Firmware Version [%04x]\n", priv->wFirmwareVersion); + if (priv->wFirmwareVersion < FIRMWARE_VERSION) { /* branch to loader for download new firmware */ FIRMWAREbBrach2Sram(priv); |
