diff options
| author | Michael Opdenacker <michael.opdenacker@free-electrons.com> | 2013-10-12 23:53:47 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-10-16 15:36:09 -0400 |
| commit | 158f0bb005fc7fdb1a7a968eb61100989f5f7322 (patch) | |
| tree | 579945d7206123cac90bb81cfa4e469a897b3a02 /drivers/char/hpet.c | |
| parent | 838b3a6d62413b336f3dde15ecff161070358957 (diff) | |
hpet: 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 <michael.opdenacker@free-electrons.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/char/hpet.c')
| -rw-r--r-- | drivers/char/hpet.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/char/hpet.c b/drivers/char/hpet.c index c8f43295d42a..dca5834685cf 100644 --- a/drivers/char/hpet.c +++ b/drivers/char/hpet.c | |||
| @@ -486,8 +486,7 @@ static int hpet_ioctl_ieon(struct hpet_dev *devp) | |||
| 486 | } | 486 | } |
| 487 | 487 | ||
| 488 | sprintf(devp->hd_name, "hpet%d", (int)(devp - hpetp->hp_dev)); | 488 | sprintf(devp->hd_name, "hpet%d", (int)(devp - hpetp->hp_dev)); |
| 489 | irq_flags = devp->hd_flags & HPET_SHARED_IRQ | 489 | irq_flags = devp->hd_flags & HPET_SHARED_IRQ ? IRQF_SHARED : 0; |
| 490 | ? IRQF_SHARED : IRQF_DISABLED; | ||
| 491 | if (request_irq(irq, hpet_interrupt, irq_flags, | 490 | if (request_irq(irq, hpet_interrupt, irq_flags, |
| 492 | devp->hd_name, (void *)devp)) { | 491 | devp->hd_name, (void *)devp)) { |
| 493 | printk(KERN_ERR "hpet: IRQ %d is not free\n", irq); | 492 | printk(KERN_ERR "hpet: IRQ %d is not free\n", irq); |