Skip to content

Commit ec38498

Browse files
committed
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 5a4053b ("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
2 parents 653608c + c3e878c commit ec38498

File tree

2 files changed

+4
-7
lines changed

2 files changed

+4
-7
lines changed

arch/sh/include/asm/irq.h

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,6 @@
1313
*/
1414
#define NO_IRQ_IGNORE ((unsigned int)-1)
1515

16-
/*
17-
* Simple Mask Register Support
18-
*/
19-
extern void make_maskreg_irq(unsigned int irq);
20-
extern unsigned short *irq_mask_register;
21-
2216
/*
2317
* PINT IRQs
2418
*/

drivers/sh/intc/userimask.c

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,11 @@ store_intc_userimask(struct device *dev,
3232
const char *buf, size_t count)
3333
{
3434
unsigned long level;
35+
int ret;
3536

36-
level = simple_strtoul(buf, NULL, 10);
37+
ret = kstrtoul(buf, 10, &level);
38+
if (ret != 0)
39+
return ret;
3740

3841
/*
3942
* Minimal acceptable IRQ levels are in the 2 - 16 range, but

0 commit comments

Comments
 (0)