Re: [RESEND PATCH 2/2] powerpc/powermac: constify device_node in of_irq_parse_oldworld()
From: Christophe Leroy <hidden>
Date: 2021-09-22 13:55:07
Also in:
linuxppc-dev, lkml
Le 22/09/2021 à 10:44, Krzysztof Kozlowski a écrit :
The of_irq_parse_oldworld() does not modify passed device_node so make it a pointer to const for safety.
AFAIKS this patch is unrelated to previous one so you should send them out separately instead of sending as a series.
quoted hunk ↗ jump to hunk
Signed-off-by: Krzysztof Kozlowski <redacted> --- arch/powerpc/platforms/powermac/pic.c | 2 +- include/linux/of_irq.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)diff --git a/arch/powerpc/platforms/powermac/pic.c b/arch/powerpc/platforms/powermac/pic.c index 4921bccf0376..af5ca1f41bb1 100644 --- a/arch/powerpc/platforms/powermac/pic.c +++ b/arch/powerpc/platforms/powermac/pic.c@@ -384,7 +384,7 @@ static void __init pmac_pic_probe_oldstyle(void) #endif } -int of_irq_parse_oldworld(struct device_node *device, int index, +int of_irq_parse_oldworld(const struct device_node *device, int index, struct of_phandle_args *out_irq) { const u32 *ints = NULL;diff --git a/include/linux/of_irq.h b/include/linux/of_irq.h index aaf219bd0354..6074fdf51f0c 100644 --- a/include/linux/of_irq.h +++ b/include/linux/of_irq.h@@ -20,12 +20,12 @@ typedef int (*of_irq_init_cb_t)(struct device_node *, struct device_node *); #if defined(CONFIG_PPC32) && defined(CONFIG_PPC_PMAC) extern unsigned int of_irq_workarounds; extern struct device_node *of_irq_dflt_pic; -extern int of_irq_parse_oldworld(struct device_node *device, int index, +extern int of_irq_parse_oldworld(const struct device_node *device, int index, struct of_phandle_args *out_irq);
Please remove 'extern' which is useless for prototypes.
#else /* CONFIG_PPC32 && CONFIG_PPC_PMAC */
#define of_irq_workarounds (0)
#define of_irq_dflt_pic (NULL)
-static inline int of_irq_parse_oldworld(struct device_node *device, int index,
+static inline int of_irq_parse_oldworld(const struct device_node *device, int index,
struct of_phandle_args *out_irq)
{
return -EINVAL;