Skip to content

Commit 56f0faf

Browse files
committed
Merge tag 'zynq-soc-for-6.9' of https://github.com/Xilinx/linux-xlnx into soc/arm
ARM: Zynq SoC changes for 6.9 - Fix kernel-doc - Removed one useless header * tag 'zynq-soc-for-6.9' of https://github.com/Xilinx/linux-xlnx: ARM: zynq: Remove clk/zynq.h header ARM: zynq: slcr: fix function prototype kernel-doc warnings Link: https://lore.kernel.org/r/CAHTX3dJpawPhgVxSsXuSvG20JY9r4EkJu2NrrH1OKRjKxTpNAA@mail.gmail.com Signed-off-by: Arnd Bergmann <[email protected]>
2 parents 9cfb800 + a22f00c commit 56f0faf

File tree

1 file changed

+2
-3
lines changed

1 file changed

+2
-3
lines changed

arch/arm/mach-zynq/slcr.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
#include <linux/mfd/syscon.h>
1111
#include <linux/of_address.h>
1212
#include <linux/regmap.h>
13-
#include <linux/clk/zynq.h>
1413
#include "common.h"
1514

1615
/* register offsets */
@@ -146,7 +145,7 @@ void zynq_slcr_cpu_stop(int cpu)
146145
}
147146

148147
/**
149-
* zynq_slcr_cpu_state - Read/write cpu state
148+
* zynq_slcr_cpu_state_read - Read cpu state
150149
* @cpu: cpu number
151150
*
152151
* SLCR_REBOOT_STATUS save upper 2 bits (31/30 cpu states for cpu0 and cpu1)
@@ -165,7 +164,7 @@ bool zynq_slcr_cpu_state_read(int cpu)
165164
}
166165

167166
/**
168-
* zynq_slcr_cpu_state - Read/write cpu state
167+
* zynq_slcr_cpu_state_write - Write cpu state
169168
* @cpu: cpu number
170169
* @die: cpu state - true if cpu is going to die
171170
*

0 commit comments

Comments
 (0)