Fix coding style for real.

I clearly wasn't fully awake with the commit ac313d.

Thanks to Andrew Morton.

6 files changed, 34 insertions, 35 deletions

diff --git a/linux/lib/decompress_unxz.c b/linux/lib/decompress_unxz.c
index a7954bc..77c3ea8 100644
--- a/linux/lib/decompress_unxz.c
+++ b/linux/lib/decompress_unxz.c
@@ -249,10 +249,10 @@ void *memmove(void *dest, const void *src, size_t size)
  * fill() and flush() won't be used.
  */
 STATIC int INIT unxz(unsigned char *in, int in_size,
-		int (*fill)(void *dest, unsigned int size),
-		int (*flush)(void *src, unsigned int size),
-		unsigned char *out, int *in_used,
-		void (*error)(char *x))
+		     int (*fill)(void *dest, unsigned int size),
+		     int (*flush)(void *src, unsigned int size),
+		     unsigned char *out, int *in_used,
+		     void (*error)(char *x))
 {
 	struct xz_buf b;
 	struct xz_dec *s;
diff --git a/linux/lib/xz/xz_dec_bcj.c b/linux/lib/xz/xz_dec_bcj.c
index f666fe4..e51e255 100644
--- a/linux/lib/xz/xz_dec_bcj.c
+++ b/linux/lib/xz/xz_dec_bcj.c
@@ -343,7 +343,7 @@ static size_t bcj_sparc(struct xz_dec_bcj *s, uint8_t *buf, size_t size)
  * avoid pointers to static data (at least on x86).
  */
 static void bcj_apply(struct xz_dec_bcj *s,
-		uint8_t *buf, size_t *pos, size_t size)
+		      uint8_t *buf, size_t *pos, size_t size)
 {
 	size_t filtered;
 
@@ -415,7 +415,8 @@ static void bcj_flush(struct xz_dec_bcj *s, struct xz_buf *b)
  * some buffering.
  */
 XZ_EXTERN enum xz_ret xz_dec_bcj_run(struct xz_dec_bcj *s,
-		struct xz_dec_lzma2 *lzma2, struct xz_buf *b)
+				     struct xz_dec_lzma2 *lzma2,
+				     struct xz_buf *b)
 {
 	size_t out_start;
 
@@ -519,8 +520,7 @@ XZ_EXTERN struct xz_dec_bcj *xz_dec_bcj_create(bool single_call)
 	return s;
 }
 
-XZ_EXTERN enum xz_ret xz_dec_bcj_reset(
-		struct xz_dec_bcj *s, uint8_t id)
+XZ_EXTERN enum xz_ret xz_dec_bcj_reset(struct xz_dec_bcj *s, uint8_t id)
 {
 	switch (id) {
 #ifdef XZ_DEC_X86
diff --git a/linux/lib/xz/xz_dec_lzma2.c b/linux/lib/xz/xz_dec_lzma2.c
index 3b8ccfc..c26ba66 100644
--- a/linux/lib/xz/xz_dec_lzma2.c
+++ b/linux/lib/xz/xz_dec_lzma2.c
@@ -371,8 +371,8 @@ static bool dict_repeat(struct dictionary *dict, uint32_t *len, uint32_t dist)
 }
 
 /* Copy uncompressed data as is from input to dictionary and output buffers. */
-static void dict_uncompressed(
-		struct dictionary *dict, struct xz_buf *b, uint32_t *left)
+static void dict_uncompressed(struct dictionary *dict, struct xz_buf *b,
+			      uint32_t *left)
 {
 	size_t copy_size;
 
@@ -517,8 +517,8 @@ static __always_inline int rc_bit(struct rc_dec *rc, uint16_t *prob)
 }
 
 /* Decode a bittree starting from the most significant bit. */
-static __always_inline uint32_t rc_bittree(
-		struct rc_dec *rc, uint16_t *probs, uint32_t limit)
+static __always_inline uint32_t rc_bittree(struct rc_dec *rc,
+					   uint16_t *probs, uint32_t limit)
 {
 	uint32_t symbol = 1;
 
@@ -534,7 +534,8 @@ static __always_inline uint32_t rc_bittree(
 
 /* Decode a bittree starting from the least significant bit. */
 static __always_inline void rc_bittree_reverse(struct rc_dec *rc,
-		uint16_t *probs, uint32_t *dest, uint32_t limit)
+					       uint16_t *probs,
+					       uint32_t *dest, uint32_t limit)
 {
 	uint32_t symbol = 1;
 	uint32_t i = 0;
@@ -550,8 +551,7 @@ static __always_inline void rc_bittree_reverse(struct rc_dec *rc,
 }
 
 /* Decode direct bits (fixed fifty-fifty probability) */
-static inline void rc_direct(
-		struct rc_dec *rc, uint32_t *dest, uint32_t limit)
+static inline void rc_direct(struct rc_dec *rc, uint32_t *dest, uint32_t limit)
 {
 	uint32_t mask;
 
@@ -618,7 +618,7 @@ static void lzma_literal(struct xz_dec_lzma2 *s)
 
 /* Decode the length of the match into s->lzma.len. */
 static void lzma_len(struct xz_dec_lzma2 *s, struct lzma_len_dec *l,
-		uint32_t pos_state)
+		     uint32_t pos_state)
 {
 	uint16_t *probs;
 	uint32_t limit;
@@ -929,8 +929,8 @@ static bool lzma2_lzma(struct xz_dec_lzma2 *s, struct xz_buf *b)
  * Take care of the LZMA2 control layer, and forward the job of actual LZMA
  * decoding or copying of uncompressed chunks to other functions.
  */
-XZ_EXTERN enum xz_ret xz_dec_lzma2_run(
-		struct xz_dec_lzma2 *s, struct xz_buf *b)
+XZ_EXTERN enum xz_ret xz_dec_lzma2_run(struct xz_dec_lzma2 *s,
+				       struct xz_buf *b)
 {
 	uint32_t tmp;
 
@@ -1102,8 +1102,8 @@ XZ_EXTERN enum xz_ret xz_dec_lzma2_run(
 	return XZ_OK;
 }
 
-XZ_EXTERN struct xz_dec_lzma2 *xz_dec_lzma2_create(
-		enum xz_mode mode, uint32_t dict_max)
+XZ_EXTERN struct xz_dec_lzma2 *xz_dec_lzma2_create(enum xz_mode mode,
+						   uint32_t dict_max)
 {
 	struct xz_dec_lzma2 *s = kmalloc(sizeof(*s), GFP_KERNEL);
 	if (s == NULL)
@@ -1126,8 +1126,7 @@ XZ_EXTERN struct xz_dec_lzma2 *xz_dec_lzma2_create(
 	return s;
 }
 
-XZ_EXTERN enum xz_ret xz_dec_lzma2_reset(
-		struct xz_dec_lzma2 *s, uint8_t props)
+XZ_EXTERN enum xz_ret xz_dec_lzma2_reset(struct xz_dec_lzma2 *s, uint8_t props)
 {
 	/* This limits dictionary size to 3 GiB to keep parsing simpler. */
 	if (props > 39)
diff --git a/linux/lib/xz/xz_dec_stream.c b/linux/lib/xz/xz_dec_stream.c
index 144a2b8..ac809b1 100644
--- a/linux/lib/xz/xz_dec_stream.c
+++ b/linux/lib/xz/xz_dec_stream.c
@@ -172,8 +172,8 @@ static bool fill_temp(struct xz_dec *s, struct xz_buf *b)
 }
 
 /* Decode a variable-length integer (little-endian base-128 encoding) */
-static enum xz_ret dec_vli(struct xz_dec *s,
-		const uint8_t *in, size_t *in_pos, size_t in_size)
+static enum xz_ret dec_vli(struct xz_dec *s, const uint8_t *in,
+			   size_t *in_pos, size_t in_size)
 {
 	uint8_t byte;
 
diff --git a/linux/lib/xz/xz_dec_test.c b/linux/lib/xz/xz_dec_test.c
index 40885a0..da28a19 100644
--- a/linux/lib/xz/xz_dec_test.c
+++ b/linux/lib/xz/xz_dec_test.c
@@ -99,8 +99,8 @@ static int xz_dec_test_release(struct inode *i, struct file *f)
  * The .xz file must have exactly one Stream and no Stream Padding. The data
  * after the first Stream is considered to be garbage.
  */
-static ssize_t xz_dec_test_write(struct file *file,
-		const char __user *buf, size_t size, loff_t *pos)
+static ssize_t xz_dec_test_write(struct file *file, const char __user *buf,
+				 size_t size, loff_t *pos)
 {
 	size_t remaining;
 
diff --git a/linux/lib/xz/xz_private.h b/linux/lib/xz/xz_private.h
index 0ec855f..a65633e 100644
--- a/linux/lib/xz/xz_private.h
+++ b/linux/lib/xz/xz_private.h
@@ -106,8 +106,8 @@
  * Allocate memory for LZMA2 decoder. xz_dec_lzma2_reset() must be used
  * before calling xz_dec_lzma2_run().
  */
-XZ_EXTERN struct xz_dec_lzma2 *xz_dec_lzma2_create(
-		enum xz_mode mode, uint32_t dict_max);
+XZ_EXTERN struct xz_dec_lzma2 *xz_dec_lzma2_create(enum xz_mode mode,
+						   uint32_t dict_max);
 
 /*
  * Decode the LZMA2 properties (one byte) and reset the decoder. Return
@@ -115,12 +115,12 @@ XZ_EXTERN struct xz_dec_lzma2 *xz_dec_lzma2_create(
  * big enough, and XZ_OPTIONS_ERROR if props indicates something that this
  * decoder doesn't support.
  */
-XZ_EXTERN enum xz_ret xz_dec_lzma2_reset(
-		struct xz_dec_lzma2 *s, uint8_t props);
+XZ_EXTERN enum xz_ret xz_dec_lzma2_reset(struct xz_dec_lzma2 *s,
+					 uint8_t props);
 
 /* Decode raw LZMA2 stream from b->in to b->out. */
-XZ_EXTERN enum xz_ret xz_dec_lzma2_run(
-		struct xz_dec_lzma2 *s, struct xz_buf *b);
+XZ_EXTERN enum xz_ret xz_dec_lzma2_run(struct xz_dec_lzma2 *s,
+				       struct xz_buf *b);
 
 /* Free the memory allocated for the LZMA2 decoder. */
 XZ_EXTERN void xz_dec_lzma2_end(struct xz_dec_lzma2 *s);
@@ -138,8 +138,7 @@ XZ_EXTERN struct xz_dec_bcj *xz_dec_bcj_create(bool single_call);
  * is needed. Returns XZ_OK if the given Filter ID is supported.
  * Otherwise XZ_OPTIONS_ERROR is returned.
  */
-XZ_EXTERN enum xz_ret xz_dec_bcj_reset(
-		struct xz_dec_bcj *s, uint8_t id);
+XZ_EXTERN enum xz_ret xz_dec_bcj_reset(struct xz_dec_bcj *s, uint8_t id);
 
 /*
  * Decode raw BCJ + LZMA2 stream. This must be used only if there actually is
@@ -147,7 +146,8 @@ XZ_EXTERN enum xz_ret xz_dec_bcj_reset(
  * must be called directly.
  */
 XZ_EXTERN enum xz_ret xz_dec_bcj_run(struct xz_dec_bcj *s,
-		struct xz_dec_lzma2 *lzma2, struct xz_buf *b);
+				     struct xz_dec_lzma2 *lzma2,
+				     struct xz_buf *b);
 
 /* Free the memory allocated for the BCJ filters. */
 #define xz_dec_bcj_end(s) kfree(s)