Patchwork fs: cleanup for fs/jffs2/compr_rubin.c

login
register
mail settings
Submitter Jianjun kong
Date Dec. 8, 2008, 3:05 p.m.
Message ID <20081208150554.GA22245@ubuntu>
Download mbox | patch
Permalink /patch/12781/
State New
Headers show

Comments

Jianjun kong - Dec. 8, 2008, 3:05 p.m.
fs: cleanup for fs/jffs2/compr_rubin.c

fs/jffs2/compr_rubin.c:
remove duplicated #include and other cleanup

Signed-off-by: Jianjun Kong <jianjun@zeuux.org>
---
 fs/jffs2/compr_rubin.c |   11 +++++------
 1 files changed, 5 insertions(+), 6 deletions(-)
Geert Uytterhoeven - Dec. 8, 2008, 3:39 p.m.
On Mon, 8 Dec 2008, Jianjun Kong wrote:
> fs: cleanup for fs/jffs2/compr_rubin.c
> 
> fs/jffs2/compr_rubin.c:
> remove duplicated #include and other cleanup
> 
> Signed-off-by: Jianjun Kong <jianjun@zeuux.org>
> ---
>  fs/jffs2/compr_rubin.c |   11 +++++------
>  1 files changed, 5 insertions(+), 6 deletions(-)
> 
> diff --git a/fs/jffs2/compr_rubin.c b/fs/jffs2/compr_rubin.c
> index c73fa89..cb02050 100644
> --- a/fs/jffs2/compr_rubin.c
> +++ b/fs/jffs2/compr_rubin.c
> @@ -24,8 +24,6 @@
>  #define BIT_DIVIDER_MIPS 1043
>  static int bits_mips[8] = { 277,249,290,267,229,341,212,241}; /* mips32 */
>  
> -#include <linux/errno.h>
> -
>  struct pushpull {
>  	unsigned char *buf;
>  	unsigned int buflen;
> @@ -157,7 +155,8 @@ static void init_decode(struct rubin_state *rs, int div, int *bits)
>  	/* behalve lower */
>  	rs->rec_q = 0;
>  
> -	for (rs->bit_number = 0; rs->bit_number++ < RUBIN_REG_SIZE; rs->rec_q = rs->rec_q * 2 + (long) (pullbit(&rs->pp)))
> +	for (rs->bit_number = 0; rs->bit_number++ < RUBIN_REG_SIZE;
> +		rs->rec_q = rs->rec_q * 2 + (long) (pullbit(&rs->pp)))
>  		;
>  }
>  
> @@ -234,14 +233,14 @@ static int out_byte(struct rubin_state *rs, unsigned char byte)
>  	struct rubin_state rs_copy;
>  	rs_copy = *rs;
>  
> -	for (i=0;i<8;i++) {
> -		ret = encode(rs, rs->bit_divider-rs->bits[i],rs->bits[i],byte&1);
> +	for (i=0; i<8; i++) {

scripts/checkpatch.pl still complains:

ERROR: spaces required around that '=' (ctx:VxV)
#47: FILE: fs/jffs2/compr_rubin.c:236:
+       for (i=0; i<8; i++) {
              ^
ERROR: spaces required around that '<' (ctx:VxV)
#47: FILE: fs/jffs2/compr_rubin.c:236:
+       for (i=0; i<8; i++) {
                   ^
> +		ret = encode(rs, rs->bit_divider-rs->bits[i], rs->bits[i], byte&1);

WARNING: line over 80 characters

>  		if (ret) {
>  			/* Failed. Restore old state */
>  			*rs = rs_copy;
>  			return ret;
>  		}
> -		byte=byte>>1;
> +		byte >>= 1;
>  	}
>  	return 0;
>  }

With kind regards,

Geert Uytterhoeven
Software Architect

Sony Techsoft Centre Europe
The Corporate Village · Da Vincilaan 7-D1 · B-1935 Zaventem · Belgium

Phone:    +32 (0)2 700 8453
Fax:      +32 (0)2 700 8622
E-mail:   Geert.Uytterhoeven@sonycom.com
Internet: http://www.sony-europe.com/

A division of Sony Europe (Belgium) N.V.
VAT BE 0413.825.160 · RPR Brussels
Fortis · BIC GEBABEBB · IBAN BE41293037680010

Patch

diff --git a/fs/jffs2/compr_rubin.c b/fs/jffs2/compr_rubin.c
index c73fa89..cb02050 100644
--- a/fs/jffs2/compr_rubin.c
+++ b/fs/jffs2/compr_rubin.c
@@ -24,8 +24,6 @@ 
 #define BIT_DIVIDER_MIPS 1043
 static int bits_mips[8] = { 277,249,290,267,229,341,212,241}; /* mips32 */
 
-#include <linux/errno.h>
-
 struct pushpull {
 	unsigned char *buf;
 	unsigned int buflen;
@@ -157,7 +155,8 @@  static void init_decode(struct rubin_state *rs, int div, int *bits)
 	/* behalve lower */
 	rs->rec_q = 0;
 
-	for (rs->bit_number = 0; rs->bit_number++ < RUBIN_REG_SIZE; rs->rec_q = rs->rec_q * 2 + (long) (pullbit(&rs->pp)))
+	for (rs->bit_number = 0; rs->bit_number++ < RUBIN_REG_SIZE;
+		rs->rec_q = rs->rec_q * 2 + (long) (pullbit(&rs->pp)))
 		;
 }
 
@@ -234,14 +233,14 @@  static int out_byte(struct rubin_state *rs, unsigned char byte)
 	struct rubin_state rs_copy;
 	rs_copy = *rs;
 
-	for (i=0;i<8;i++) {
-		ret = encode(rs, rs->bit_divider-rs->bits[i],rs->bits[i],byte&1);
+	for (i=0; i<8; i++) {
+		ret = encode(rs, rs->bit_divider-rs->bits[i], rs->bits[i], byte&1);
 		if (ret) {
 			/* Failed. Restore old state */
 			*rs = rs_copy;
 			return ret;
 		}
-		byte=byte>>1;
+		byte >>= 1;
 	}
 	return 0;
 }