From 0316d12517b741a153bec5d2989ba5e50cbe6209 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 9 Dec 2019 12:44:11 +0100 Subject: [PATCH] ANDROID: fix up merge error in drivers/irqchip/qcom-pdc.c I messed up the merge in drivers/irqchip/qcom-pdc.c and left two copies of qcom_pdc_gic_get_irqchip_state() and qcom_pdc_gic_set_irqchip_state() in the file :( Signed-off-by: Greg Kroah-Hartman Change-Id: I50528b34ec05f03c04b16f4f649bb58971914590 --- drivers/irqchip/qcom-pdc.c | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/drivers/irqchip/qcom-pdc.c b/drivers/irqchip/qcom-pdc.c index 40a789802150..5dbcf2e15fda 100644 --- a/drivers/irqchip/qcom-pdc.c +++ b/drivers/irqchip/qcom-pdc.c @@ -108,24 +108,6 @@ static void qcom_pdc_gic_disable(struct irq_data *d) irq_chip_disable_parent(d); } -static int qcom_pdc_gic_get_irqchip_state(struct irq_data *d, - enum irqchip_irq_state which, bool *state) -{ - if (d->hwirq == GPIO_NO_WAKE_IRQ) - return 0; - - return irq_chip_get_parent_state(d, which, state); -} - -static int qcom_pdc_gic_set_irqchip_state(struct irq_data *d, - enum irqchip_irq_state which, bool value) -{ - if (d->hwirq == GPIO_NO_WAKE_IRQ) - return 0; - - return irq_chip_set_parent_state(d, which, value); -} - static void qcom_pdc_gic_enable(struct irq_data *d) { if (d->hwirq == GPIO_NO_WAKE_IRQ)