Commit 1d2aea1b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents a8356cdb ff30bd6a

drivers/sh/clk/core.c

+1 −1
Original line number Diff line number Diff line
@@ -295,7 +295,7 @@ int clk_enable(struct clk *clk) 
	int ret;



	if (!clk)

		return -EINVAL;

		return 0;



	spin_lock_irqsave(&clock_lock, flags);

	ret = __clk_enable(clk);

include/linux/sh_intc.h

+4 −1
Original line number Diff line number Diff line
@@ -97,7 +97,10 @@ struct intc_hw_desc { 
	unsigned int nr_subgroups;

};



#define _INTC_ARRAY(a) a, __same_type(a, NULL) ? 0 : sizeof(a)/sizeof(*a)

#define _INTC_SIZEOF_OR_ZERO(a) (_Generic(a,                 \

                                 typeof(NULL):  0,           \

                                 default:       sizeof(a)))

#define _INTC_ARRAY(a) a, _INTC_SIZEOF_OR_ZERO(a)/sizeof(*a)



#define INTC_HW_DESC(vectors, groups, mask_regs,	\

		     prio_regs,	sense_regs, ack_regs)	\