keucr: migrate printk to dev_dbg/info/warn/err

as per suggestion of checkpatch.pl; this resolves warnings like "Prefer
netdev_info .. then dev_info .. to printk".
Changed signature of function usb_stor_print_cmd in init.c to enable
usage of dev_err

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 ce25405a02aeccfd9c51ae2b5ba929cea743a219..f51180e45eeb167234867bdf753e8a8832739f12 100644 (file)
--- a/drivers/staging/keucr/init.c
+++ b/drivers/staging/keucr/init.c
@@ -19,13 +19,13 @@ int ENE_InitMedia(struct us_data *us)
        int     result;
        BYTE    MiscReg03 = 0;
 
-       printk(KERN_INFO "--- Init Media ---\n");
+       dev_info(&us->pusb_dev->dev, "--- Init Media ---\n");
        result = ene_read_byte(us, REG_CARD_STATUS, &MiscReg03);
        if (result != USB_STOR_XFER_GOOD) {
-               printk(KERN_ERR "Read register fail !!\n");
+               dev_err(&us->pusb_dev->dev, "Read register fail !!\n");
                return USB_STOR_TRANSPORT_ERROR;
        }
-       printk(KERN_INFO "MiscReg03 = %x\n", MiscReg03);
+       dev_info(&us->pusb_dev->dev, "MiscReg03 = %x\n", MiscReg03);
 
        if (MiscReg03 & 0x02) {
                if (!us->SM_Status.Ready && !us->MS_Status.Ready) {
@@ -67,11 +67,11 @@ int ENE_SMInit(struct us_data *us)
        int     result;
        BYTE    buf[0x200];
 
-       printk(KERN_INFO "transport --- ENE_SMInit\n");
+       dev_dbg(&us->pusb_dev->dev, "transport --- ENE_SMInit\n");
 
        result = ENE_LoadBinCode(us, SM_INIT_PATTERN);
        if (result != USB_STOR_XFER_GOOD) {
-               printk(KERN_INFO "Load SM Init Code Fail !!\n");
+               dev_info(&us->pusb_dev->dev, "Load SM Init Code Fail !!\n");
                return USB_STOR_TRANSPORT_ERROR;
        }
 
@@ -84,8 +84,7 @@ int ENE_SMInit(struct us_data *us)
 
        result = ENE_SendScsiCmd(us, FDIR_READ, &buf, 0);
        if (result != USB_STOR_XFER_GOOD) {
-               printk(KERN_ERR
-                      "Execution SM Init Code Fail !! result = %x\n", result);
+               dev_err(&us->pusb_dev->dev, "Execution SM Init Code Fail !! result = %x\n", result);
                return USB_STOR_TRANSPORT_ERROR;
        }
 
@@ -95,15 +94,15 @@ int ENE_SMInit(struct us_data *us)
        us->SM_CardID   = buf[2];
 
        if (us->SM_Status.Insert && us->SM_Status.Ready) {
-               printk(KERN_INFO "Insert     = %x\n", us->SM_Status.Insert);
-               printk(KERN_INFO "Ready      = %x\n", us->SM_Status.Ready);
-               printk(KERN_INFO "WtP        = %x\n", us->SM_Status.WtP);
-               printk(KERN_INFO "DeviceID   = %x\n", us->SM_DeviceID);
-               printk(KERN_INFO "CardID     = %x\n", us->SM_CardID);
+               dev_info(&us->pusb_dev->dev, "Insert     = %x\n", us->SM_Status.Insert);
+               dev_info(&us->pusb_dev->dev, "Ready      = %x\n", us->SM_Status.Ready);
+               dev_info(&us->pusb_dev->dev, "WtP        = %x\n", us->SM_Status.WtP);
+               dev_info(&us->pusb_dev->dev, "DeviceID   = %x\n", us->SM_DeviceID);
+               dev_info(&us->pusb_dev->dev, "CardID     = %x\n", us->SM_CardID);
                MediaChange = 1;
                Check_D_MediaFmt(us);
        } else {
-               printk(KERN_ERR "SM Card Not Ready --- %x\n", buf[0]);
+               dev_err(&us->pusb_dev->dev, "SM Card Not Ready --- %x\n", buf[0]);
                return USB_STOR_TRANSPORT_ERROR;
        }
 
@@ -120,7 +119,7 @@ int ENE_LoadBinCode(struct us_data *us, BYTE flag)
        /* void *buf; */
        PBYTE buf;
 
-       /* printk(KERN_INFO "transport --- ENE_LoadBinCode\n"); */
+       /* dev_info(&us->pusb_dev->dev, "transport --- ENE_LoadBinCode\n"); */
        if (us->BIN_FLAG == flag)
                return USB_STOR_TRANSPORT_GOOD;
 
@@ -130,11 +129,11 @@ int ENE_LoadBinCode(struct us_data *us, BYTE flag)
        switch (flag) {
        /* For SS */
        case SM_INIT_PATTERN:
-               printk(KERN_INFO "SM_INIT_PATTERN\n");
+               dev_dbg(&us->pusb_dev->dev, "SM_INIT_PATTERN\n");
                memcpy(buf, SM_Init, 0x800);
                break;
        case SM_RW_PATTERN:
-               printk(KERN_INFO "SM_RW_PATTERN\n");
+               dev_dbg(&us->pusb_dev->dev, "SM_RW_PATTERN\n");
                memcpy(buf, SM_Rdwr, 0x800);
                break;
        }
@@ -165,12 +164,12 @@ int ENE_SendScsiCmd(struct us_data *us, BYTE fDir, void *buf, int use_sg)
                     cswlen = 0, partial = 0;
        unsigned int residue;
 
-       /* printk(KERN_INFO "transport --- ENE_SendScsiCmd\n"); */
+       /* dev_dbg(&us->pusb_dev->dev, "transport --- ENE_SendScsiCmd\n"); */
        /* send cmd to out endpoint */
        result = usb_stor_bulk_transfer_buf(us, us->send_bulk_pipe,
                                            bcb, US_BULK_CB_WRAP_LEN, NULL);
        if (result != USB_STOR_XFER_GOOD) {
-               printk(KERN_ERR "send cmd to out endpoint fail ---\n");
+               dev_err(&us->pusb_dev->dev, "send cmd to out endpoint fail ---\n");
                return USB_STOR_TRANSPORT_ERROR;
        }
 
@@ -189,7 +188,7 @@ int ENE_SendScsiCmd(struct us_data *us, BYTE fDir, void *buf, int use_sg)
                        result = usb_stor_bulk_transfer_sg(us, pipe, buf,
                                                transfer_length, 0, &partial);
                if (result != USB_STOR_XFER_GOOD) {
-                       printk(KERN_ERR "data transfer fail ---\n");
+                       dev_err(&us->pusb_dev->dev, "data transfer fail ---\n");
                        return USB_STOR_TRANSPORT_ERROR;
                }
        }
@@ -199,14 +198,14 @@ int ENE_SendScsiCmd(struct us_data *us, BYTE fDir, void *buf, int use_sg)
                                                US_BULK_CS_WRAP_LEN, &cswlen);
 
        if (result == USB_STOR_XFER_SHORT && cswlen == 0) {
-               printk(KERN_WARNING "Received 0-length CSW; retrying...\n");
+               dev_warn(&us->pusb_dev->dev, "Received 0-length CSW; retrying...\n");
                result = usb_stor_bulk_transfer_buf(us, us->recv_bulk_pipe,
                                        bcs, US_BULK_CS_WRAP_LEN, &cswlen);
        }
 
        if (result == USB_STOR_XFER_STALLED) {
                /* get the status again */
-               printk(KERN_WARNING "Attempting to get CSW (2nd try)...\n");
+               dev_warn(&us->pusb_dev->dev, "Attempting to get CSW (2nd try)...\n");
                result = usb_stor_bulk_transfer_buf(us, us->recv_bulk_pipe,
                                                bcs, US_BULK_CS_WRAP_LEN, NULL);
        }
@@ -243,7 +242,7 @@ int ENE_Read_Data(struct us_data *us, void *buf, unsigned int length)
        struct bulk_cs_wrap *bcs = (struct bulk_cs_wrap *) us->iobuf;
        int result;
 
-       /* printk(KERN_INFO "transport --- ENE_Read_Data\n"); */
+       /* dev_dbg(&us->pusb_dev->dev, "transport --- ENE_Read_Data\n"); */
        /* set up the command wrapper */
        memset(bcb, 0, sizeof(struct bulk_cb_wrap));
        bcb->Signature = cpu_to_le32(US_BULK_CB_SIGN);
@@ -321,7 +320,7 @@ int ENE_Write_Data(struct us_data *us, void *buf, unsigned int length)
 /*
  * usb_stor_print_cmd():
  */
-void usb_stor_print_cmd(struct scsi_cmnd *srb)
+void usb_stor_print_cmd(struct us_data *us,struct scsi_cmnd *srb)
 {
        PBYTE   Cdb = srb->cmnd;
        DWORD   cmd = Cdb[0];
@@ -333,37 +332,36 @@ void usb_stor_print_cmd(struct scsi_cmnd *srb)
 
        switch (cmd) {
        case TEST_UNIT_READY:
-               /* printk(KERN_INFO
-                        "scsi cmd %X --- SCSIOP_TEST_UNIT_READY\n", cmd); */
+               /* dev_dbg(
+                        &us->pusb_dev->dev, "scsi cmd %X --- SCSIOP_TEST_UNIT_READY\n", cmd); */
                break;
        case INQUIRY:
-               printk(KERN_INFO "scsi cmd %X --- SCSIOP_INQUIRY\n", cmd);
+               dev_dbg(&us->pusb_dev->dev, "scsi cmd %X --- SCSIOP_INQUIRY\n", cmd);
                break;
        case MODE_SENSE:
-               printk(KERN_INFO "scsi cmd %X --- SCSIOP_MODE_SENSE\n", cmd);
+               dev_dbg(&us->pusb_dev->dev, "scsi cmd %X --- SCSIOP_MODE_SENSE\n", cmd);
                break;
        case START_STOP:
-               printk(KERN_INFO "scsi cmd %X --- SCSIOP_START_STOP\n", cmd);
+               dev_dbg(&us->pusb_dev->dev, "scsi cmd %X --- SCSIOP_START_STOP\n", cmd);
                break;
        case READ_CAPACITY:
-               printk(KERN_INFO "scsi cmd %X --- SCSIOP_READ_CAPACITY\n", cmd);
+               dev_dbg(&us->pusb_dev->dev, "scsi cmd %X --- SCSIOP_READ_CAPACITY\n", cmd);
                break;
        case READ_10:
-               /*  printk(KERN_INFO
-                          "scsi cmd %X --- SCSIOP_READ,bn = %X, blen = %X\n"
+               /*  dev_dbg(
+                          &us->pusb_dev->dev, "scsi cmd %X --- SCSIOP_READ,bn = %X, blen = %X\n"
                           ,cmd, bn, blen); */
                break;
        case WRITE_10:
-               /* printk(KERN_INFO
-                         "scsi cmd %X --- SCSIOP_WRITE,
+               /* dev_dbg(
+                         &us->pusb_dev->dev, "scsi cmd %X --- SCSIOP_WRITE,
                          bn = %X, blen = %X\n" , cmd, bn, blen); */
                break;
        case ALLOW_MEDIUM_REMOVAL:
-               printk(KERN_INFO
-                       "scsi cmd %X --- SCSIOP_ALLOW_MEDIUM_REMOVAL\n", cmd);
+               dev_dbg(&us->pusb_dev->dev, "scsi cmd %X --- SCSIOP_ALLOW_MEDIUM_REMOVAL\n", cmd);
                break;
        default:
-               printk(KERN_INFO "scsi cmd %X --- Other cmd\n", cmd);
+               dev_dbg(&us->pusb_dev->dev, "scsi cmd %X --- Other cmd\n", cmd);
                break;
        }
        bn = 0;

diff --git a/drivers/staging/keucr/scsiglue.c b/drivers/staging/keucr/scsiglue.c
index 2894ce7a064d9392395ebc97f424ea1fd6bf382b..54a89ffcce49039a048728e6531d0ffab2bfc75a 100644 (file)
--- a/drivers/staging/keucr/scsiglue.c
+++ b/drivers/staging/keucr/scsiglue.c
@@ -145,7 +145,7 @@ static int command_abort(struct scsi_cmnd *srb)
        scsi_lock(us_to_host(us));
        if (us->srb != srb) {
                scsi_unlock(us_to_host(us));
-               printk("-- nothing to abort\n");
+               dev_info(&us->pusb_dev->dev, "-- nothing to abort\n");
                return FAILED;
        }
 

diff --git a/drivers/staging/keucr/smilsub.c b/drivers/staging/keucr/smilsub.c
index 815be93a407130da2090aa5209d6896035def44e..4900cfb87aabaa927ed38b76ac1c8a020d0fb583 100644 (file)
--- a/drivers/staging/keucr/smilsub.c
+++ b/drivers/staging/keucr/smilsub.c
@@ -214,7 +214,7 @@ 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) {
-               printk("Load SM RW Code Fail !!\n");
+               dev_err(&us->pusb_dev->dev, "Load SM RW Code Fail !!\n");
                return USB_STOR_TRANSPORT_ERROR;
        }
 
@@ -266,7 +266,7 @@ 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) {
-               printk("Load SM RW Code Fail !!\n");
+               dev_err(&us->pusb_dev->dev, "Load SM RW Code Fail !!\n");
                return USB_STOR_TRANSPORT_ERROR;
        }
 
@@ -319,7 +319,7 @@ 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) {
-               printk("Load SM RW Code Fail !!\n");
+               dev_err(&us->pusb_dev->dev, "Load SM RW Code Fail !!\n");
                return USB_STOR_TRANSPORT_ERROR;
        }
 
@@ -365,7 +365,7 @@ 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) {
-               printk("Load SM RW Code Fail !!\n");
+               dev_err(&us->pusb_dev->dev, "Load SM RW Code Fail !!\n");
                return USB_STOR_TRANSPORT_ERROR;
        }
 
@@ -403,7 +403,7 @@ int Ssfdc_D_EraseBlock(struct us_data *us)
 
        result = ENE_LoadBinCode(us, SM_RW_PATTERN);
        if (result != USB_STOR_XFER_GOOD) {
-               printk("Load SM RW Code Fail !!\n");
+               dev_err(&us->pusb_dev->dev, "Load SM RW Code Fail !!\n");
                return USB_STOR_TRANSPORT_ERROR;
        }
 
@@ -438,7 +438,7 @@ int Ssfdc_D_ReadRedtData(struct us_data *us, BYTE *redundant)
 
        result = ENE_LoadBinCode(us, SM_RW_PATTERN);
        if (result != USB_STOR_XFER_GOOD) {
-               printk("Load SM RW Code Fail !!\n");
+               dev_err(&us->pusb_dev->dev, "Load SM RW Code Fail !!\n");
                return USB_STOR_TRANSPORT_ERROR;
        }
 
@@ -477,7 +477,7 @@ int Ssfdc_D_WriteRedtData(struct us_data *us, BYTE *redundant)
 
        result = ENE_LoadBinCode(us, SM_RW_PATTERN);
        if (result != USB_STOR_XFER_GOOD) {
-               printk("Load SM RW Code Fail !!\n");
+               dev_err(&us->pusb_dev->dev, "Load SM RW Code Fail !!\n");
                return USB_STOR_TRANSPORT_ERROR;
        }
 

diff --git a/drivers/staging/keucr/smscsi.c b/drivers/staging/keucr/smscsi.c
index cda2447e9829277bcbf83503fcb16f45c1ca589b..572d6489b66b0e618df083e874fb5f0f5e14faf5 100644 (file)
--- a/drivers/staging/keucr/smscsi.c
+++ b/drivers/staging/keucr/smscsi.c
@@ -109,14 +109,14 @@ int SM_SCSI_Read_Capacity(struct us_data *us, struct scsi_cmnd *srb)
        WORD    bl_len;
        BYTE    buf[8];
 
-       printk("SM_SCSI_Read_Capacity\n");
+       dev_dbg(&us->pusb_dev->dev, "SM_SCSI_Read_Capacity\n");
 
        bl_len = 0x200;
        bl_num = Ssfdc.MaxLogBlocks * Ssfdc.MaxSectors * Ssfdc.MaxZones - 1;
 
        us->bl_num = bl_num;
-       printk("bl_len = %x\n", bl_len);
-       printk("bl_num = %x\n", bl_num);
+       dev_dbg(&us->pusb_dev->dev, "bl_len = %x\n", bl_len);
+       dev_dbg(&us->pusb_dev->dev, "bl_num = %x\n", bl_num);
 
        buf[0] = (bl_num >> 24) & 0xff;
        buf[1] = (bl_num >> 16) & 0xff;

diff --git a/drivers/staging/keucr/transport.c b/drivers/staging/keucr/transport.c
index ab1eccdee583d536b74d40e45268babacaad28de..1de1115eb14ffd720149f858a80526aa3352626f 100644 (file)
--- a/drivers/staging/keucr/transport.c
+++ b/drivers/staging/keucr/transport.c
@@ -303,7 +303,7 @@ void usb_stor_invoke_transport(struct scsi_cmnd *srb, struct us_data *us)
        int result;
 
        /* pr_info("transport --- usb_stor_invoke_transport\n"); */
-       usb_stor_print_cmd(srb);
+       usb_stor_print_cmd(us, srb);
        /* send the command to the transport layer */
        scsi_set_resid(srb, 0);
        result = us->transport(srb, us); /* usb_stor_Bulk_transport; */
@@ -429,7 +429,7 @@ void ENE_stor_invoke_transport(struct scsi_cmnd *srb, struct us_data *us)
        int result = 0;
 
        /* pr_info("transport --- ENE_stor_invoke_transport\n"); */
-       usb_stor_print_cmd(srb);
+       usb_stor_print_cmd(us, srb);
        /* send the command to the transport layer */
        scsi_set_resid(srb, 0);
        if (!(us->SM_Status.Ready))

diff --git a/drivers/staging/keucr/transport.h b/drivers/staging/keucr/transport.h
index 7015b213eb2e6f5c59659ff6173733131cb316d1..2cdaa4917affa96bd087e591af12dc59486ebec7 100644 (file)
--- a/drivers/staging/keucr/transport.h
+++ b/drivers/staging/keucr/transport.h
@@ -29,7 +29,7 @@
 extern int usb_stor_Bulk_transport(struct scsi_cmnd *, struct us_data*);
 extern int usb_stor_Bulk_max_lun(struct us_data *);
 extern int usb_stor_Bulk_reset(struct us_data *);
-extern void usb_stor_print_cmd(struct scsi_cmnd *);
+extern void usb_stor_print_cmd(struct us_data *, struct scsi_cmnd *);
 extern void usb_stor_invoke_transport(struct scsi_cmnd *, struct us_data*);
 extern void usb_stor_stop_transport(struct us_data *);
 extern int usb_stor_control_msg(struct us_data *us, unsigned int pipe,