* [PATCH 1/2] staging: keucr: Use memcmp() instaed of custom StringCmp() and some style cleanups
@ 2010-12-31 19:28 Javier Martinez Canillas
2010-12-31 20:26 ` [PATCH 1/2] staging: keucr: Use memcmp() instaed of custom Joe Perches
2011-01-01 9:00 ` Dan Carpenter
0 siblings, 2 replies; 3+ messages in thread
From: Javier Martinez Canillas @ 2010-12-31 19:28 UTC (permalink / raw)
To: kernel-janitors
Signed-off-by: Javier Martinez Canillas <martinez.javier@gmail.com>
---
drivers/staging/keucr/smilsub.c | 65 ++++++++++++++++++++------------------
1 files changed, 34 insertions(+), 31 deletions(-)
diff --git a/drivers/staging/keucr/smilsub.c b/drivers/staging/keucr/smilsub.c
index ce10cf2..8256fad 100644
--- a/drivers/staging/keucr/smilsub.c
+++ b/drivers/staging/keucr/smilsub.c
@@ -1482,54 +1482,57 @@ BYTE _Check_D_DevCode(BYTE dcode)
//----- Check_D_ReadError() ----------------------------------------------
int Check_D_ReadError(BYTE *redundant)
{
- // Driver 不做 ECC Check
- return(SUCCESS);
- if (!StringCmp((char *)(redundant+0x0D),(char *)EccBuf,3))
- if (!StringCmp((char *)(redundant+0x08),(char *)(EccBuf+0x03),3))
- return(SUCCESS);
+ /* Driver ECC Check */
+ return SUCCESS;
+ if (!memcmp(redundant+0x0D, EccBuf, 3))
+ if (!memcmp(redundant+0x08, EccBuf+0x03, 3))
+ return SUCCESS;
- return(ERROR);
+ return ERROR;
}
//----- Check_D_Correct() ----------------------------------------------
int Check_D_Correct(BYTE *buf,BYTE *redundant)
{
- // Driver 不做 ECC Check
- return(SUCCESS);
- if (StringCmp((char *)(redundant+0x0D),(char *)EccBuf,3))
- if (_Correct_D_SwECC(buf,redundant+0x0D,EccBuf))
- return(ERROR);
-
- buf+=0x100;
- if (StringCmp((char *)(redundant+0x08),(char *)(EccBuf+0x03),3))
- if (_Correct_D_SwECC(buf,redundant+0x08,EccBuf+0x03))
- return(ERROR);
-
- return(SUCCESS);
+ /* Driver ECC Check */
+ return SUCCESS;
+ if (memcmp(redundant+0x0D, EccBuf, 3))
+ if (_Correct_D_SwECC(buf, redundant+0x0D, EccBuf))
+ return ERROR;
+
+ buf += 0x100;
+ if (memcmp(redundant+0x08, EccBuf+0x03, 3))
+ if (_Correct_D_SwECC(buf, redundant+0x08, EccBuf+0x03))
+ return ERROR;
+
+ return SUCCESS;
}
//----- Check_D_CISdata() ----------------------------------------------
int Check_D_CISdata(BYTE *buf, BYTE *redundant)
{
- BYTE cis[]={0x01,0x03,0xD9,0x01,0xFF,0x18,0x02,0xDF,0x01,0x20};
+ BYTE cis[] = {0x01, 0x03, 0xD9, 0x01, 0xFF, 0x18, 0x02,
+ 0xDF, 0x01, 0x20};
+
+ int cis_len = sizeof(cis);
- if (!IsSSFDCCompliance && !IsXDCompliance)
- return(SUCCESS); // 目前為強制 SUCCESS [Arnold 02-08-23] SSFDC 測試, 不能強制 SUCCESS
+ if (!IsSSFDCCompliance && !IsXDCompliance)
+ return SUCCESS;
- if (!StringCmp((char *)(redundant+0x0D),(char *)EccBuf,3))
- return(StringCmp((char *)buf,(char *)cis,10));
+ if (!memcmp(redundant+0x0D, EccBuf, 3))
+ return memcmp(buf, cis, cis_len);
- if (!_Correct_D_SwECC(buf,redundant+0x0D,EccBuf))
- return(StringCmp((char *)buf,(char *)cis,10));
+ if (!_Correct_D_SwECC(buf, redundant+0x0D, EccBuf))
+ return memcmp(buf, cis, cis_len);
- buf+=0x100;
- if (!StringCmp((char *)(redundant+0x08),(char *)(EccBuf+0x03),3))
- return(StringCmp((char *)buf,(char *)cis,10));
+ buf += 0x100;
+ if (!memcmp(redundant+0x08, EccBuf+0x03, 3))
+ return memcmp(buf, cis, cis_len);
- if (!_Correct_D_SwECC(buf,redundant+0x08,EccBuf+0x03))
- return(StringCmp((char *)buf,(char *)cis,10));
+ if (!_Correct_D_SwECC(buf, redundant+0x08, EccBuf+0x03))
+ return memcmp(buf, cis, cis_len);
- return(ERROR);
+ return ERROR;
}
//----- Set_D_RightECC() ----------------------------------------------
--
1.7.0.4
--
To unsubscribe from this list: send the line "unsubscribe kernel-janitors" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH 1/2] staging: keucr: Use memcmp() instaed of custom
2010-12-31 19:28 [PATCH 1/2] staging: keucr: Use memcmp() instaed of custom StringCmp() and some style cleanups Javier Martinez Canillas
@ 2010-12-31 20:26 ` Joe Perches
2011-01-01 9:00 ` Dan Carpenter
1 sibling, 0 replies; 3+ messages in thread
From: Joe Perches @ 2010-12-31 20:26 UTC (permalink / raw)
To: kernel-janitors
On Fri, 2010-12-31 at 20:28 +0100, Javier Martinez Canillas wrote:
> Signed-off-by: Javier Martinez Canillas <martinez.javier@gmail.com>
Hi Javier.
> diff --git a/drivers/staging/keucr/smilsub.c b/drivers/staging/keucr/smilsub.c
[]
> int Check_D_ReadError(BYTE *redundant)
> {
> - // Driver 䣰 ECC Check
> - return(SUCCESS);
> - if (!StringCmp((char *)(redundant+0x0D),(char *)EccBuf,3))
> - if (!StringCmp((char *)(redundant+0x08),(char *)(EccBuf+0x03),3))
> - return(SUCCESS);
> + /* Driver ECC Check */
> + return SUCCESS;
> + if (!memcmp(redundant+0x0D, EccBuf, 3))
> + if (!memcmp(redundant+0x08, EccBuf+0x03, 3))
> + return SUCCESS;
Generally, it's better to have success at the end
of a function and either a goto error or return
error for error conditions.
Something like:
if (!(!memcmp(redundant+0x0D, EccBuf, 3) &&
!memcmp(redundant+0x08, EccBuf+0x03, 3)))
return ERROR;
return SUCCESS;
> int Check_D_Correct(BYTE *buf,BYTE *redundant)
> {
> - // Driver 䣰 ECC Check
> - return(SUCCESS);
> - if (StringCmp((char *)(redundant+0x0D),(char *)EccBuf,3))
> - if (_Correct_D_SwECC(buf,redundant+0x0D,EccBuf))
> - return(ERROR);
> -
> - buf+=0x100;
> - if (StringCmp((char *)(redundant+0x08),(char *)(EccBuf+0x03),3))
> - if (_Correct_D_SwECC(buf,redundant+0x08,EccBuf+0x03))
> - return(ERROR);
> -
> - return(SUCCESS);
> + /* Driver ECC Check */
> + return SUCCESS;
> + if (memcmp(redundant+0x0D, EccBuf, 3))
> + if (_Correct_D_SwECC(buf, redundant+0x0D, EccBuf))
> + return ERROR;
You might as well take out useless code after returns
instead of just changing function names.
If you keep it you should reformat it.
if (memcmp(redundant+0x0D, EccBuf, 3) &&
_Correct_D_SwECC(buf, redundant+0x0D, EccBuf))
return ERROR;
etc...
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH 1/2] staging: keucr: Use memcmp() instaed of custom
2010-12-31 19:28 [PATCH 1/2] staging: keucr: Use memcmp() instaed of custom StringCmp() and some style cleanups Javier Martinez Canillas
2010-12-31 20:26 ` [PATCH 1/2] staging: keucr: Use memcmp() instaed of custom Joe Perches
@ 2011-01-01 9:00 ` Dan Carpenter
1 sibling, 0 replies; 3+ messages in thread
From: Dan Carpenter @ 2011-01-01 9:00 UTC (permalink / raw)
To: kernel-janitors
On Fri, Dec 31, 2010 at 12:26:00PM -0800, Joe Perches wrote:
> On Fri, 2010-12-31 at 20:28 +0100, Javier Martinez Canillas wrote:
> if (!(!memcmp(redundant+0x0D, EccBuf, 3) &&
> !memcmp(redundant+0x08, EccBuf+0x03, 3)))
^^^ ^^^
Also we should add spaces around the '+' character. But this is dead
code anyway so let's just merge it.
regards,
dan carpenter
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2011-01-01 9:00 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-12-31 19:28 [PATCH 1/2] staging: keucr: Use memcmp() instaed of custom StringCmp() and some style cleanups Javier Martinez Canillas
2010-12-31 20:26 ` [PATCH 1/2] staging: keucr: Use memcmp() instaed of custom Joe Perches
2011-01-01 9:00 ` Dan Carpenter
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox