diff --git a/arch/xtensa/include/asm/atomic.h b/arch/xtensa/include/asm/atomic.h
index 7308b7f777d7..e00f55e457e0 100644
--- a/arch/xtensa/include/asm/atomic.h
+++ b/arch/xtensa/include/asm/atomic.h
@@ -37,21 +37,8 @@
  * where no register reference will cause an overflow.
  */
 
-/**
- * atomic_read - read atomic variable
- * @v: pointer of type atomic_t
- *
- * Atomically reads the value of @v.
- */
 #define arch_atomic_read(v)		READ_ONCE((v)->counter)
 
-/**
- * atomic_set - set atomic variable
- * @v: pointer of type atomic_t
- * @i: required value
- *
- * Atomically sets the value of @v to @i.
- */
 #define arch_atomic_set(v,i)		WRITE_ONCE((v)->counter, (i))
 
 #if XCHAL_HAVE_EXCLUSIVE
diff --git a/arch/xtensa/include/uapi/asm/mman.h b/arch/xtensa/include/uapi/asm/mman.h
index 99d4ccee7f6e..aa64ab9109c5 100644
--- a/arch/xtensa/include/uapi/asm/mman.h
+++ b/arch/xtensa/include/uapi/asm/mman.h
@@ -96,7 +96,7 @@
 #define MADV_HUGEPAGE	14		/* Worth backing with hugepages */
 #define MADV_NOHUGEPAGE	15		/* Not worth backing with hugepages */
 
-#define MADV_DONTDUMP   16		/* Explicity exclude from the core dump,
+#define MADV_DONTDUMP   16		/* Explicitly exclude from the core dump,
 					   overrides the coredump filter bits */
 #define MADV_DODUMP	17		/* Clear the MADV_NODUMP flag */
 
diff --git a/arch/xtensa/kernel/entry.S b/arch/xtensa/kernel/entry.S
index 272fff587907..49b4c9eca80e 100644
--- a/arch/xtensa/kernel/entry.S
+++ b/arch/xtensa/kernel/entry.S
@@ -1671,7 +1671,7 @@ ENTRY(fast_second_level_miss)
 	 * This allows to map the three most common regions to three different
 	 * DTLBs:
 	 *  0,1 -> way 7	program (0040.0000) and virtual (c000.0000)
-	 *  2   -> way 8	shared libaries (2000.0000)
+	 *  2   -> way 8	shared libraries (2000.0000)
 	 *  3   -> way 0	stack (3000.0000)
 	 */
 
diff --git a/arch/xtensa/kernel/time.c b/arch/xtensa/kernel/time.c
index 09fda6a3fe3b..bccc0e9e5607 100644
--- a/arch/xtensa/kernel/time.c
+++ b/arch/xtensa/kernel/time.c
@@ -152,6 +152,7 @@ static void __init calibrate_ccount(void)
 		of_node_put(cpu);
 		if (!IS_ERR(clk)) {
 			ccount_freq = clk_get_rate(clk);
+			clk_put(clk);
 			return;
 		} else {
 			pr_warn("%s: CPU input clock not found\n",
diff --git a/arch/xtensa/kernel/vectors.S b/arch/xtensa/kernel/vectors.S
index 1073fe4a584d..063a6acc64e9 100644
--- a/arch/xtensa/kernel/vectors.S
+++ b/arch/xtensa/kernel/vectors.S
@@ -21,7 +21,7 @@
  * use a first-level dispatch table to dispatch the exception to a registered
  * fast handler or the default handler, if no fast handler was registered.
  * The default handler sets up a C-stack and dispatches the exception to a
- * registerd C handler in the second-level dispatch table.
+ * registered C handler in the second-level dispatch table.
  *
  * Fast handler entry condition:
  *
diff --git a/arch/xtensa/mm/init.c b/arch/xtensa/mm/init.c
index fe83a68335da..7b5f82932a45 100644
--- a/arch/xtensa/mm/init.c
+++ b/arch/xtensa/mm/init.c
@@ -43,7 +43,7 @@ void __init bootmem_init(void)
 	 * accounting doesn't work for pages below that address.
 	 *
 	 * If PHYS_OFFSET is zero reserve page at address 0:
-	 * successfull allocations should never return NULL.
+	 * successful allocations should never return NULL.
 	 */
 	memblock_reserve(0, PHYS_OFFSET ? PHYS_OFFSET : 1);