| Message ID | 20240902225534.130383-7-vassilisamir@gmail.com (mailing list archive) |
|---|---|
| State | Superseded |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | Use functionality of irq_get_trigger_type() | expand |
On Tue, Sep 03, 2024 at 12:55:33AM +0200, Vasileios Amoiridis wrote: > Convert irqd_get_trigger_type(irq_get_irq_data(irq)) cases to the more > simple irq_get_trigger_type(irq). ... > memset(res, 0x00, sizeof(res)); > > res[0].start = irq; > - res[0].flags = IORESOURCE_IRQ | > - irqd_get_trigger_type(irq_get_irq_data(irq)); > + res[0].flags = IORESOURCE_IRQ | irq_get_trigger_type(irq); > res[0].name = "irq"; > if (wakeirq > 0) { > res[1].start = wakeirq; > - res[1].flags = IORESOURCE_IRQ | > - irqd_get_trigger_type(irq_get_irq_data(wakeirq)); > + res[1].flags = IORESOURCE_IRQ | irq_get_trigger_type(wakeirq); > res[1].name = "wakeirq"; > num_irqs = 2; Since you are touching a lot here, consider also using macros from ioport.h, i.e. DEFINE_RES_IRQ_NAMED(). This will become something like res[0] = DEFINE_RES_IRQ_NAMED(irq, "irq"); res[0].flags |= irq_get_trigger_type(irq); if (wakeirq > 0) { res[1] = DEFINE_RES_IRQ_NAMED(wakeirq, "wakeirq"); res[1].flags |= irq_get_trigger_type(wakeirq);
On Tue, Sep 03, 2024 at 05:45:48PM +0300, Andy Shevchenko wrote: > On Tue, Sep 03, 2024 at 12:55:33AM +0200, Vasileios Amoiridis wrote: > > Convert irqd_get_trigger_type(irq_get_irq_data(irq)) cases to the more > > simple irq_get_trigger_type(irq). > > ... > > > memset(res, 0x00, sizeof(res)); > > > > res[0].start = irq; > > - res[0].flags = IORESOURCE_IRQ | > > - irqd_get_trigger_type(irq_get_irq_data(irq)); > > + res[0].flags = IORESOURCE_IRQ | irq_get_trigger_type(irq); > > res[0].name = "irq"; > > > > if (wakeirq > 0) { > > res[1].start = wakeirq; > > - res[1].flags = IORESOURCE_IRQ | > > - irqd_get_trigger_type(irq_get_irq_data(wakeirq)); > > + res[1].flags = IORESOURCE_IRQ | irq_get_trigger_type(wakeirq); > > res[1].name = "wakeirq"; > > num_irqs = 2; > > Since you are touching a lot here, consider also using macros from ioport.h, > i.e. DEFINE_RES_IRQ_NAMED(). > > This will become something like > > res[0] = DEFINE_RES_IRQ_NAMED(irq, "irq"); > res[0].flags |= irq_get_trigger_type(irq); > > if (wakeirq > 0) { > res[1] = DEFINE_RES_IRQ_NAMED(wakeirq, "wakeirq"); > res[1].flags |= irq_get_trigger_type(wakeirq); > > -- > With Best Regards, > Andy Shevchenko > > Hi Andy, Thank you very much for reviewing this, I will check this out and apply the proposed changes to this and the next one. Cheers, Vasilis
diff --git a/drivers/net/wireless/ti/wlcore/sdio.c b/drivers/net/wireless/ti/wlcore/sdio.c index 92fb5b8dcdae..9e1b644beba9 100644 --- a/drivers/net/wireless/ti/wlcore/sdio.c +++ b/drivers/net/wireless/ti/wlcore/sdio.c @@ -324,15 +324,13 @@ static int wl1271_probe(struct sdio_func *func, memset(res, 0x00, sizeof(res)); res[0].start = irq; - res[0].flags = IORESOURCE_IRQ | - irqd_get_trigger_type(irq_get_irq_data(irq)); + res[0].flags = IORESOURCE_IRQ | irq_get_trigger_type(irq); res[0].name = "irq"; if (wakeirq > 0) { res[1].start = wakeirq; - res[1].flags = IORESOURCE_IRQ | - irqd_get_trigger_type(irq_get_irq_data(wakeirq)); + res[1].flags = IORESOURCE_IRQ | irq_get_trigger_type(wakeirq); res[1].name = "wakeirq"; num_irqs = 2; } else {
Convert irqd_get_trigger_type(irq_get_irq_data(irq)) cases to the more simple irq_get_trigger_type(irq). Signed-off-by: Vasileios Amoiridis <vassilisamir@gmail.com> --- drivers/net/wireless/ti/wlcore/sdio.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)