Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

Merge tag 'sh-for-v6.3-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/glaubitz/sh-linux

Pull sh updates from John Paul Adrian Glaubitz:

- regression fix in connection with the rtl8169 driver on SuperH boards
that was introduced when the driver was switched to use
devm_clk_get_optional_enabled() to simplify the code (Geert
Uytterhoeven)

- build warning fix to allow the kernel to be built with CONFIG_WERROR
enabled (Michael Karcher)

* tag 'sh-for-v6.3-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/glaubitz/sh-linux:
sh: clk: Fix clk_enable() to return 0 on NULL clk
sh: intc: Avoid spurious sizeof-pointer-div warning

+5 -2
+1 -1
drivers/sh/clk/core.c
··· 295 295 int ret; 296 296 297 297 if (!clk) 298 - return -EINVAL; 298 + return 0; 299 299 300 300 spin_lock_irqsave(&clock_lock, flags); 301 301 ret = __clk_enable(clk);
+4 -1
include/linux/sh_intc.h
··· 97 97 unsigned int nr_subgroups; 98 98 }; 99 99 100 - #define _INTC_ARRAY(a) a, __same_type(a, NULL) ? 0 : sizeof(a)/sizeof(*a) 100 + #define _INTC_SIZEOF_OR_ZERO(a) (_Generic(a, \ 101 + typeof(NULL): 0, \ 102 + default: sizeof(a))) 103 + #define _INTC_ARRAY(a) a, _INTC_SIZEOF_OR_ZERO(a)/sizeof(*a) 101 104 102 105 #define INTC_HW_DESC(vectors, groups, mask_regs, \ 103 106 prio_regs, sense_regs, ack_regs) \