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>

diff --git a/drivers/staging/keucr/init.c b/drivers/staging/keucr/init.c
index f51180e45eeb167234867bdf753e8a8832739f12..08b6c3dfa9c716b6f20d01dc0b6193188ecc70e6 100644 (file)
--- 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 4900cfb87aabaa927ed38b76ac1c8a020d0fb583..346c5702f41116ad549dcf5bf3c9caf7fb5920e8 100644 (file)
--- 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;
        }