diff options
| author | Laura Lawniczak | 2013-06-06 18:10:48 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2013-06-06 20:48:50 +0200 |
| commit | 6fbb90bf285e2d6fdfe6b4de244e1e13803dd7b7 (patch) | |
| tree | 8ac72ef1500e9bd8eb0fd37cb6d4f9d55e014203 /drivers/staging/keucr | |
| parent | keucr: migrate printk to dev_dbg/info/warn/err (diff) | |
| download | kernel-qcow2-linux-6fbb90bf285e2d6fdfe6b4de244e1e13803dd7b7.tar.gz kernel-qcow2-linux-6fbb90bf285e2d6fdfe6b4de244e1e13803dd7b7.tar.xz kernel-qcow2-linux-6fbb90bf285e2d6fdfe6b4de244e1e13803dd7b7.zip | |
keucr: more readable and friendly error messages
Signed-off-by: Laura Lawniczak <laura.lawniczak@googlemail.com>
Signed-off-by: Johannes Schilling <of82ecuq@cip.cs.fau.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/keucr')
| -rw-r--r-- | drivers/staging/keucr/init.c | 13 | ||||
| -rw-r--r-- | drivers/staging/keucr/smilsub.c | 21 |
2 files changed, 23 insertions, 11 deletions
diff --git a/drivers/staging/keucr/init.c b/drivers/staging/keucr/init.c index f51180e45eeb..08b6c3dfa9c7 100644 --- a/drivers/staging/keucr/init.c +++ b/drivers/staging/keucr/init.c @@ -22,7 +22,7 @@ int ENE_InitMedia(struct us_data *us) dev_info(&us->pusb_dev->dev, "--- Init Media ---\n"); result = ene_read_byte(us, REG_CARD_STATUS, &MiscReg03); if (result != USB_STOR_XFER_GOOD) { - dev_err(&us->pusb_dev->dev, "Read register fail !!\n"); + dev_err(&us->pusb_dev->dev, "Failed to read register\n"); return USB_STOR_TRANSPORT_ERROR; } dev_info(&us->pusb_dev->dev, "MiscReg03 = %x\n", MiscReg03); @@ -71,7 +71,9 @@ int ENE_SMInit(struct us_data *us) result = ENE_LoadBinCode(us, SM_INIT_PATTERN); if (result != USB_STOR_XFER_GOOD) { - dev_info(&us->pusb_dev->dev, "Load SM Init Code Fail !!\n"); + dev_info(&us->pusb_dev->dev, + "Failed to load SmartMedia init code\n: result= %x\n", + result); return USB_STOR_TRANSPORT_ERROR; } @@ -84,7 +86,9 @@ int ENE_SMInit(struct us_data *us) result = ENE_SendScsiCmd(us, FDIR_READ, &buf, 0); if (result != USB_STOR_XFER_GOOD) { - dev_err(&us->pusb_dev->dev, "Execution SM Init Code Fail !! result = %x\n", result); + dev_err(&us->pusb_dev->dev, + "Failed to load SmartMedia init code: result = %x\n", + result); return USB_STOR_TRANSPORT_ERROR; } @@ -102,7 +106,8 @@ int ENE_SMInit(struct us_data *us) MediaChange = 1; Check_D_MediaFmt(us); } else { - dev_err(&us->pusb_dev->dev, "SM Card Not Ready --- %x\n", buf[0]); + dev_err(&us->pusb_dev->dev, + "SmartMedia Card Not Ready --- %x\n", buf[0]); return USB_STOR_TRANSPORT_ERROR; } diff --git a/drivers/staging/keucr/smilsub.c b/drivers/staging/keucr/smilsub.c index 4900cfb87aab..346c5702f411 100644 --- a/drivers/staging/keucr/smilsub.c +++ b/drivers/staging/keucr/smilsub.c @@ -214,7 +214,8 @@ int Ssfdc_D_ReadSect(struct us_data *us, BYTE *buf, BYTE *redundant) result = ENE_LoadBinCode(us, SM_RW_PATTERN); if (result != USB_STOR_XFER_GOOD) { - dev_err(&us->pusb_dev->dev, "Load SM RW Code Fail !!\n"); + dev_err(&us->pusb_dev->dev, + "Failed to load SmartMedia read/write code\n"); return USB_STOR_TRANSPORT_ERROR; } @@ -266,7 +267,8 @@ int Ssfdc_D_ReadBlock(struct us_data *us, WORD count, BYTE *buf, result = ENE_LoadBinCode(us, SM_RW_PATTERN); if (result != USB_STOR_XFER_GOOD) { - dev_err(&us->pusb_dev->dev, "Load SM RW Code Fail !!\n"); + dev_err(&us->pusb_dev->dev, + "Failed to load SmartMedia read/write code\n"); return USB_STOR_TRANSPORT_ERROR; } @@ -319,7 +321,8 @@ int Ssfdc_D_CopyBlock(struct us_data *us, WORD count, BYTE *buf, result = ENE_LoadBinCode(us, SM_RW_PATTERN); if (result != USB_STOR_XFER_GOOD) { - dev_err(&us->pusb_dev->dev, "Load SM RW Code Fail !!\n"); + dev_err(&us->pusb_dev->dev, + "Failed to load SmartMedia read/write code\n"); return USB_STOR_TRANSPORT_ERROR; } @@ -365,7 +368,8 @@ int Ssfdc_D_WriteSectForCopy(struct us_data *us, BYTE *buf, BYTE *redundant) result = ENE_LoadBinCode(us, SM_RW_PATTERN); if (result != USB_STOR_XFER_GOOD) { - dev_err(&us->pusb_dev->dev, "Load SM RW Code Fail !!\n"); + dev_err(&us->pusb_dev->dev, + "Failed to load SmartMedia read/write code\n"); return USB_STOR_TRANSPORT_ERROR; } @@ -403,7 +407,8 @@ int Ssfdc_D_EraseBlock(struct us_data *us) result = ENE_LoadBinCode(us, SM_RW_PATTERN); if (result != USB_STOR_XFER_GOOD) { - dev_err(&us->pusb_dev->dev, "Load SM RW Code Fail !!\n"); + dev_err(&us->pusb_dev->dev, + "Failed to load SmartMedia read/write code\n"); return USB_STOR_TRANSPORT_ERROR; } @@ -438,7 +443,8 @@ int Ssfdc_D_ReadRedtData(struct us_data *us, BYTE *redundant) result = ENE_LoadBinCode(us, SM_RW_PATTERN); if (result != USB_STOR_XFER_GOOD) { - dev_err(&us->pusb_dev->dev, "Load SM RW Code Fail !!\n"); + dev_err(&us->pusb_dev->dev, + "Failed to load SmartMedia read/write code\n"); return USB_STOR_TRANSPORT_ERROR; } @@ -477,7 +483,8 @@ int Ssfdc_D_WriteRedtData(struct us_data *us, BYTE *redundant) result = ENE_LoadBinCode(us, SM_RW_PATTERN); if (result != USB_STOR_XFER_GOOD) { - dev_err(&us->pusb_dev->dev, "Load SM RW Code Fail !!\n"); + dev_err(&us->pusb_dev->dev, + "Failed to load SmartMedia read/write code\n"); return USB_STOR_TRANSPORT_ERROR; } |