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

Pull sh updates from John Paul Adrian Glaubitz:
 "The first change by Gaosheng Cui removes unused declarations which
  have been obsoleted since commit 5a4053b232 ("sh: Kill off dead
  boards.") and the second by his colleague Hongbo Li replaces the use
  of the unsafe simple_strtoul() with the safer kstrtoul() function in
  the sh interrupt controller driver code"

* tag 'sh-for-v6.12-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/glaubitz/sh-linux:
  sh: intc: Replace simple_strtoul() with kstrtoul()
  sh: Remove unused declarations for make_maskreg_irq() and irq_mask_register
This commit is contained in:
Linus Torvalds
2024-09-27 10:10:21 -07:00
2 changed files with 4 additions and 7 deletions
-6
View File
@@ -13,12 +13,6 @@
*/
#define NO_IRQ_IGNORE ((unsigned int)-1)
/*
* Simple Mask Register Support
*/
extern void make_maskreg_irq(unsigned int irq);
extern unsigned short *irq_mask_register;
/*
* PINT IRQs
*/
+4 -1
View File
@@ -32,8 +32,11 @@ store_intc_userimask(struct device *dev,
const char *buf, size_t count)
{
unsigned long level;
int ret;
level = simple_strtoul(buf, NULL, 10);
ret = kstrtoul(buf, 10, &level);
if (ret != 0)
return ret;
/*
* Minimal acceptable IRQ levels are in the 2 - 16 range, but