s390: replace setup_irq() by request_irq()
Subsystems (2)
PATCH v3 1/1 s390: replace setup_irq() by request_irq()
request_irq() is preferred over setup_irq(). Invocations of setup_irq() occur after memory allocators are ready.
Per tglx[1], setup_irq() existed in olden days when allocators were not ready by the time early interrupts were initialized.
Hence replace setup_irq() by request_irq().
[1] https://lkml.kernel.org/r/alpine.DEB.2.20.1710191609480.1971@nanos
---
Hi s390 maintainers,
if okay w/ this change, please consider taking it thr' your tree, else please let me know.
Regards
afzal
Link to v2 & v1,
[v2] https://lkml.kernel.org/r/[email protected]
[v1] https://lkml.kernel.org/r/[email protected]
v3:
* Split out from tree wide series, as Thomas suggested to get it thr' respective maintainers
* Modify pr_err displayed in case of error
* Re-arrange code & choose pr_err args as required to improve readability
* Remove irrelevant parts from commit message & improve
v2:
* Replace pr_err("request_irq() on %s failed" by
pr_err("%s: request_irq() failed"* Commit message massage
arch/s390/kernel/irq.c | 8 ++------ drivers/s390/cio/airq.c | 8 ++------ drivers/s390/cio/cio.c | 8 ++------ 3 files changed, 6 insertions(+), 18 deletions(-)
arch/s390/kernel/irq.c +2 -6
@@ -294,11 +294,6 @@ static irqreturn_t do_ext_interrupt(int irq, void *dummy)return IRQ_HANDLED ; } -static struct irqaction external_interrupt = { - .name ="EXT" , - .handler = do_ext_interrupt, -}; -void __init init_ext_interrupts (void ) {int idx;
@@ -308,7 +303,8 @@ void __init init_ext_interrupts(void)irq_set_chip_and_handler (EXT_INTERRUPT , &dummy_irq_chip, handle_percpu_irq); -setup_irq (EXT_INTERRUPT , &external_interrupt); +if (request_irq (EXT_INTERRUPT , do_ext_interrupt,0 ,"EXT" ,NULL )) +pr_err ("Failed to register EXT interrupt\n" ); }static DEFINE_SPINLOCK (irq_subclass_lock);
drivers/s390/cio/airq.c +2 -6
@@ -105,16 +105,12 @@ static irqreturn_t do_airq_interrupt(int irq, void *dummy)return IRQ_HANDLED ; } -static struct irqaction airq_interrupt = { - .name ="AIO" , - .handler = do_airq_interrupt, -}; -void __init init_airq_interrupts (void ) {irq_set_chip_and_handler (THIN_INTERRUPT , &dummy_irq_chip, handle_percpu_irq); -setup_irq (THIN_INTERRUPT , &airq_interrupt); +if (request_irq (THIN_INTERRUPT , do_airq_interrupt,0 ,"AIO" ,NULL )) +pr_err ("Failed to register AIO interrupt\n" ); }static inline unsigned long iv_size (unsigned long bits)
drivers/s390/cio/cio.c +2 -6
@@ -563,16 +563,12 @@ static irqreturn_t do_cio_interrupt(int irq, void *dummy)return IRQ_HANDLED ; } -static struct irqaction io_interrupt = { - .name ="I/O" , - .handler = do_cio_interrupt, -}; -void __init init_cio_interrupts (void ) {irq_set_chip_and_handler (IO_INTERRUPT , &dummy_irq_chip, handle_percpu_irq); -setup_irq (IO_INTERRUPT , &io_interrupt); +if (request_irq (IO_INTERRUPT , do_cio_interrupt,0 ,"I/O" ,NULL )) +pr_err ("Failed to register I/O interrupt\n" ); }#ifdef CONFIG_CCW_CONSOLE
Signature · 1 line
2.25.1
Heiko Carstens
AppliedQuoted 11 lines · afzal mohammed
request_irq()is preferred oversetup_irq(). Invocations ofsetup_irq()occur after memory allocators are ready.Per tglx[1],
setup_irq()existed in olden days when allocators were not ready by the time early interrupts were initialized.Hence replace
setup_irq()byrequest_irq().[1] https://lkml.kernel.org/r/alpine.DEB.2.20.1710191609480.1971@nanos
Signed-off-by afzal mohammed <[email protected]>
Quoted 8 lines
---
Hi s390 maintainers,if okay w/ this change, please consider taking it thr' your tree, else please let me know.
Regards
afzal
Applied. However I changed the pr_err invocations to panic, since it doesn't make sense to continue if interrupt registration fails that early.