2014-10-01 20:33:56

by Michael Opdenacker

Subject: [PATCH] staging: nokia_h4: remove deprecated IRQF_DISABLED

Remove the use of the IRQF_DISABLED flag
from drivers/staging/nokia_h4p/nokia_core.c

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

Signed-off-by: Michael Opdenacker <[email protected]>
---
drivers/staging/nokia_h4p/nokia_core.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/staging/nokia_h4p/nokia_core.c b/drivers/staging/nokia_h4p/nokia_core.c
index 775e1d043230..61bc204eedae 100644
--- a/drivers/staging/nokia_h4p/nokia_core.c
+++ b/drivers/staging/nokia_h4p/nokia_core.c
@@ -1133,7 +1133,7 @@ static int hci_h4p_probe(struct platform_device *pdev)
info->uart_fclk = devm_clk_get(&pdev->dev, bt_plat_data->uart_fclk);

err = devm_request_irq(&pdev->dev, info->irq, hci_h4p_interrupt,
- IRQF_DISABLED, "hci_h4p", info);
+ 0, "hci_h4p", info);
if (err < 0) {
dev_err(info->dev, "hci_h4p: unable to get IRQ %d\n",
info->irq);
@@ -1142,8 +1142,7 @@ static int hci_h4p_probe(struct platform_device *pdev)

err = devm_request_irq(&pdev->dev, gpio_to_irq(info->host_wakeup_gpio),
hci_h4p_wakeup_interrupt, IRQF_TRIGGER_FALLING |
- IRQF_TRIGGER_RISING | IRQF_DISABLED,
- "hci_h4p_wkup", info);
+ IRQF_TRIGGER_RISING, "hci_h4p_wkup", info);
if (err < 0) {
dev_err(info->dev, "hci_h4p: unable to get wakeup IRQ %d\n",
gpio_to_irq(info->host_wakeup_gpio));
--
1.9.1

2014-10-01 21:42:31

by Aaro Koskinen

Subject: Re: [PATCH] staging: nokia_h4: remove deprecated IRQF_DISABLED

Hi,

On Wed, Oct 01, 2014 at 10:33:48PM +0200, Michael Opdenacker wrote:
> Remove the use of the IRQF_DISABLED flag
> from drivers/staging/nokia_h4p/nokia_core.c
>
> It's a NOOP since 2.6.35 and it will be removed soon.

This driver has been deleted from the staging tree already.

A.

2014-10-02 19:42:22

by Michael Opdenacker

Subject: Re: [PATCH] staging: nokia_h4: remove deprecated IRQF_DISABLED

Hi Aaro,

Thank you for reviewing my patch!

On 10/01/2014 11:42 PM, Aaro Koskinen wrote:
> Hi,
>
> On Wed, Oct 01, 2014 at 10:33:48PM +0200, Michael Opdenacker wrote:
>> Remove the use of the IRQF_DISABLED flag
>> from drivers/staging/nokia_h4p/nokia_core.c
>>
>> It's a NOOP since 2.6.35 and it will be removed soon.
> This driver has been deleted from the staging tree already.

Ok, good to me too. Thanks again,

Michael.

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