@@ -499,8 +499,6 @@ static void pxa_mask_muxed_gpio(struct irq_data *d)
499
499
gfer = readl_relaxed (base + GFER_OFFSET ) & ~GPIO_bit (gpio );
500
500
writel_relaxed (grer , base + GRER_OFFSET );
501
501
writel_relaxed (gfer , base + GFER_OFFSET );
502
-
503
- gpiochip_disable_irq (& pchip -> chip , gpio );
504
502
}
505
503
506
504
static int pxa_gpio_set_wake (struct irq_data * d , unsigned int on )
@@ -520,21 +518,17 @@ static void pxa_unmask_muxed_gpio(struct irq_data *d)
520
518
unsigned int gpio = irqd_to_hwirq (d );
521
519
struct pxa_gpio_bank * c = gpio_to_pxabank (& pchip -> chip , gpio );
522
520
523
- gpiochip_enable_irq (& pchip -> chip , gpio );
524
-
525
521
c -> irq_mask |= GPIO_bit (gpio );
526
522
update_edge_detect (c );
527
523
}
528
524
529
- static const struct irq_chip pxa_muxed_gpio_chip = {
525
+ static struct irq_chip pxa_muxed_gpio_chip = {
530
526
.name = "GPIO" ,
531
527
.irq_ack = pxa_ack_muxed_gpio ,
532
528
.irq_mask = pxa_mask_muxed_gpio ,
533
529
.irq_unmask = pxa_unmask_muxed_gpio ,
534
530
.irq_set_type = pxa_gpio_irq_type ,
535
531
.irq_set_wake = pxa_gpio_set_wake ,
536
- .flags = IRQCHIP_IMMUTABLE ,
537
- GPIOCHIP_IRQ_RESOURCE_HELPERS ,
538
532
};
539
533
540
534
static int pxa_gpio_nums (struct platform_device * pdev )
0 commit comments