tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Blackfin: convert mac irq_chip to new functions
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
authored by
Thomas Gleixner
and committed by
Mike Frysinger
172d2d1d
dabf64bc
+11
-7
+11
-7
arch/blackfin/mach-common/ints-priority.c
+11
-7
arch/blackfin/mach-common/ints-priority.c
···
462
462
}
463
463
}
464
464
465
-
static void bfin_mac_status_mask_irq(unsigned int irq)
465
+
static void bfin_mac_status_mask_irq(struct irq_data *d)
466
466
{
467
+
unsigned int irq = d->irq;
468
+
467
469
mac_stat_int_mask &= ~(1L << (irq - IRQ_MAC_PHYINT));
468
470
#ifdef BF537_GENERIC_ERROR_INT_DEMUX
469
471
switch (irq) {
···
482
480
bfin_mac_status_ack_irq(irq);
483
481
}
484
482
485
-
static void bfin_mac_status_unmask_irq(unsigned int irq)
483
+
static void bfin_mac_status_unmask_irq(struct irq_data *d)
486
484
{
485
+
unsigned int irq = d->irq;
486
+
487
487
#ifdef BF537_GENERIC_ERROR_INT_DEMUX
488
488
switch (irq) {
489
489
case IRQ_MAC_PHYINT:
···
502
498
}
503
499
504
500
#ifdef CONFIG_PM
505
-
int bfin_mac_status_set_wake(unsigned int irq, unsigned int state)
501
+
int bfin_mac_status_set_wake(struct irq_data *d, unsigned int state)
506
502
{
507
503
#ifdef BF537_GENERIC_ERROR_INT_DEMUX
508
504
return bfin_internal_set_wake(IRQ_GENERIC_ERROR, state);
···
515
511
static struct irq_chip bfin_mac_status_irqchip = {
516
512
.name = "MACST",
517
513
.irq_ack = bfin_ack_noop,
518
-
.mask_ack = bfin_mac_status_mask_irq,
519
-
.mask = bfin_mac_status_mask_irq,
520
-
.unmask = bfin_mac_status_unmask_irq,
514
+
.irq_mask_ack = bfin_mac_status_mask_irq,
515
+
.irq_mask = bfin_mac_status_mask_irq,
516
+
.irq_unmask = bfin_mac_status_unmask_irq,
521
517
#ifdef CONFIG_PM
522
-
.set_wake = bfin_mac_status_set_wake,
518
+
.irq_set_wake = bfin_mac_status_set_wake,
523
519
#endif
524
520
};
525
521