2013-10-13 05:18:03

by Michael Opdenacker

[permalink] [raw]
Subject: [PATCH] EDAC: remove deprecated IRQF_DISABLED

This patch proposes to remove the use of the IRQF_DISABLED flag

It's a NOOP since 2.6.35 and it will be removed one day.

Signed-off-by: Michael Opdenacker <[email protected]>
---
drivers/edac/mpc85xx_edac.c | 7 +++----
drivers/edac/mv64x60_edac.c | 8 ++++----
drivers/edac/ppc4xx_edac.c | 4 ++--
3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/drivers/edac/mpc85xx_edac.c b/drivers/edac/mpc85xx_edac.c
index 3eb32f6..7785807 100644
--- a/drivers/edac/mpc85xx_edac.c
+++ b/drivers/edac/mpc85xx_edac.c
@@ -297,7 +297,7 @@ int mpc85xx_pci_err_probe(struct platform_device *op)
if (edac_op_state == EDAC_OPSTATE_INT) {
pdata->irq = irq_of_parse_and_map(op->dev.of_node, 0);
res = devm_request_irq(&op->dev, pdata->irq,
- mpc85xx_pci_isr, IRQF_DISABLED,
+ mpc85xx_pci_isr, 0,
"[EDAC] PCI err", pci);
if (res < 0) {
printk(KERN_ERR
@@ -579,7 +579,7 @@ static int mpc85xx_l2_err_probe(struct platform_device *op)
if (edac_op_state == EDAC_OPSTATE_INT) {
pdata->irq = irq_of_parse_and_map(op->dev.of_node, 0);
res = devm_request_irq(&op->dev, pdata->irq,
- mpc85xx_l2_isr, IRQF_DISABLED,
+ mpc85xx_l2_isr, 0,
"[EDAC] L2 err", edac_dev);
if (res < 0) {
printk(KERN_ERR
@@ -1078,8 +1078,7 @@ static int mpc85xx_mc_err_probe(struct platform_device *op)
/* register interrupts */
pdata->irq = irq_of_parse_and_map(op->dev.of_node, 0);
res = devm_request_irq(&op->dev, pdata->irq,
- mpc85xx_mc_isr,
- IRQF_DISABLED | IRQF_SHARED,
+ mpc85xx_mc_isr, IRQF_SHARED,
"[EDAC] MC err", mci);
if (res < 0) {
printk(KERN_ERR "%s: Unable to request irq %d for "
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) {
diff --git a/drivers/edac/ppc4xx_edac.c b/drivers/edac/ppc4xx_edac.c
index ef6b7e0..7023944 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.8.1.2


2013-10-14 09:56:13

by Johannes Thumshirn

[permalink] [raw]
Subject: Re: [PATCH] EDAC: remove deprecated IRQF_DISABLED

On Sun, Oct 13, 2013 at 07:17:57AM +0200, Michael Opdenacker wrote:
> This patch proposes to remove the use of the IRQF_DISABLED flag
>
> It's a NOOP since 2.6.35 and it will be removed one day.
>
> Signed-off-by: Michael Opdenacker <[email protected]>
> ---
> drivers/edac/mpc85xx_edac.c | 7 +++----
> drivers/edac/mv64x60_edac.c | 8 ++++----
> drivers/edac/ppc4xx_edac.c | 4 ++--
> 3 files changed, 9 insertions(+), 10 deletions(-)
>
> diff --git a/drivers/edac/mpc85xx_edac.c b/drivers/edac/mpc85xx_edac.c
> index 3eb32f6..7785807 100644
> --- a/drivers/edac/mpc85xx_edac.c
> +++ b/drivers/edac/mpc85xx_edac.c
> @@ -297,7 +297,7 @@ int mpc85xx_pci_err_probe(struct platform_device *op)
> if (edac_op_state == EDAC_OPSTATE_INT) {
> pdata->irq = irq_of_parse_and_map(op->dev.of_node, 0);
> res = devm_request_irq(&op->dev, pdata->irq,
> - mpc85xx_pci_isr, IRQF_DISABLED,
> + mpc85xx_pci_isr, 0,
> "[EDAC] PCI err", pci);
> if (res < 0) {
> printk(KERN_ERR
> @@ -579,7 +579,7 @@ static int mpc85xx_l2_err_probe(struct platform_device *op)
> if (edac_op_state == EDAC_OPSTATE_INT) {
> pdata->irq = irq_of_parse_and_map(op->dev.of_node, 0);
> res = devm_request_irq(&op->dev, pdata->irq,
> - mpc85xx_l2_isr, IRQF_DISABLED,
> + mpc85xx_l2_isr, 0,
> "[EDAC] L2 err", edac_dev);
> if (res < 0) {
> printk(KERN_ERR
> @@ -1078,8 +1078,7 @@ static int mpc85xx_mc_err_probe(struct platform_device *op)
> /* register interrupts */
> pdata->irq = irq_of_parse_and_map(op->dev.of_node, 0);
> res = devm_request_irq(&op->dev, pdata->irq,
> - mpc85xx_mc_isr,
> - IRQF_DISABLED | IRQF_SHARED,
> + mpc85xx_mc_isr, IRQF_SHARED,
> "[EDAC] MC err", mci);
> if (res < 0) {
> printk(KERN_ERR "%s: Unable to request irq %d for "

Hi Michael,

mpc85xx_edac has them already removed in the version that is going into 3.13.

Sorry for the inconvenience. I'll set up a public tree at my github repo, so
everyone can see the current mpc85xx_edac state.

Byte,
Johannes

2013-10-14 11:14:36

by Michael Opdenacker

[permalink] [raw]
Subject: Re: [PATCH] EDAC: remove deprecated IRQF_DISABLED

Hi Johannes,

On 10/14/2013 11:56 AM, Johannes Thumshirn wrote:
> Hi Michael,
>
> mpc85xx_edac has them already removed in the version that is going into 3.13.
>
> Sorry for the inconvenience. I'll set up a public tree at my github repo, so
> everyone can see the current mpc85xx_edac state.
Thank you for the good news. Don't be sorry, what matters is that this
gets fixed in mainline, and this didn't take me more than 2 or 3 minutes
to prepare and submit ;)

Cheers,

Michael.

--
Michael Opdenacker, CEO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
+33 484 258 098

2014-10-01 10:18:09

by Michael Opdenacker

[permalink] [raw]
Subject: Re: [PATCH] EDAC: remove deprecated IRQF_DISABLED

On 03/05/2014 07:49 AM, Borislav Petkov wrote:
> On Wed, Mar 05, 2014 at 06:04:37AM +0100, Michael Opdenacker wrote:
>> My patch still applies to 3.14-rc5, which means that mpc85xx_edac is
>> still there.
>>
>> I'd like to get rid of this patch for good ;)
> Something like that, right:
>
> https://git.kernel.org/cgit/linux/kernel/git/bp/bp.git/commit/?id=e245e3b25f9ef33b166f0f01d19d6418f52ae726
>
> ?
>
> Its on its way upstream.

It didn't get merged indeed. I'll send an update to my patch if this helps.

Cheers,

Michael.

--
Michael Opdenacker, CEO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
+33 484 258 098

2014-10-01 10:24:37

by Michael Opdenacker

[permalink] [raw]
Subject: [PATCH] EDAC: remove deprecated IRQF_DISABLED

This patch proposes to remove the use of the IRQF_DISABLED flag

It's a NOOP since 2.6.35 and it will be removed one day.

Signed-off-by: Michael Opdenacker <[email protected]>
---
drivers/edac/mv64x60_edac.c | 8 ++++----
drivers/edac/ppc4xx_edac.c | 4 ++--
2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/drivers/edac/mv64x60_edac.c b/drivers/edac/mv64x60_edac.c
index 542fad70e360..6366e880f978 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) {
diff --git a/drivers/edac/ppc4xx_edac.c b/drivers/edac/ppc4xx_edac.c
index ef6b7e08f485..702394419f6a 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.1

2014-10-01 10:27:10

by Borislav Petkov

[permalink] [raw]
Subject: Re: [PATCH] EDAC: remove deprecated IRQF_DISABLED

On Wed, Oct 01, 2014 at 12:18:04PM +0200, Michael Opdenacker wrote:
> > https://git.kernel.org/cgit/linux/kernel/git/bp/bp.git/commit/?id=e245e3b25f9ef33b166f0f01d19d6418f52ae726
> >
> > ?
> >
> > Its on its way upstream.
>
> It didn't get merged indeed.

Did you actually check?

$ git describe e245e3b25f9ef33b166f0f01d19d6418f52ae726
v3.14-rc1-4-ge245e3b25f9e

--
Regards/Gruss,
Boris.

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

2014-10-01 18:42:41

by Borislav Petkov

[permalink] [raw]
Subject: Re: [PATCH] EDAC: remove deprecated IRQF_DISABLED

On Wed, Oct 01, 2014 at 12:24:03PM +0200, Michael Opdenacker wrote:
> This patch proposes to remove the use of the IRQF_DISABLED flag
>
> It's a NOOP since 2.6.35 and it will be removed one day.
>
> Signed-off-by: Michael Opdenacker <[email protected]>

Queued for 3.19,

Thanks.

--
Regards/Gruss,
Boris.

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

2014-10-01 20:18:04

by Michael Opdenacker

[permalink] [raw]
Subject: Re: [PATCH] EDAC: remove deprecated IRQF_DISABLED

Hi Borislav,

On 10/01/2014 12:27 PM, Borislav Petkov wrote:
> On Wed, Oct 01, 2014 at 12:18:04PM +0200, Michael Opdenacker wrote:
>>> https://git.kernel.org/cgit/linux/kernel/git/bp/bp.git/commit/?id=e245e3b25f9ef33b166f0f01d19d6418f52ae726
>>>
>>> ?
>>>
>>> Its on its way upstream.
>> It didn't get merged indeed.
> Did you actually check?
>
> $ git describe e245e3b25f9ef33b166f0f01d19d6418f52ae726
> v3.14-rc1-4-ge245e3b25f9e

Oops, you're right. What's left of my patch touches other files.

Thank you for your time.

Michael.

--
Michael Opdenacker, CEO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
+33 484 258 098