* [PATCH 1/6] keucr: remove some unneccesary typedefs
2013-06-06 16:10 ` [PATCH 0/6] keucr: checkpatch fixes Johannes Schilling
@ 2013-06-06 16:10 ` Johannes Schilling
2013-06-06 16:10 ` [PATCH 2/6] keucr: use more specific max_t(int, Johannes Schilling
` (5 subsequent siblings)
6 siblings, 0 replies; 30+ messages in thread
From: Johannes Schilling @ 2013-06-06 16:10 UTC (permalink / raw)
To: linux-kernel
Cc: linux-kernel, Al Cho, Greg Kroah-Hartman, Amarjargal Gundjalam,
Kurt Kanzenbach, devel, Laura Lawniczak, Johannes Schilling,
Dan Carpenter
resolves checkpatch.pl warning "do not add new typedefs" and renames allcaps
structures.
Signed-off-by: Laura Lawniczak <laura.lawniczak@googlemail.com>
Signed-off-by: Johannes Schilling <of82ecuq@cip.cs.fau.de>
---
drivers/staging/keucr/init.c | 2 +-
drivers/staging/keucr/smil.h | 28 ++++++----------------------
drivers/staging/keucr/smilsub.c | 6 +++---
drivers/staging/keucr/usb.c | 4 ++--
drivers/staging/keucr/usb.h | 18 +++++++++---------
5 files changed, 21 insertions(+), 37 deletions(-)
diff --git a/drivers/staging/keucr/init.c b/drivers/staging/keucr/init.c
index cb50eb2..ce25405 100644
--- a/drivers/staging/keucr/init.c
+++ b/drivers/staging/keucr/init.c
@@ -89,7 +89,7 @@ int ENE_SMInit(struct us_data *us)
return USB_STOR_TRANSPORT_ERROR;
}
- us->SM_Status = *(PSM_STATUS)&buf[0];
+ us->SM_Status = *(struct keucr_sm_status *)&buf[0];
us->SM_DeviceID = buf[1];
us->SM_CardID = buf[2];
diff --git a/drivers/staging/keucr/smil.h b/drivers/staging/keucr/smil.h
index 24a636a..1538d7b 100644
--- a/drivers/staging/keucr/smil.h
+++ b/drivers/staging/keucr/smil.h
@@ -168,7 +168,7 @@ SmartMedia Model & Attribute
/***************************************************************************
Struct Definition
***************************************************************************/
-struct SSFDCTYPE {
+struct keucr_media_info {
BYTE Model;
BYTE Attribute;
BYTE MaxZones;
@@ -177,30 +177,14 @@ struct SSFDCTYPE {
WORD MaxLogBlocks;
};
-typedef struct SSFDCTYPE_T {
- BYTE Model;
- BYTE Attribute;
- BYTE MaxZones;
- BYTE MaxSectors;
- WORD MaxBlocks;
- WORD MaxLogBlocks;
-} *SSFDCTYPE_T;
-
-struct ADDRESS {
+struct keucr_media_address {
BYTE Zone; /* Zone Number */
BYTE Sector; /* Sector(512byte) Number on Block */
WORD PhyBlock; /* Physical Block Number on Zone */
WORD LogBlock; /* Logical Block Number of Zone */
};
-typedef struct ADDRESS_T {
- BYTE Zone; /* Zone Number */
- BYTE Sector; /* Sector(512byte) Number on Block */
- WORD PhyBlock; /* Physical Block Number on Zone */
- WORD LogBlock; /* Logical Block Number of Zone */
-} *ADDRESS_T;
-
-struct CIS_AREA {
+struct keucr_media_area {
BYTE Sector; /* Sector(512byte) Number on Block */
WORD PhyBlock; /* Physical Block Number on Zone 0 */
};
@@ -215,9 +199,9 @@ extern WORD ReadBlock;
extern WORD WriteBlock;
extern DWORD MediaChange;
-extern struct SSFDCTYPE Ssfdc;
-extern struct ADDRESS Media;
-extern struct CIS_AREA CisArea;
+extern struct keucr_media_info Ssfdc;
+extern struct keucr_media_address Media;
+extern struct keucr_media_area CisArea;
/*
* SMILMain.c
diff --git a/drivers/staging/keucr/smilsub.c b/drivers/staging/keucr/smilsub.c
index b10e8c2..815be93 100644
--- a/drivers/staging/keucr/smilsub.c
+++ b/drivers/staging/keucr/smilsub.c
@@ -33,9 +33,9 @@ void _Set_D_ECCdata(BYTE, BYTE *);
void _Calc_D_ECCdata(BYTE *);
-struct SSFDCTYPE Ssfdc;
-struct ADDRESS Media;
-struct CIS_AREA CisArea;
+struct keucr_media_info Ssfdc;
+struct keucr_media_address Media;
+struct keucr_media_area CisArea;
static BYTE EccBuf[6];
extern PBYTE SMHostAddr;
diff --git a/drivers/staging/keucr/usb.c b/drivers/staging/keucr/usb.c
index 0608a5c..f18b1c2 100644
--- a/drivers/staging/keucr/usb.c
+++ b/drivers/staging/keucr/usb.c
@@ -65,7 +65,7 @@ static int eucr_resume(struct usb_interface *iface)
us->Power_IsResum = true;
- us->SM_Status = *(PSM_STATUS)&tmp;
+ us->SM_Status = *(struct keucr_sm_status *)&tmp;
return 0;
}
@@ -87,7 +87,7 @@ static int eucr_reset_resume(struct usb_interface *iface)
us->Power_IsResum = true;
- us->SM_Status = *(PSM_STATUS)&tmp;
+ us->SM_Status = *(struct keucr_sm_status *)&tmp;
return 0;
}
diff --git a/drivers/staging/keucr/usb.h b/drivers/staging/keucr/usb.h
index 2dc75b0..c724cf7 100644
--- a/drivers/staging/keucr/usb.h
+++ b/drivers/staging/keucr/usb.h
@@ -51,7 +51,7 @@ struct us_unusual_dev {
#define FDIR_WRITE 0
#define FDIR_READ 1
-typedef struct _SD_STATUS {
+struct keucr_sd_status {
BYTE Insert:1;
BYTE Ready:1;
BYTE MediaChange:1;
@@ -60,9 +60,9 @@ typedef struct _SD_STATUS {
BYTE HiSpeed:1;
BYTE WtP:1;
BYTE Reserved:1;
-} SD_STATUS, *PSD_STATUS;
+};
-typedef struct _MS_STATUS {
+struct keucr_ms_status {
BYTE Insert:1;
BYTE Ready:1;
BYTE MediaChange:1;
@@ -71,16 +71,16 @@ typedef struct _MS_STATUS {
BYTE Reserved1:1;
BYTE WtP:1;
BYTE Reserved2:1;
-} MS_STATUS, *PMS_STATUS;
+};
-typedef struct _SM_STATUS {
+struct keucr_sm_status {
BYTE Insert:1;
BYTE Ready:1;
BYTE MediaChange:1;
BYTE Reserved:3;
BYTE WtP:1;
BYTE IsMS:1;
-} SM_STATUS, *PSM_STATUS;
+};
/* SD Block Length */
#define SD_BLOCK_LEN 9 /* 2^9 = 512 Bytes,
@@ -178,9 +178,9 @@ struct us_data {
pm_hook suspend_resume_hook;
#endif
/* for 6250 code */
- SD_STATUS SD_Status;
- MS_STATUS MS_Status;
- SM_STATUS SM_Status;
+ struct keucr_sd_status SD_Status;
+ struct keucr_ms_status MS_Status;
+ struct keucr_sm_status SM_Status;
/* ----- SD Control Data ---------------- */
/* SD_REGISTER SD_Regs; */
--
1.7.10.4
^ permalink raw reply related [flat|nested] 30+ messages in thread* [PATCH 2/6] keucr: use more specific max_t(int, ..
2013-06-06 16:10 ` [PATCH 0/6] keucr: checkpatch fixes Johannes Schilling
2013-06-06 16:10 ` [PATCH 1/6] keucr: remove some unneccesary typedefs Johannes Schilling
@ 2013-06-06 16:10 ` Johannes Schilling
2013-06-06 16:10 ` [PATCH 3/6] keucr: migrate printk to dev_dbg/info/warn/err Johannes Schilling
` (4 subsequent siblings)
6 siblings, 0 replies; 30+ messages in thread
From: Johannes Schilling @ 2013-06-06 16:10 UTC (permalink / raw)
To: linux-kernel
Cc: linux-kernel, Al Cho, Greg Kroah-Hartman, Amarjargal Gundjalam,
Kurt Kanzenbach, devel, Laura Lawniczak, Johannes Schilling,
Dan Carpenter
as advised by checkpatch, changed generic max(..) to max_t(int, ..
Signed-off-by: Laura Lawniczak <laura.lawniczak@googlemail.com>
Signed-off-by: Johannes Schilling <of82ecuq@cip.cs.fau.de>
---
drivers/staging/keucr/transport.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/staging/keucr/transport.c b/drivers/staging/keucr/transport.c
index 1a8837d..ab1eccd 100644
--- a/drivers/staging/keucr/transport.c
+++ b/drivers/staging/keucr/transport.c
@@ -708,8 +708,8 @@ int usb_stor_Bulk_transport(struct scsi_cmnd *srb, struct us_data *us)
} else {
residue = min(residue, transfer_length);
- scsi_set_resid(srb, max(scsi_get_resid(srb),
- (int) residue));
+ scsi_set_resid(srb, max_t(int, scsi_get_resid(srb),
+ residue));
}
}
--
1.7.10.4
^ permalink raw reply related [flat|nested] 30+ messages in thread* [PATCH 3/6] keucr: migrate printk to dev_dbg/info/warn/err
2013-06-06 16:10 ` [PATCH 0/6] keucr: checkpatch fixes Johannes Schilling
2013-06-06 16:10 ` [PATCH 1/6] keucr: remove some unneccesary typedefs Johannes Schilling
2013-06-06 16:10 ` [PATCH 2/6] keucr: use more specific max_t(int, Johannes Schilling
@ 2013-06-06 16:10 ` Johannes Schilling
2013-06-06 17:53 ` Joe Perches
2013-06-06 21:14 ` Dan Carpenter
2013-06-06 16:10 ` [PATCH 4/6] keucr: more readable and friendly error messages Johannes Schilling
` (3 subsequent siblings)
6 siblings, 2 replies; 30+ messages in thread
From: Johannes Schilling @ 2013-06-06 16:10 UTC (permalink / raw)
To: linux-kernel
Cc: linux-kernel, Al Cho, Greg Kroah-Hartman, Amarjargal Gundjalam,
Kurt Kanzenbach, devel, Laura Lawniczak, Johannes Schilling,
Dan Carpenter
From: Laura Lawniczak <laura.lawniczak@googlemail.com>
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>
---
drivers/staging/keucr/init.c | 70 ++++++++++++++++++-------------------
drivers/staging/keucr/scsiglue.c | 2 +-
drivers/staging/keucr/smilsub.c | 14 ++++----
drivers/staging/keucr/smscsi.c | 6 ++--
drivers/staging/keucr/transport.c | 4 +--
drivers/staging/keucr/transport.h | 2 +-
6 files changed, 48 insertions(+), 50 deletions(-)
diff --git a/drivers/staging/keucr/init.c b/drivers/staging/keucr/init.c
index ce25405..f51180e 100644
--- 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 2894ce7..54a89ff 100644
--- 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 815be93..4900cfb 100644
--- 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 cda2447..572d648 100644
--- 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 ab1eccd..1de1115 100644
--- 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 7015b21..2cdaa49 100644
--- 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,
--
1.7.10.4
^ permalink raw reply related [flat|nested] 30+ messages in thread* Re: [PATCH 3/6] keucr: migrate printk to dev_dbg/info/warn/err
2013-06-06 16:10 ` [PATCH 3/6] keucr: migrate printk to dev_dbg/info/warn/err Johannes Schilling
@ 2013-06-06 17:53 ` Joe Perches
2013-06-06 21:11 ` Dan Carpenter
2013-06-06 21:14 ` Dan Carpenter
1 sibling, 1 reply; 30+ messages in thread
From: Joe Perches @ 2013-06-06 17:53 UTC (permalink / raw)
To: Johannes Schilling
Cc: linux-kernel, linux-kernel, Al Cho, Greg Kroah-Hartman,
Amarjargal Gundjalam, Kurt Kanzenbach, devel, Laura Lawniczak,
Dan Carpenter
On Thu, 2013-06-06 at 18:10 +0200, Johannes Schilling wrote:
> From: Laura Lawniczak <laura.lawniczak@googlemail.com>
[]
> diff --git a/drivers/staging/keucr/init.c b/drivers/staging/keucr/init.c
[]
> @@ -19,13 +19,13 @@ int ENE_InitMedia(struct us_data *us)
[]
> - printk(KERN_INFO "MiscReg03 = %x\n", MiscReg03);
> + dev_info(&us->pusb_dev->dev, "MiscReg03 = %x\n", MiscReg03);
I suggest adding a few convenience macros to make
this a bit shorter and more likely to fit on a single
line without exceeding 80 cols.
Adding something like:
#define us_<level>(us, fmt, ...) \
dev_<level>(&us->pusb_dev->dev, fmt, ##__VA_ARGS__)
so these uses become
us_info(us, "MiscReg03\n", MiscReg03);
which is shorter and more readable.
> diff --git 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");
Also, there's no need to shout in the logs.
These are reported at KERN_ERR level, so using
us_err(us, "loading SM RW code failed\n")
would be fine.
^ permalink raw reply [flat|nested] 30+ messages in thread* Re: [PATCH 3/6] keucr: migrate printk to dev_dbg/info/warn/err
2013-06-06 17:53 ` Joe Perches
@ 2013-06-06 21:11 ` Dan Carpenter
2013-06-06 21:23 ` Joe Perches
0 siblings, 1 reply; 30+ messages in thread
From: Dan Carpenter @ 2013-06-06 21:11 UTC (permalink / raw)
To: Joe Perches
Cc: Johannes Schilling, devel, Kurt Kanzenbach, linux-kernel,
Greg Kroah-Hartman, linux-kernel, Al Cho, Amarjargal Gundjalam,
Laura Lawniczak
On Thu, Jun 06, 2013 at 10:53:20AM -0700, Joe Perches wrote:
> On Thu, 2013-06-06 at 18:10 +0200, Johannes Schilling wrote:
> > From: Laura Lawniczak <laura.lawniczak@googlemail.com>
> []
> > diff --git a/drivers/staging/keucr/init.c b/drivers/staging/keucr/init.c
> []
> > @@ -19,13 +19,13 @@ int ENE_InitMedia(struct us_data *us)
> []
> > - printk(KERN_INFO "MiscReg03 = %x\n", MiscReg03);
> > + dev_info(&us->pusb_dev->dev, "MiscReg03 = %x\n", MiscReg03);
>
> I suggest adding a few convenience macros to make
> this a bit shorter and more likely to fit on a single
> line without exceeding 80 cols.
>
> Adding something like:
>
> #define us_<level>(us, fmt, ...) \
> dev_<level>(&us->pusb_dev->dev, fmt, ##__VA_ARGS__)
>
> so these uses become
>
> us_info(us, "MiscReg03\n", MiscReg03);
>
> which is shorter and more readable.
>
Wait what? That's not a readable example. Why are we passing the
MiscReg03 variable when there is no %d in the string?
You're a big fan of custom printk macros but it's better if people
can stick the to the normal ones if possible. In this case, just
using a local variable is enough:
dev_dbg(us_dev, "scsi cmd %X --- SCSIOP_ALLOW_MEDIUM_REMOVAL\n", cmd);
79 characters.
Anyway this could fixed in a later patch.
regards,
dan carpenter
^ permalink raw reply [flat|nested] 30+ messages in thread
* Re: [PATCH 3/6] keucr: migrate printk to dev_dbg/info/warn/err
2013-06-06 21:11 ` Dan Carpenter
@ 2013-06-06 21:23 ` Joe Perches
2013-06-06 22:07 ` Dan Carpenter
0 siblings, 1 reply; 30+ messages in thread
From: Joe Perches @ 2013-06-06 21:23 UTC (permalink / raw)
To: Dan Carpenter
Cc: Johannes Schilling, devel, Kurt Kanzenbach, linux-kernel,
Greg Kroah-Hartman, linux-kernel, Al Cho, Amarjargal Gundjalam,
Laura Lawniczak
On Fri, 2013-06-07 at 00:11 +0300, Dan Carpenter wrote:
> On Thu, Jun 06, 2013 at 10:53:20AM -0700, Joe Perches wrote:
> > On Thu, 2013-06-06 at 18:10 +0200, Johannes Schilling wrote:
> > > From: Laura Lawniczak <laura.lawniczak@googlemail.com>
> > []
> > > diff --git a/drivers/staging/keucr/init.c b/drivers/staging/keucr/init.c
> > []
> > > @@ -19,13 +19,13 @@ int ENE_InitMedia(struct us_data *us)
> > []
> > > - printk(KERN_INFO "MiscReg03 = %x\n", MiscReg03);
> > > + dev_info(&us->pusb_dev->dev, "MiscReg03 = %x\n", MiscReg03);
> >
> > I suggest adding a few convenience macros to make
> > this a bit shorter and more likely to fit on a single
> > line without exceeding 80 cols.
> >
> > Adding something like:
> >
> > #define us_<level>(us, fmt, ...) \
> > dev_<level>(&us->pusb_dev->dev, fmt, ##__VA_ARGS__)
> >
> > so these uses become
> >
> > us_info(us, "MiscReg03\n", MiscReg03);
> >
> > which is shorter and more readable.
> >
>
> Wait what? That's not a readable example. Why are we passing the
> MiscReg03 variable when there is no %d in the string?
'cause I forgot to add in the " = %x", Oops.
> You're a big fan of custom printk macros but it's better if people
> can stick the to the normal ones if possible. In this case, just
> using a local variable is enough:
>
> dev_dbg(us_dev, "scsi cmd %X --- SCSIOP_ALLOW_MEDIUM_REMOVAL\n", cmd);
>
> 79 characters.
<shrug> Now you need another line to set the local var
in each function. If there's only a few functions that'd
be fine.
> Anyway this could fixed in a later patch.
True, but if there are a lot of files patched separately,
putting the macro in an appropriate header first saves a
lot of follow up patches.
^ permalink raw reply [flat|nested] 30+ messages in thread
* Re: [PATCH 3/6] keucr: migrate printk to dev_dbg/info/warn/err
2013-06-06 21:23 ` Joe Perches
@ 2013-06-06 22:07 ` Dan Carpenter
0 siblings, 0 replies; 30+ messages in thread
From: Dan Carpenter @ 2013-06-06 22:07 UTC (permalink / raw)
To: Joe Perches
Cc: Johannes Schilling, devel, Kurt Kanzenbach, linux-kernel,
Greg Kroah-Hartman, linux-kernel, Al Cho, Amarjargal Gundjalam,
Laura Lawniczak
On Thu, Jun 06, 2013 at 02:23:08PM -0700, Joe Perches wrote:
> On Fri, 2013-06-07 at 00:11 +0300, Dan Carpenter wrote:
> > On Thu, Jun 06, 2013 at 10:53:20AM -0700, Joe Perches wrote:
> > > On Thu, 2013-06-06 at 18:10 +0200, Johannes Schilling wrote:
> > > > From: Laura Lawniczak <laura.lawniczak@googlemail.com>
> > > []
> > > > diff --git a/drivers/staging/keucr/init.c b/drivers/staging/keucr/init.c
> > > []
> > > > @@ -19,13 +19,13 @@ int ENE_InitMedia(struct us_data *us)
> > > []
> > > > - printk(KERN_INFO "MiscReg03 = %x\n", MiscReg03);
> > > > + dev_info(&us->pusb_dev->dev, "MiscReg03 = %x\n", MiscReg03);
> > >
> > > I suggest adding a few convenience macros to make
> > > this a bit shorter and more likely to fit on a single
> > > line without exceeding 80 cols.
> > >
> > > Adding something like:
> > >
> > > #define us_<level>(us, fmt, ...) \
> > > dev_<level>(&us->pusb_dev->dev, fmt, ##__VA_ARGS__)
> > >
> > > so these uses become
> > >
> > > us_info(us, "MiscReg03\n", MiscReg03);
> > >
> > > which is shorter and more readable.
> > >
> >
> > Wait what? That's not a readable example. Why are we passing the
> > MiscReg03 variable when there is no %d in the string?
>
> 'cause I forgot to add in the " = %x", Oops.
Ah, fine. In that case it's not an unreasonable macro.
I haven't looked at this closely enough to say for sure what option
is easiest or cleanest.
regards,
dan carpenter
^ permalink raw reply [flat|nested] 30+ messages in thread
* Re: [PATCH 3/6] keucr: migrate printk to dev_dbg/info/warn/err
2013-06-06 16:10 ` [PATCH 3/6] keucr: migrate printk to dev_dbg/info/warn/err Johannes Schilling
2013-06-06 17:53 ` Joe Perches
@ 2013-06-06 21:14 ` Dan Carpenter
1 sibling, 0 replies; 30+ messages in thread
From: Dan Carpenter @ 2013-06-06 21:14 UTC (permalink / raw)
To: Johannes Schilling
Cc: linux-kernel, devel, Kurt Kanzenbach, linux-kernel,
Greg Kroah-Hartman, Al Cho, Amarjargal Gundjalam, Laura Lawniczak
On Thu, Jun 06, 2013 at 06:10:47PM +0200, Johannes Schilling wrote:
> @@ -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)
^^
Missing space. Run checkpatch.pl over your patch to find these.
This can be fixed in a later patch I think.
> {
> PBYTE Cdb = srb->cmnd;
> DWORD cmd = Cdb[0];
regards,
dan carpenter
^ permalink raw reply [flat|nested] 30+ messages in thread
* [PATCH 4/6] keucr: more readable and friendly error messages
2013-06-06 16:10 ` [PATCH 0/6] keucr: checkpatch fixes Johannes Schilling
` (2 preceding siblings ...)
2013-06-06 16:10 ` [PATCH 3/6] keucr: migrate printk to dev_dbg/info/warn/err Johannes Schilling
@ 2013-06-06 16:10 ` Johannes Schilling
2013-06-06 21:48 ` Dan Carpenter
2013-06-06 16:10 ` [PATCH 5/6] keucr: moved function to other file Johannes Schilling
` (2 subsequent siblings)
6 siblings, 1 reply; 30+ messages in thread
From: Johannes Schilling @ 2013-06-06 16:10 UTC (permalink / raw)
To: linux-kernel
Cc: linux-kernel, Al Cho, Greg Kroah-Hartman, Amarjargal Gundjalam,
Kurt Kanzenbach, devel, Laura Lawniczak, Johannes Schilling,
Dan Carpenter
From: Laura Lawniczak <laura.lawniczak@googlemail.com>
Signed-off-by: Laura Lawniczak <laura.lawniczak@googlemail.com>
Signed-off-by: Johannes Schilling <of82ecuq@cip.cs.fau.de>
---
drivers/staging/keucr/init.c | 13 +++++++++----
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 f51180e..08b6c3d 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 4900cfb..346c570 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;
}
--
1.7.10.4
^ permalink raw reply related [flat|nested] 30+ messages in thread* Re: [PATCH 4/6] keucr: more readable and friendly error messages
2013-06-06 16:10 ` [PATCH 4/6] keucr: more readable and friendly error messages Johannes Schilling
@ 2013-06-06 21:48 ` Dan Carpenter
0 siblings, 0 replies; 30+ messages in thread
From: Dan Carpenter @ 2013-06-06 21:48 UTC (permalink / raw)
To: Johannes Schilling
Cc: linux-kernel, devel, Kurt Kanzenbach, linux-kernel,
Greg Kroah-Hartman, Al Cho, Amarjargal Gundjalam, Laura Lawniczak
On Thu, Jun 06, 2013 at 06:10:48PM +0200, Johannes Schilling wrote:
> @@ -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);
It doens't work to put newlines in the middle of a printk(). It
has to go at the end. The reason is that dev_xxx() functions add
something to the beginning of lines.
regards,
dan carpenter
^ permalink raw reply [flat|nested] 30+ messages in thread
* [PATCH 5/6] keucr: moved function to other file
2013-06-06 16:10 ` [PATCH 0/6] keucr: checkpatch fixes Johannes Schilling
` (3 preceding siblings ...)
2013-06-06 16:10 ` [PATCH 4/6] keucr: more readable and friendly error messages Johannes Schilling
@ 2013-06-06 16:10 ` Johannes Schilling
2013-06-06 21:23 ` Dan Carpenter
2013-06-06 16:10 ` [PATCH 6/6] keucr: fix some alignment- and whitespace-problems Johannes Schilling
2013-06-06 18:47 ` [PATCH 0/6] keucr: checkpatch fixes Greg Kroah-Hartman
6 siblings, 1 reply; 30+ messages in thread
From: Johannes Schilling @ 2013-06-06 16:10 UTC (permalink / raw)
To: linux-kernel
Cc: linux-kernel, Al Cho, Greg Kroah-Hartman, Amarjargal Gundjalam,
Kurt Kanzenbach, devel, Laura Lawniczak, Johannes Schilling,
Dan Carpenter
From: Laura Lawniczak <laura.lawniczak@googlemail.com>
Function usb_stor_print_cmd was declared in init.c but only used
in transport.c. So it was reasonable to move it there and declare
it static
Signed-off-by: Laura Lawniczak <laura.lawniczak@googlemail.com>
---
drivers/staging/keucr/init.c | 51 -------------------------------------
drivers/staging/keucr/transport.c | 50 ++++++++++++++++++++++++++++++++++++
drivers/staging/keucr/transport.h | 1 -
3 files changed, 50 insertions(+), 52 deletions(-)
diff --git a/drivers/staging/keucr/init.c b/drivers/staging/keucr/init.c
index 08b6c3d..53478e1 100644
--- a/drivers/staging/keucr/init.c
+++ b/drivers/staging/keucr/init.c
@@ -322,54 +322,3 @@ int ENE_Write_Data(struct us_data *us, void *buf, unsigned int length)
return USB_STOR_TRANSPORT_GOOD;
}
-/*
- * usb_stor_print_cmd():
- */
-void usb_stor_print_cmd(struct us_data *us,struct scsi_cmnd *srb)
-{
- PBYTE Cdb = srb->cmnd;
- DWORD cmd = Cdb[0];
- DWORD bn = ((Cdb[2] << 24) & 0xff000000) |
- ((Cdb[3] << 16) & 0x00ff0000) |
- ((Cdb[4] << 8) & 0x0000ff00) |
- ((Cdb[5] << 0) & 0x000000ff);
- WORD blen = ((Cdb[7] << 8) & 0xff00) | ((Cdb[8] << 0) & 0x00ff);
-
- switch (cmd) {
- case TEST_UNIT_READY:
- /* dev_dbg(
- &us->pusb_dev->dev, "scsi cmd %X --- SCSIOP_TEST_UNIT_READY\n", cmd); */
- break;
- case INQUIRY:
- dev_dbg(&us->pusb_dev->dev, "scsi cmd %X --- SCSIOP_INQUIRY\n", cmd);
- break;
- case MODE_SENSE:
- dev_dbg(&us->pusb_dev->dev, "scsi cmd %X --- SCSIOP_MODE_SENSE\n", cmd);
- break;
- case START_STOP:
- dev_dbg(&us->pusb_dev->dev, "scsi cmd %X --- SCSIOP_START_STOP\n", cmd);
- break;
- case READ_CAPACITY:
- dev_dbg(&us->pusb_dev->dev, "scsi cmd %X --- SCSIOP_READ_CAPACITY\n", cmd);
- break;
- case READ_10:
- /* dev_dbg(
- &us->pusb_dev->dev, "scsi cmd %X --- SCSIOP_READ,bn = %X, blen = %X\n"
- ,cmd, bn, blen); */
- break;
- case WRITE_10:
- /* dev_dbg(
- &us->pusb_dev->dev, "scsi cmd %X --- SCSIOP_WRITE,
- bn = %X, blen = %X\n" , cmd, bn, blen); */
- break;
- case ALLOW_MEDIUM_REMOVAL:
- dev_dbg(&us->pusb_dev->dev, "scsi cmd %X --- SCSIOP_ALLOW_MEDIUM_REMOVAL\n", cmd);
- break;
- default:
- dev_dbg(&us->pusb_dev->dev, "scsi cmd %X --- Other cmd\n", cmd);
- break;
- }
- bn = 0;
- blen = 0;
-}
-
diff --git a/drivers/staging/keucr/transport.c b/drivers/staging/keucr/transport.c
index 1de1115..b3c25d0 100644
--- a/drivers/staging/keucr/transport.c
+++ b/drivers/staging/keucr/transport.c
@@ -79,6 +79,56 @@ static int usb_stor_msg_common(struct us_data *us, int timeout)
}
/*
+ * usb_stor_print_cmd():
+ */
+static void usb_stor_print_cmd(struct us_data *us, struct scsi_cmnd *srb)
+{
+ PBYTE Cdb = srb->cmnd;
+ DWORD cmd = Cdb[0];
+ DWORD bn = ((Cdb[2] << 24) & 0xff000000) |
+ ((Cdb[3] << 16) & 0x00ff0000) |
+ ((Cdb[4] << 8) & 0x0000ff00) |
+ ((Cdb[5] << 0) & 0x000000ff);
+ WORD blen = ((Cdb[7] << 8) & 0xff00) | ((Cdb[8] << 0) & 0x00ff);
+
+ switch (cmd) {
+ case TEST_UNIT_READY:
+ /* dev_dbg(
+ &us->pusb_dev->dev, "scsi cmd %X --- SCSIOP_TEST_UNIT_READY\n", cmd); */
+ break;
+ case INQUIRY:
+ dev_dbg(&us->pusb_dev->dev, "scsi cmd %X --- SCSIOP_INQUIRY\n", cmd);
+ break;
+ case MODE_SENSE:
+ dev_dbg(&us->pusb_dev->dev, "scsi cmd %X --- SCSIOP_MODE_SENSE\n", cmd);
+ break;
+ case START_STOP:
+ dev_dbg(&us->pusb_dev->dev, "scsi cmd %X --- SCSIOP_START_STOP\n", cmd);
+ break;
+ case READ_CAPACITY:
+ dev_dbg(&us->pusb_dev->dev, "scsi cmd %X --- SCSIOP_READ_CAPACITY\n", cmd);
+ break;
+ case READ_10:
+ /* dev_dbg(
+ &us->pusb_dev->dev, "scsi cmd %X --- SCSIOP_READ,bn = %X, blen = %X\n"
+ cmd, bn, blen); */
+ break;
+ case WRITE_10:
+ /* dev_dbg(
+ &us->pusb_dev->dev, "scsi cmd %X --- SCSIOP_WRITE,
+ bn = %X, blen = %X\n" , cmd, bn, blen); */
+ break;
+ case ALLOW_MEDIUM_REMOVAL:
+ dev_dbg(&us->pusb_dev->dev, "scsi cmd %X --- SCSIOP_ALLOW_MEDIUM_REMOVAL\n", cmd);
+ break;
+ default:
+ dev_dbg(&us->pusb_dev->dev, "scsi cmd %X --- Other cmd\n", cmd);
+ break;
+ }
+ bn = 0;
+}
+
+/*
* usb_stor_control_msg()
*/
int usb_stor_control_msg(struct us_data *us, unsigned int pipe,
diff --git a/drivers/staging/keucr/transport.h b/drivers/staging/keucr/transport.h
index 2cdaa49..df34474 100644
--- a/drivers/staging/keucr/transport.h
+++ b/drivers/staging/keucr/transport.h
@@ -29,7 +29,6 @@
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 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,
--
1.7.10.4
^ permalink raw reply related [flat|nested] 30+ messages in thread* Re: [PATCH 5/6] keucr: moved function to other file
2013-06-06 16:10 ` [PATCH 5/6] keucr: moved function to other file Johannes Schilling
@ 2013-06-06 21:23 ` Dan Carpenter
0 siblings, 0 replies; 30+ messages in thread
From: Dan Carpenter @ 2013-06-06 21:23 UTC (permalink / raw)
To: Johannes Schilling
Cc: linux-kernel, devel, Kurt Kanzenbach, linux-kernel,
Greg Kroah-Hartman, Al Cho, Amarjargal Gundjalam, Laura Lawniczak
On Thu, Jun 06, 2013 at 06:10:49PM +0200, Johannes Schilling wrote:
> From: Laura Lawniczak <laura.lawniczak@googlemail.com>
>
> Function usb_stor_print_cmd was declared in init.c but only used
> in transport.c. So it was reasonable to move it there and declare
> it static
>
> Signed-off-by: Laura Lawniczak <laura.lawniczak@googlemail.com>
Don't forget your Signed-off-by, Johannes, since it's coming from
you. Can you resend this?
There are a couple small changes between the original and the moved
function.
1) "blen = 0" is removed from the last line. This doesn't cause a
bug. In a later patch you can remove the "bn = 0" as well.
2) A comma was deleted after the string in the commented code so it
now has a syntax error:
> + /* dev_dbg(
> + &us->pusb_dev->dev, "scsi cmd %X --- SCSIOP_READ,bn = %X, blen = %X\n"
> + cmd, bn, blen); */
It's better if you just do a straight move and change things in a
later patch. But for now it's fine.
regards,
dan carpenter
^ permalink raw reply [flat|nested] 30+ messages in thread
* [PATCH 6/6] keucr: fix some alignment- and whitespace-problems
2013-06-06 16:10 ` [PATCH 0/6] keucr: checkpatch fixes Johannes Schilling
` (4 preceding siblings ...)
2013-06-06 16:10 ` [PATCH 5/6] keucr: moved function to other file Johannes Schilling
@ 2013-06-06 16:10 ` Johannes Schilling
2013-06-06 18:03 ` Joe Perches
2013-06-06 21:44 ` Dan Carpenter
2013-06-06 18:47 ` [PATCH 0/6] keucr: checkpatch fixes Greg Kroah-Hartman
6 siblings, 2 replies; 30+ messages in thread
From: Johannes Schilling @ 2013-06-06 16:10 UTC (permalink / raw)
To: linux-kernel
Cc: linux-kernel, Al Cho, Greg Kroah-Hartman, Amarjargal Gundjalam,
Kurt Kanzenbach, devel, Laura Lawniczak, Johannes Schilling,
Dan Carpenter
resolves checkpatch errors and warnings regarding whitespace around
operators, line lengths and indentation.
Signed-off-by: Laura Lawniczak <laura.lawniczak@googlemail.com>
Signed-off-by: Johannes Schilling <of82ecuq@cip.cs.fau.de>
---
drivers/staging/keucr/init.c | 24 +++++---
drivers/staging/keucr/scsiglue.c | 5 +-
drivers/staging/keucr/smilmain.c | 122 ++++++++++++++++++-------------------
drivers/staging/keucr/transport.c | 31 ++++++----
drivers/staging/keucr/usb.c | 10 +--
drivers/staging/keucr/usb.h | 12 ++--
6 files changed, 106 insertions(+), 98 deletions(-)
diff --git a/drivers/staging/keucr/init.c b/drivers/staging/keucr/init.c
index 53478e1..f5d41e0 100644
--- a/drivers/staging/keucr/init.c
+++ b/drivers/staging/keucr/init.c
@@ -98,11 +98,16 @@ int ENE_SMInit(struct us_data *us)
us->SM_CardID = buf[2];
if (us->SM_Status.Insert && us->SM_Status.Ready) {
- 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);
+ 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 {
@@ -174,7 +179,8 @@ int ENE_SendScsiCmd(struct us_data *us, BYTE fDir, void *buf, int use_sg)
result = usb_stor_bulk_transfer_buf(us, us->send_bulk_pipe,
bcb, US_BULK_CB_WRAP_LEN, NULL);
if (result != USB_STOR_XFER_GOOD) {
- dev_err(&us->pusb_dev->dev, "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;
}
@@ -203,14 +209,16 @@ 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) {
- dev_warn(&us->pusb_dev->dev, "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 */
- dev_warn(&us->pusb_dev->dev, "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);
}
diff --git a/drivers/staging/keucr/scsiglue.c b/drivers/staging/keucr/scsiglue.c
index 54a89ff..afb00d8 100644
--- a/drivers/staging/keucr/scsiglue.c
+++ b/drivers/staging/keucr/scsiglue.c
@@ -322,8 +322,9 @@ static ssize_t store_max_sectors(struct device *dev,
static DEVICE_ATTR(max_sectors, S_IRUGO | S_IWUSR, show_max_sectors,
store_max_sectors);
-static struct device_attribute *sysfs_device_attr_list[] =
- {&dev_attr_max_sectors, NULL, };
+static struct device_attribute *sysfs_device_attr_list[] = {
+ &dev_attr_max_sectors, NULL,
+};
/* this defines our host template, with which we'll allocate hosts */
diff --git a/drivers/staging/keucr/smilmain.c b/drivers/staging/keucr/smilmain.c
index dd73f88..2786808 100644
--- a/drivers/staging/keucr/smilmain.c
+++ b/drivers/staging/keucr/smilmain.c
@@ -302,7 +302,7 @@ int Media_D_ReadOneSect(struct us_data *us, WORD count, BYTE *buf)
return ERROR;
#ifdef RDERR_REASSIGN
- if (Ssfdc.Attribute &MWP) {
+ if (Ssfdc.Attribute & MWP) {
if (ErrCode == ERR_CorReadErr)
return SMSUCCESS;
return ERROR;
@@ -675,90 +675,84 @@ int Make_D_LogTable(struct us_data *us)
Media.Sector = 0;
- {
- /* pr_info("Make_D_LogTable --- MediaZone = 0x%x\n",
- Media.Zone); */
- for (Media.LogBlock = 0; Media.LogBlock < Ssfdc.MaxLogBlocks;
- Media.LogBlock++)
- Log2Phy[Media.Zone][Media.LogBlock] = NO_ASSIGN;
-
- for (Media.PhyBlock = 0; Media.PhyBlock < (MAX_BLOCKNUM / 8);
- Media.PhyBlock++)
- Assign[Media.Zone][Media.PhyBlock] = 0x00;
-
- for (Media.PhyBlock = 0; Media.PhyBlock < Ssfdc.MaxBlocks;
- Media.PhyBlock++) {
- if ((!Media.Zone) &&
- (Media.PhyBlock <= CisArea.PhyBlock)) {
- Set_D_Bit(Assign[Media.Zone], Media.PhyBlock);
- continue;
- }
+ /* pr_info("Make_D_LogTable --- MediaZone = 0x%x\n",
+ Media.Zone); */
+ for (Media.LogBlock = 0; Media.LogBlock < Ssfdc.MaxLogBlocks;
+ Media.LogBlock++)
+ Log2Phy[Media.Zone][Media.LogBlock] = NO_ASSIGN;
- if (Ssfdc_D_ReadRedtData(us, Redundant)) {
- Ssfdc_D_Reset(us);
- return ERROR;
- }
-
- if (!Check_D_DataBlank(Redundant))
- continue;
+ for (Media.PhyBlock = 0; Media.PhyBlock < (MAX_BLOCKNUM / 8);
+ Media.PhyBlock++)
+ Assign[Media.Zone][Media.PhyBlock] = 0x00;
+ for (Media.PhyBlock = 0; Media.PhyBlock < Ssfdc.MaxBlocks;
+ Media.PhyBlock++) {
+ if ((!Media.Zone) && (Media.PhyBlock <= CisArea.PhyBlock)) {
Set_D_Bit(Assign[Media.Zone], Media.PhyBlock);
+ continue;
+ }
- if (Check_D_FailBlock(Redundant))
- continue;
+ if (Ssfdc_D_ReadRedtData(us, Redundant)) {
+ Ssfdc_D_Reset(us);
+ return ERROR;
+ }
+
+ if (!Check_D_DataBlank(Redundant))
+ continue;
- if (Load_D_LogBlockAddr(Redundant))
- continue;
+ Set_D_Bit(Assign[Media.Zone], Media.PhyBlock);
- if (Media.LogBlock >= Ssfdc.MaxLogBlocks)
- continue;
+ if (Check_D_FailBlock(Redundant))
+ continue;
- if (Log2Phy[Media.Zone][Media.LogBlock] == NO_ASSIGN) {
- Log2Phy[Media.Zone][Media.LogBlock] =
- Media.PhyBlock;
- continue;
- }
+ if (Load_D_LogBlockAddr(Redundant))
+ continue;
- phyblock = Media.PhyBlock;
- logblock = Media.LogBlock;
- Media.Sector = (BYTE)(Ssfdc.MaxSectors - 1);
+ if (Media.LogBlock >= Ssfdc.MaxLogBlocks)
+ continue;
+
+ if (Log2Phy[Media.Zone][Media.LogBlock] == NO_ASSIGN) {
+ Log2Phy[Media.Zone][Media.LogBlock] = Media.PhyBlock;
+ continue;
+ }
+
+ phyblock = Media.PhyBlock;
+ logblock = Media.LogBlock;
+ Media.Sector = (BYTE)(Ssfdc.MaxSectors - 1);
+
+ if (Ssfdc_D_ReadRedtData(us, Redundant)) {
+ Ssfdc_D_Reset(us);
+ return ERROR;
+ }
+
+ if (!Load_D_LogBlockAddr(Redundant) &&
+ (Media.LogBlock == logblock)) {
+ Media.PhyBlock = Log2Phy[Media.Zone][logblock];
if (Ssfdc_D_ReadRedtData(us, Redundant)) {
Ssfdc_D_Reset(us);
return ERROR;
}
+ Media.PhyBlock = phyblock;
+
if (!Load_D_LogBlockAddr(Redundant)) {
- if (Media.LogBlock == logblock) {
+ if (Media.LogBlock != logblock) {
Media.PhyBlock =
Log2Phy[Media.Zone][logblock];
-
- if (Ssfdc_D_ReadRedtData(us,
- Redundant)) {
- Ssfdc_D_Reset(us);
- return ERROR;
- }
-
- Media.PhyBlock = phyblock;
-
- if (!Load_D_LogBlockAddr(Redundant)) {
- if (Media.LogBlock != logblock) {
- Media.PhyBlock = Log2Phy[Media.Zone][logblock];
- Log2Phy[Media.Zone][logblock] = phyblock;
- }
- } else {
- Media.PhyBlock = Log2Phy[Media.Zone][logblock];
- Log2Phy[Media.Zone][logblock] = phyblock;
- }
+ Log2Phy[Media.Zone][logblock] =
+ phyblock;
}
+ } else {
+ Media.PhyBlock = Log2Phy[Media.Zone][logblock];
+ Log2Phy[Media.Zone][logblock] = phyblock;
}
+ }
- Media.Sector = 0;
- Media.PhyBlock = phyblock;
-
- } /* End for (Media.PhyBlock<Ssfdc.MaxBlocks) */
+ Media.Sector = 0;
+ Media.PhyBlock = phyblock;
- AssignStart[Media.Zone] = 0;
+ AssignStart[Media.Zone] = 0;
} /* End for (Media.Zone<MAX_ZONENUM) */
diff --git a/drivers/staging/keucr/transport.c b/drivers/staging/keucr/transport.c
index b3c25d0..1f9ea58 100644
--- a/drivers/staging/keucr/transport.c
+++ b/drivers/staging/keucr/transport.c
@@ -93,33 +93,38 @@ static void usb_stor_print_cmd(struct us_data *us, struct scsi_cmnd *srb)
switch (cmd) {
case TEST_UNIT_READY:
- /* dev_dbg(
- &us->pusb_dev->dev, "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:
- dev_dbg(&us->pusb_dev->dev, "scsi cmd %X --- SCSIOP_INQUIRY\n", cmd);
+ dev_dbg(&us->pusb_dev->dev,
+ "scsi cmd %X --- SCSIOP_INQUIRY\n", cmd);
break;
case MODE_SENSE:
- dev_dbg(&us->pusb_dev->dev, "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:
- dev_dbg(&us->pusb_dev->dev, "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:
- dev_dbg(&us->pusb_dev->dev, "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:
- /* dev_dbg(
- &us->pusb_dev->dev, "scsi cmd %X --- SCSIOP_READ,bn = %X, blen = %X\n"
- cmd, bn, blen); */
+ /* dev_dbg(&us->pusb_dev->dev,
+ "scsi cmd %X --- SCSIOP_READ,bn = %X, blen = %X\n"
+ cmd, bn, blen); */
break;
case WRITE_10:
- /* dev_dbg(
- &us->pusb_dev->dev, "scsi cmd %X --- SCSIOP_WRITE,
- bn = %X, blen = %X\n" , cmd, bn, blen); */
+ /* dev_dbg(&us->pusb_dev->dev,
+ "scsi cmd %X --- SCSIOP_WRITE, bn = %X, blen = %X\n",
+ cmd, bn, blen); */
break;
case ALLOW_MEDIUM_REMOVAL:
- dev_dbg(&us->pusb_dev->dev, "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:
dev_dbg(&us->pusb_dev->dev, "scsi cmd %X --- Other cmd\n", cmd);
diff --git a/drivers/staging/keucr/usb.c b/drivers/staging/keucr/usb.c
index f18b1c2..ddd2e73 100644
--- a/drivers/staging/keucr/usb.c
+++ b/drivers/staging/keucr/usb.c
@@ -150,7 +150,7 @@ void fill_inquiry_response(struct us_data *us, unsigned char *data,
usb_stor_set_xfer_buf(us, data, data_len, us->srb, TO_XFER_BUF);
}
-static int usb_stor_control_thread(void * __us)
+static int usb_stor_control_thread(void *__us)
{
struct us_data *us = (struct us_data *)__us;
struct Scsi_Host *host = us_to_host(us);
@@ -493,7 +493,7 @@ static void release_everything(struct us_data *us)
scsi_host_put(us_to_host(us));
}
-static int usb_stor_scan_thread(void * __us)
+static int usb_stor_scan_thread(void *__us)
{
struct us_data *us = (struct us_data *)__us;
@@ -604,9 +604,9 @@ static int eucr_probe(struct usb_interface *intf,
if (!(MiscReg03 & 0x02)) {
result = -ENODEV;
quiesce_and_remove_host(us);
- pr_info("keucr: The driver only supports SM/MS card.\
- To use SD card, \
- please build driver/usb/storage/ums-eneub6250.ko\n");
+ pr_info("keucr: The driver only supports SM/MS card. "
+ "To use SD card, "
+ "please build driver/usb/storage/ums-eneub6250.ko\n");
goto BadDevice;
}
diff --git a/drivers/staging/keucr/usb.h b/drivers/staging/keucr/usb.h
index c724cf7..d665af1 100644
--- a/drivers/staging/keucr/usb.h
+++ b/drivers/staging/keucr/usb.h
@@ -19,8 +19,8 @@ struct scsi_cmnd;
*/
struct us_unusual_dev {
- const char* vendorName;
- const char* productName;
+ const char *vendorName;
+ const char *productName;
__u8 useProtocol;
__u8 useTransport;
int (*initFunction)(struct us_data *);
@@ -108,9 +108,9 @@ struct keucr_sm_status {
#define US_IOBUF_SIZE 64 /* Size of the DMA-mapped I/O buffer */
#define US_SENSE_SIZE 18 /* Size of the autosense data buffer */
-typedef int (*trans_cmnd)(struct scsi_cmnd *, struct us_data*);
-typedef int (*trans_reset)(struct us_data*);
-typedef void (*proto_cmnd)(struct scsi_cmnd*, struct us_data*);
+typedef int (*trans_cmnd)(struct scsi_cmnd *, struct us_data *);
+typedef int (*trans_reset)(struct us_data *);
+typedef void (*proto_cmnd)(struct scsi_cmnd *, struct us_data *);
typedef void (*extra_data_destructor)(void *); /* extra data destructor */
typedef void (*pm_hook)(struct us_data *, int); /* power management hook */
@@ -215,7 +215,7 @@ struct us_data {
int SrbStatus;
/* ------Power Managerment --------------- */
- BOOLEAN Power_IsResum;
+ BOOLEAN Power_IsResum;
};
/* Convert between us_data and the corresponding Scsi_Host */
--
1.7.10.4
^ permalink raw reply related [flat|nested] 30+ messages in thread* Re: [PATCH 6/6] keucr: fix some alignment- and whitespace-problems
2013-06-06 16:10 ` [PATCH 6/6] keucr: fix some alignment- and whitespace-problems Johannes Schilling
@ 2013-06-06 18:03 ` Joe Perches
2013-06-06 21:44 ` Dan Carpenter
1 sibling, 0 replies; 30+ messages in thread
From: Joe Perches @ 2013-06-06 18:03 UTC (permalink / raw)
To: Johannes Schilling
Cc: linux-kernel, linux-kernel, Al Cho, Greg Kroah-Hartman,
Amarjargal Gundjalam, Kurt Kanzenbach, devel, Laura Lawniczak,
Dan Carpenter
On Thu, 2013-06-06 at 18:10 +0200, Johannes Schilling wrote:
> resolves checkpatch errors and warnings regarding whitespace around
> operators, line lengths and indentation.
I suggest adding --strict to your checkpatch runs to
report a few more style usage elements.
> diff --git a/drivers/staging/keucr/init.c b/drivers/staging/keucr/init.c
[]
> @@ -98,11 +98,16 @@ int ENE_SMInit(struct us_data *us)
[]
> if (us->SM_Status.Insert && us->SM_Status.Ready) {
> - dev_info(&us->pusb_dev->dev, "Insert = %x\n", us->SM_Status.Insert);
[]
> + dev_info(&us->pusb_dev->dev, "Insert = %x\n",
> + us->SM_Status.Insert);
I think this would be nicer aligning the arguments
to the open parenthesis like:
dev_info(&us->pusb_dev->dev, "Insert = %x\n",
us->SM_Status.Insert);
but using
us_info(us, "Insert = %x\n", us->SM_Status.Insert);
would be nicer still and fit 80 cols, etc...
Another option would be to use a macro like:
#define us_show_status(us, field) \
us_info(us, "%-11s= %x\n", #field, us->SM_Status.field)
And these become
us_show_status(us, "Insert");
us_show_status(us, "Ready");
us_show_status(us, "WtP");
etc...
It depends on how many of these actually exist whether
or not a macro is appropriate.
^ permalink raw reply [flat|nested] 30+ messages in thread* Re: [PATCH 6/6] keucr: fix some alignment- and whitespace-problems
2013-06-06 16:10 ` [PATCH 6/6] keucr: fix some alignment- and whitespace-problems Johannes Schilling
2013-06-06 18:03 ` Joe Perches
@ 2013-06-06 21:44 ` Dan Carpenter
1 sibling, 0 replies; 30+ messages in thread
From: Dan Carpenter @ 2013-06-06 21:44 UTC (permalink / raw)
To: Johannes Schilling
Cc: linux-kernel, devel, Kurt Kanzenbach, linux-kernel,
Greg Kroah-Hartman, Al Cho, Amarjargal Gundjalam, Laura Lawniczak
On Thu, Jun 06, 2013 at 06:10:50PM +0200, Johannes Schilling wrote:
> resolves checkpatch errors and warnings regarding whitespace around
> operators, line lengths and indentation.
>
I feel like this should be broken up into several patches. A lot of
these changes will make checkpatch.pl happy but they are not
beautiful.
> --- a/drivers/staging/keucr/init.c
> +++ b/drivers/staging/keucr/init.c
> @@ -98,11 +98,16 @@ int ENE_SMInit(struct us_data *us)
> us->SM_CardID = buf[2];
>
> if (us->SM_Status.Insert && us->SM_Status.Ready) {
The better way to solve this is:
- dev_info(&us->pusb_dev->dev, "Insert = %x\n", us->SM_Status.Insert);
+ dev_info(us_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);
> + 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 {
> @@ -174,7 +179,8 @@ int ENE_SendScsiCmd(struct us_data *us, BYTE fDir, void *buf, int use_sg)
> result = usb_stor_bulk_transfer_buf(us, us->send_bulk_pipe,
> bcb, US_BULK_CB_WRAP_LEN, NULL);
> if (result != USB_STOR_XFER_GOOD) {
> - dev_err(&us->pusb_dev->dev, "send cmd to out endpoint fail ---\n");
> + dev_err(&us->pusb_dev->dev,
> + "send cmd to out endpoint fail ---\n");
Line the parameters up:
+ dev_info(&us->pusb_dev->dev,
+ "my extra long messssssssssssssssagesfasdfadf ---\n");
I used 3 tabs and a space to make everything line up correctly. But
if you use a temporary variable this will fit on one line.
> @@ -604,9 +604,9 @@ static int eucr_probe(struct usb_interface *intf,
> if (!(MiscReg03 & 0x02)) {
> result = -ENODEV;
> quiesce_and_remove_host(us);
> - pr_info("keucr: The driver only supports SM/MS card.\
> - To use SD card, \
> - please build driver/usb/storage/ums-eneub6250.ko\n");
> + pr_info("keucr: The driver only supports SM/MS card. "
> + "To use SD card, "
> + "please build driver/usb/storage/ums-eneub6250.ko\n");
> goto BadDevice;
> }
>
This is a bug fix. It should go in as a separate patch.
regards,
dan carpenter
^ permalink raw reply [flat|nested] 30+ messages in thread
* Re: [PATCH 0/6] keucr: checkpatch fixes
2013-06-06 16:10 ` [PATCH 0/6] keucr: checkpatch fixes Johannes Schilling
` (5 preceding siblings ...)
2013-06-06 16:10 ` [PATCH 6/6] keucr: fix some alignment- and whitespace-problems Johannes Schilling
@ 2013-06-06 18:47 ` Greg Kroah-Hartman
6 siblings, 0 replies; 30+ messages in thread
From: Greg Kroah-Hartman @ 2013-06-06 18:47 UTC (permalink / raw)
To: Johannes Schilling
Cc: linux-kernel, devel, Kurt Kanzenbach, linux-kernel, Al Cho,
Amarjargal Gundjalam, Dan Carpenter, Laura Lawniczak
On Thu, Jun 06, 2013 at 06:10:44PM +0200, Johannes Schilling wrote:
> hi,
>
> did some improvement on our previous patch series, see the more detailed
> replies below.
When you resend patches, please put "v2" in the subject lines, so I know
to take these over the previous ones.
thanks,
greg k-h
^ permalink raw reply [flat|nested] 30+ messages in thread