From 6d461ddbb2289ae628f2c7b1c1d2fcdf615e24fa Mon Sep 17 00:00:00 2001 From: John Crispin Date: Mon, 17 Aug 2015 11:26:02 +0000 Subject: [PATCH] generic: crypto: remove IRQF_DISABLED no-op since 2.6.35 removed in Kernel 4.1 see https://lwn.net/Articles/380931/ Signed-off-by: Dirk Neukirchen SVN-Revision: 46671 --- target/linux/generic/files/crypto/ocf/kirkwood/cesa_ocf_drv.c | 2 +- target/linux/generic/files/crypto/ocf/pasemi/pasemi.c | 2 +- target/linux/generic/files/crypto/ocf/ubsec_ssb/ubsec_ssb.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/target/linux/generic/files/crypto/ocf/kirkwood/cesa_ocf_drv.c b/target/linux/generic/files/crypto/ocf/kirkwood/cesa_ocf_drv.c index e689f24eff..6fb9e09238 100644 --- a/target/linux/generic/files/crypto/ocf/kirkwood/cesa_ocf_drv.c +++ b/target/linux/generic/files/crypto/ocf/kirkwood/cesa_ocf_drv.c @@ -1203,7 +1203,7 @@ mv_cesa_ocf_init(struct platform_device *pdev) #endif /* register interrupt */ if( request_irq( cesa_device.irq, cesa_interrupt_handler, - (IRQF_DISABLED) , "cesa", &cesa_ocf_id) < 0) { + 0, "cesa", &cesa_ocf_id) < 0) { printk("%s,%d: cannot assign irq %x\n", __FILE__, __LINE__, cesa_device.reg); return EINVAL; } diff --git a/target/linux/generic/files/crypto/ocf/pasemi/pasemi.c b/target/linux/generic/files/crypto/ocf/pasemi/pasemi.c index 7bb62bc531..216c578d7e 100644 --- a/target/linux/generic/files/crypto/ocf/pasemi/pasemi.c +++ b/target/linux/generic/files/crypto/ocf/pasemi/pasemi.c @@ -767,7 +767,7 @@ static int pasemi_dma_setup_tx_resources(struct pasemi_softc *sc, int chan) ring->irq = irq_create_mapping(NULL, sc->base_irq + chan); ret = request_irq(ring->irq, (irq_handler_t) - pasemi_intr, IRQF_DISABLED, ring->irq_name, sc); + pasemi_intr, 0, ring->irq_name, sc); if (ret) { printk(KERN_ERR DRV_NAME ": failed to hook irq %d ret %d\n", ring->irq, ret); diff --git a/target/linux/generic/files/crypto/ocf/ubsec_ssb/ubsec_ssb.c b/target/linux/generic/files/crypto/ocf/ubsec_ssb/ubsec_ssb.c index 6dc22c7ee5..a81594e593 100644 --- a/target/linux/generic/files/crypto/ocf/ubsec_ssb/ubsec_ssb.c +++ b/target/linux/generic/files/crypto/ocf/ubsec_ssb/ubsec_ssb.c @@ -499,7 +499,7 @@ ubsec_ssb_probe(struct ssb_device *sdev, } err = request_irq(sdev->irq, (irq_handler_t)ubsec_ssb_isr, - IRQF_DISABLED | IRQF_SHARED, DRV_MODULE_NAME, sdev); + IRQF_SHARED, DRV_MODULE_NAME, sdev); if (err) { dev_err(sdev->dev, "Could not request irq\n"); goto err_out_powerdown;