xz: fix comments and coding style

- Fix comments that were no longer in sync with the code below them.
- Fix language errors.
- Fix coding style.

Link: https://lkml.kernel.org/r/20240721133633.47721-5-lasse.collin@tukaani.org
Signed-off-by: Lasse Collin <lasse.collin@tukaani.org>
Reviewed-by: Sam James <sam@gentoo.org>
Cc: Albert Ou <aou@eecs.berkeley.edu>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Emil Renner Berthing <emil.renner.berthing@canonical.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Herbert Xu <herbert@gondor.apana.org.au>
Cc: Joel Stanley <joel@jms.id.au>
Cc: Jonathan Corbet <corbet@lwn.net>
Cc: Jubin Zhong <zhongjubin@huawei.com>
Cc: Jules Maselbas <jmaselbas@zdiv.net>
Cc: Krzysztof Kozlowski <krzk@kernel.org>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Palmer Dabbelt <palmer@dabbelt.com>
Cc: Paul Walmsley <paul.walmsley@sifive.com>
Cc: Randy Dunlap <rdunlap@infradead.org>
Cc: Rui Li <me@lirui.org>
Cc: Simon Glass <sjg@chromium.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Will Deacon <will@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

diff --git a/lib/decompress_unxz.c b/lib/decompress_unxz.c
index 34bb7efc04120b0cb509e4071b74be76200cf4d6..46aa3be13fc5371332de258fc9f68285e61f7a59 100644 (file)
--- a/lib/decompress_unxz.c
+++ b/lib/decompress_unxz.c
@@ -102,7 +102,7 @@
 #ifdef STATIC
 #      define XZ_PREBOOT
 #else
-#include <linux/decompress/unxz.h>
+#      include <linux/decompress/unxz.h>
 #endif
 #ifdef __KERNEL__
 #      include <linux/decompress/mm.h>
@@ -219,7 +219,7 @@ void *memmove(void *dest, const void *src, size_t size)
 #endif
 
 /*
- * Since we need memmove anyway, would use it as memcpy too.
+ * Since we need memmove anyway, we could use it as memcpy too.
  * Commented out for now to avoid breaking things.
  */
 /*
@@ -389,17 +389,17 @@ error_alloc_state:
 }
 
 /*
- * This macro is used by architecture-specific files to decompress
+ * This function is used by architecture-specific files to decompress
  * the kernel image.
  */
 #ifdef XZ_PREBOOT
-STATIC int INIT __decompress(unsigned char *buf, long len,
-                          long (*fill)(void*, unsigned long),
-                          long (*flush)(void*, unsigned long),
-                          unsigned char *out_buf, long olen,
-                          long *pos,
-                          void (*error)(char *x))
+STATIC int INIT __decompress(unsigned char *in, long in_size,
+                            long (*fill)(void *dest, unsigned long size),
+                            long (*flush)(void *src, unsigned long size),
+                            unsigned char *out, long out_size,
+                            long *in_used,
+                            void (*error)(char *x))
 {
-       return unxz(buf, len, fill, flush, out_buf, pos, error);
+       return unxz(in, in_size, fill, flush, out, in_used, error);
 }
 #endif

diff --git a/lib/xz/Kconfig b/lib/xz/Kconfig
index aef086a6bf2f3d2788fd1dfb622ee09ddc9ac1da..6b80453d8f540090188f971f298ddc61475dd0ff 100644 (file)
--- a/lib/xz/Kconfig
+++ b/lib/xz/Kconfig
@@ -5,7 +5,8 @@ config XZ_DEC
        help
          LZMA2 compression algorithm and BCJ filters are supported using
          the .xz file format as the container. For integrity checking,
-         CRC32 is supported. See Documentation/staging/xz.rst for more information.
+         CRC32 is supported. See Documentation/staging/xz.rst for more
+         information.
 
 if XZ_DEC
 

diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib
index 207325eaf1d1cb936a6619e75463f25640e08f49..dae2089e7bc6788211ba040865ea445e0081242a 100644 (file)
--- a/scripts/Makefile.lib
+++ b/scripts/Makefile.lib
@@ -530,14 +530,17 @@ quiet_cmd_fit = FIT     $@
 
 # XZ
 # ---------------------------------------------------------------------------
-# Use xzkern to compress the kernel image and xzmisc to compress other things.
+# Use xzkern or xzkern_with_size to compress the kernel image and xzmisc to
+# compress other things.
 #
 # xzkern uses a big LZMA2 dictionary since it doesn't increase memory usage
 # of the kernel decompressor. A BCJ filter is used if it is available for
-# the target architecture. xzkern also appends uncompressed size of the data
-# using size_append. The .xz format has the size information available at
-# the end of the file too, but it's in more complex format and it's good to
-# avoid changing the part of the boot code that reads the uncompressed size.
+# the target architecture.
+#
+# xzkern_with_size also appends uncompressed size of the data using
+# size_append. The .xz format has the size information available at the end
+# of the file too, but it's in more complex format and it's good to avoid
+# changing the part of the boot code that reads the uncompressed size.
 # Note that the bytes added by size_append will make the xz tool think that
 # the file is corrupt. This is expected.
 #