2014-10-06 15:36:37

by Fabian Frédérick

[permalink] [raw]
Subject: [PATCH 0/7 linux-next] drivers: remove deprecated IRQF_DISABLED

This small patchset removes IRQF_DISABLED from drivers branch.

See include/linux/interrupt.h:
"This flag is a NOOP and scheduled to be removed"

Note: (cross)compiled but untested.

Fabian Frederick (7):
mv64x60_edac: remove deprecated IRQF_DISABLED
ppc4xx_edac: remove deprecated IRQF_DISABLED
tw68: remove deprecated IRQF_DISABLED
cpqarray: remove deprecated IRQF_DISABLED
HSI: remove deprecated IRQF_DISABLED
bus: omap_l3_noc: remove deprecated IRQF_DISABLED
bus: omap_l3_smx: remove deprecated IRQF_DISABLED

drivers/block/cpqarray.c | 2 +-
drivers/bus/omap_l3_noc.c | 4 ++--
drivers/bus/omap_l3_smx.c | 10 ++++------
drivers/edac/mv64x60_edac.c | 8 ++++----
drivers/edac/ppc4xx_edac.c | 4 ++--
drivers/hsi/clients/nokia-modem.c | 4 ++--
drivers/media/pci/tw68/tw68-core.c | 2 +-
7 files changed, 16 insertions(+), 18 deletions(-)

--
1.9.3


2014-10-06 15:36:53

by Fabian Frédérick

[permalink] [raw]
Subject: [PATCH 6/7 linux-next] bus: omap_l3_noc: remove deprecated IRQF_DISABLED

See include/linux/interrupt.h:
"This flag is a NOOP and scheduled to be removed"

Signed-off-by: Fabian Frederick <[email protected]>
---
drivers/bus/omap_l3_noc.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/bus/omap_l3_noc.c b/drivers/bus/omap_l3_noc.c
index 531ae59..547a0fd 100644
--- a/drivers/bus/omap_l3_noc.c
+++ b/drivers/bus/omap_l3_noc.c
@@ -280,7 +280,7 @@ static int omap_l3_probe(struct platform_device *pdev)
*/
l3->debug_irq = platform_get_irq(pdev, 0);
ret = devm_request_irq(l3->dev, l3->debug_irq, l3_interrupt_handler,
- IRQF_DISABLED, "l3-dbg-irq", l3);
+ 0, "l3-dbg-irq", l3);
if (ret) {
dev_err(l3->dev, "request_irq failed for %d\n",
l3->debug_irq);
@@ -289,7 +289,7 @@ static int omap_l3_probe(struct platform_device *pdev)

l3->app_irq = platform_get_irq(pdev, 1);
ret = devm_request_irq(l3->dev, l3->app_irq, l3_interrupt_handler,
- IRQF_DISABLED, "l3-app-irq", l3);
+ 0, "l3-app-irq", l3);
if (ret)
dev_err(l3->dev, "request_irq failed for %d\n", l3->app_irq);

--
1.9.3

2014-10-06 15:37:00

by Fabian Frédérick

[permalink] [raw]
Subject: [PATCH 7/7 linux-next] bus: omap_l3_smx: remove deprecated IRQF_DISABLED

See include/linux/interrupt.h:
"This flag is a NOOP and scheduled to be removed"

Signed-off-by: Fabian Frederick <[email protected]>
---
drivers/bus/omap_l3_smx.c | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/drivers/bus/omap_l3_smx.c b/drivers/bus/omap_l3_smx.c
index acc2164..9ae0997 100644
--- a/drivers/bus/omap_l3_smx.c
+++ b/drivers/bus/omap_l3_smx.c
@@ -237,18 +237,16 @@ static int __init omap3_l3_probe(struct platform_device *pdev)
}

l3->debug_irq = platform_get_irq(pdev, 0);
- ret = request_irq(l3->debug_irq, omap3_l3_app_irq,
- IRQF_DISABLED | IRQF_TRIGGER_RISING,
- "l3-debug-irq", l3);
+ ret = request_irq(l3->debug_irq, omap3_l3_app_irq, IRQF_TRIGGER_RISING,
+ "l3-debug-irq", l3);
if (ret) {
dev_err(&pdev->dev, "couldn't request debug irq\n");
goto err1;
}

l3->app_irq = platform_get_irq(pdev, 1);
- ret = request_irq(l3->app_irq, omap3_l3_app_irq,
- IRQF_DISABLED | IRQF_TRIGGER_RISING,
- "l3-app-irq", l3);
+ ret = request_irq(l3->app_irq, omap3_l3_app_irq, IRQF_TRIGGER_RISING,
+ "l3-app-irq", l3);
if (ret) {
dev_err(&pdev->dev, "couldn't request app irq\n");
goto err2;
--
1.9.3

2014-10-06 15:36:50

by Fabian Frédérick

[permalink] [raw]
Subject: [PATCH 5/7 linux-next] HSI: remove deprecated IRQF_DISABLED

See include/linux/interrupt.h:
"This flag is a NOOP and scheduled to be removed"

Signed-off-by: Fabian Frederick <[email protected]>
---
drivers/hsi/clients/nokia-modem.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/hsi/clients/nokia-modem.c b/drivers/hsi/clients/nokia-modem.c
index 363b780..67156c6 100644
--- a/drivers/hsi/clients/nokia-modem.c
+++ b/drivers/hsi/clients/nokia-modem.c
@@ -173,8 +173,8 @@ static int nokia_modem_probe(struct device *dev)

tasklet_init(&modem->nokia_modem_rst_ind_tasklet,
do_nokia_modem_rst_ind_tasklet, (unsigned long)modem);
- err = devm_request_irq(dev, irq, nokia_modem_rst_ind_isr,
- IRQF_DISABLED | pflags, "modem_rst_ind", modem);
+ err = devm_request_irq(dev, irq, nokia_modem_rst_ind_isr, pflags,
+ "modem_rst_ind", modem);
if (err < 0) {
dev_err(dev, "Request rst_ind irq(%d) failed (flags %d)\n",
irq, pflags);
--
1.9.3

2014-10-06 15:36:49

by Fabian Frédérick

[permalink] [raw]
Subject: [PATCH 1/7 linux-next] mv64x60_edac: remove deprecated IRQF_DISABLED

See include/linux/interrupt.h:

Signed-off-by: Fabian Frederick <[email protected]>
---
drivers/edac/mv64x60_edac.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/edac/mv64x60_edac.c b/drivers/edac/mv64x60_edac.c
index 542fad7..6366e88 100644
--- a/drivers/edac/mv64x60_edac.c
+++ b/drivers/edac/mv64x60_edac.c
@@ -178,7 +178,7 @@ static int mv64x60_pci_err_probe(struct platform_device *pdev)
res = devm_request_irq(&pdev->dev,
pdata->irq,
mv64x60_pci_isr,
- IRQF_DISABLED,
+ 0,
"[EDAC] PCI err",
pci);
if (res < 0) {
@@ -345,7 +345,7 @@ static int mv64x60_sram_err_probe(struct platform_device *pdev)
res = devm_request_irq(&pdev->dev,
pdata->irq,
mv64x60_sram_isr,
- IRQF_DISABLED,
+ 0,
"[EDAC] SRAM err",
edac_dev);
if (res < 0) {
@@ -540,7 +540,7 @@ static int mv64x60_cpu_err_probe(struct platform_device *pdev)
res = devm_request_irq(&pdev->dev,
pdata->irq,
mv64x60_cpu_isr,
- IRQF_DISABLED,
+ 0,
"[EDAC] CPU err",
edac_dev);
if (res < 0) {
@@ -800,7 +800,7 @@ static int mv64x60_mc_err_probe(struct platform_device *pdev)
res = devm_request_irq(&pdev->dev,
pdata->irq,
mv64x60_mc_isr,
- IRQF_DISABLED,
+ 0,
"[EDAC] MC err",
mci);
if (res < 0) {
--
1.9.3

2014-10-06 15:38:04

by Fabian Frédérick

[permalink] [raw]
Subject: [PATCH 4/7 linux-next] cpqarray: remove deprecated IRQF_DISABLED

See include/linux/interrupt.h:
"This flag is a NOOP and scheduled to be removed"

Signed-off-by: Fabian Frederick <[email protected]>
---
drivers/block/cpqarray.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/block/cpqarray.c b/drivers/block/cpqarray.c
index 2b94403..370721e 100644
--- a/drivers/block/cpqarray.c
+++ b/drivers/block/cpqarray.c
@@ -406,7 +406,7 @@ static int cpqarray_register_ctlr(int i, struct pci_dev *pdev)
}
hba[i]->access.set_intr_mask(hba[i], 0);
if (request_irq(hba[i]->intr, do_ida_intr,
- IRQF_DISABLED|IRQF_SHARED, hba[i]->devname, hba[i]))
+ IRQF_SHARED, hba[i]->devname, hba[i]))
{
printk(KERN_ERR "cpqarray: Unable to get irq %d for %s\n",
hba[i]->intr, hba[i]->devname);
--
1.9.3

2014-10-06 15:38:45

by Fabian Frédérick

[permalink] [raw]
Subject: [PATCH 3/7 linux-next] tw68: remove deprecated IRQF_DISABLED

See include/linux/interrupt.h:
"This flag is a NOOP and scheduled to be removed"

Signed-off-by: Fabian Frederick <[email protected]>
---
drivers/media/pci/tw68/tw68-core.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/media/pci/tw68/tw68-core.c b/drivers/media/pci/tw68/tw68-core.c
index a6fb48c..63f0b64 100644
--- a/drivers/media/pci/tw68/tw68-core.c
+++ b/drivers/media/pci/tw68/tw68-core.c
@@ -306,7 +306,7 @@ static int tw68_initdev(struct pci_dev *pci_dev,

/* get irq */
err = devm_request_irq(&pci_dev->dev, pci_dev->irq, tw68_irq,
- IRQF_SHARED | IRQF_DISABLED, dev->name, dev);
+ IRQF_SHARED, dev->name, dev);
if (err < 0) {
pr_err("%s: can't get IRQ %d\n",
dev->name, pci_dev->irq);
--
1.9.3

2014-10-06 15:39:01

by Fabian Frédérick

[permalink] [raw]
Subject: [PATCH 2/7 linux-next] ppc4xx_edac: remove deprecated IRQF_DISABLED

See include/linux/interrupt.h:
"This flag is a NOOP and scheduled to be removed"

Signed-off-by: Fabian Frederick <[email protected]>
---
drivers/edac/ppc4xx_edac.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/edac/ppc4xx_edac.c b/drivers/edac/ppc4xx_edac.c
index 0f04d5e..4159353 100644
--- a/drivers/edac/ppc4xx_edac.c
+++ b/drivers/edac/ppc4xx_edac.c
@@ -1120,7 +1120,7 @@ static int ppc4xx_edac_register_irq(struct platform_device *op,

status = request_irq(ded_irq,
ppc4xx_edac_isr,
- IRQF_DISABLED,
+ 0,
"[EDAC] MC ECCDED",
mci);

@@ -1134,7 +1134,7 @@ static int ppc4xx_edac_register_irq(struct platform_device *op,

status = request_irq(sec_irq,
ppc4xx_edac_isr,
- IRQF_DISABLED,
+ 0,
"[EDAC] MC ECCSEC",
mci);

--
1.9.3

2014-10-06 17:40:57

by Borislav Petkov

[permalink] [raw]
Subject: Re: [PATCH 0/7 linux-next] drivers: remove deprecated IRQF_DISABLED

On Mon, Oct 06, 2014 at 05:35:47PM +0200, Fabian Frederick wrote:
> This small patchset removes IRQF_DISABLED from drivers branch.
>
> See include/linux/interrupt.h:
> "This flag is a NOOP and scheduled to be removed"
>
> Note: (cross)compiled but untested.
>
> Fabian Frederick (7):
> mv64x60_edac: remove deprecated IRQF_DISABLED
> ppc4xx_edac: remove deprecated IRQF_DISABLED

For the EDAC bits already applied Michael's patch:

https://lkml.kernel.org/r/1412159043-7348-1-git-send-email-michael.opdenacker@free-electrons.com

--
Regards/Gruss,
Boris.

Sent from a fat crate under my desk. Formatting is fine.
--

2014-10-06 18:33:05

by Fabian Frédérick

[permalink] [raw]
Subject: Re: [PATCH 0/7 linux-next] drivers: remove deprecated IRQF_DISABLED



> On 06 October 2014 at 19:40 Borislav Petkov <[email protected]> wrote:
>
>
> On Mon, Oct 06, 2014 at 05:35:47PM +0200, Fabian Frederick wrote:
> > This small patchset removes IRQF_DISABLED from drivers branch.
> >
> > See include/linux/interrupt.h:
> > "This flag is a NOOP and scheduled to be removed"
> >
> > Note: (cross)compiled but untested.
> >
> > Fabian Frederick (7):
> >   mv64x60_edac: remove deprecated IRQF_DISABLED
> >   ppc4xx_edac: remove deprecated IRQF_DISABLED
>
> For the EDAC bits already applied Michael's patch:
>
> https://lkml.kernel.org/r/1412159043-7348-1-git-send-email-michael.opdenacker@free-electrons.com
>
> --
> Regards/Gruss,
>     Boris.

Hi Borislav,

   You're right, I guess we can forget this patchset.
I didn't see it was already done. (nothing in linux-next yet).
Sorry for the noise. 
 
Regards,
Fabian

>
> Sent from a fat crate under my desk. Formatting is fine.
> --

2014-10-06 18:46:29

by Borislav Petkov

[permalink] [raw]
Subject: Re: [PATCH 0/7 linux-next] drivers: remove deprecated IRQF_DISABLED

On Mon, Oct 06, 2014 at 08:33:00PM +0200, Fabian Frederick wrote:
>    You're right, I guess we can forget this patchset.
> I didn't see it was already done. (nothing in linux-next yet).

Not the whole patchset - I was replying only to your two patches
touching code in drivers/edac/. I don't know about the rest but yeah,
checking linux-next is always a good idea.

Also, did you CC the proper maintainers for the rest of your patches? If
not, do that and see what they have to say.

HTH.

--
Regards/Gruss,
Boris.

Sent from a fat crate under my desk. Formatting is fine.
--

Subject: RE: [PATCH 4/7 linux-next] cpqarray: remove deprecated IRQF_DISABLED


> -----Original Message-----
> From: Fabian Frederick [mailto:[email protected]]
> Sent: Monday, October 06, 2014 10:36 AM
> To: [email protected]
> Cc: Greg Kroah-Hartman; Fabian Frederick; ISS StorageDev
> Subject: [PATCH 4/7 linux-next] cpqarray: remove deprecated
> IRQF_DISABLED
>
> See include/linux/interrupt.h:
> "This flag is a NOOP and scheduled to be removed"
>
> Signed-off-by: Fabian Frederick <[email protected]>
> ---
> drivers/block/cpqarray.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/block/cpqarray.c b/drivers/block/cpqarray.c
> index 2b94403..370721e 100644
> --- a/drivers/block/cpqarray.c
> +++ b/drivers/block/cpqarray.c
> @@ -406,7 +406,7 @@ static int cpqarray_register_ctlr(int i, struct
> pci_dev *pdev)
> }
> hba[i]->access.set_intr_mask(hba[i], 0);
> if (request_irq(hba[i]->intr, do_ida_intr,
> - IRQF_DISABLED|IRQF_SHARED, hba[i]->devname, hba[i]))
> + IRQF_SHARED, hba[i]->devname, hba[i]))
> {
> printk(KERN_ERR "cpqarray: Unable to get irq %d for %s\n",
> hba[i]->intr, hba[i]->devname);
> --
> 1.9.3

Although we're awaiting resolution of MAINTAINERS updates for that
driver, this change was already made to cciss and hpsa several years
ago and seems fine here too.

Acked-by: Robert Elliott <[email protected]>

2014-10-06 19:23:58

by Fabian Frédérick

[permalink] [raw]
Subject: Re: [PATCH 0/7 linux-next] drivers: remove deprecated IRQF_DISABLED



> On 06 October 2014 at 20:46 Borislav Petkov <[email protected]> wrote:
>
>
> On Mon, Oct 06, 2014 at 08:33:00PM +0200, Fabian Frederick wrote:
> >    You're right, I guess we can forget this patchset.
> > I didn't see it was already done. (nothing in linux-next yet).
>
> Not the whole patchset - I was replying only to your two patches
> touching code in drivers/edac/. I don't know about the rest but yeah,
> checking linux-next is always a good idea.
>
> Also, did you CC the proper maintainers for the rest of your patches? If
> not, do that and see what they have to say.
>
> HTH.
>

CC list was ok. I'll keep an eye on linux-next and see with Michael
if he has other patches approved in the list.

Regards,
Fabian
 

> --
> Regards/Gruss,
>     Boris.
>
> Sent from a fat crate under my desk. Formatting is fine.
> --

2014-10-07 01:00:04

by Sebastian Reichel

[permalink] [raw]
Subject: Re: [PATCH 5/7 linux-next] HSI: remove deprecated IRQF_DISABLED

On Mon, Oct 06, 2014 at 05:35:52PM +0200, Fabian Frederick wrote:
> See include/linux/interrupt.h:
> "This flag is a NOOP and scheduled to be removed"
>
> Signed-off-by: Fabian Frederick <[email protected]>

https://git.kernel.org/cgit/linux/kernel/git/sre/linux-hsi.git/commit/?h=for-next

-- Sebastian


Attachments:
(No filename) (302.00 B)
signature.asc (819.00 B)
Digital signature
Download all attachments