github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-07 22:14:04 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

ANDROID: fix up merge error in drivers/irqchip/qcom-pdc.c

Browse Source 
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 <gregkh@google.com>
Change-Id: I50528b34ec05f03c04b16f4f649bb58971914590
This commit is contained in:
Greg Kroah-Hartman 2019-12-09 12:44:11 +01:00
parent 843f278d78
commit 0316d12517
1 changed files with 0 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/irqchip/qcom-pdc.c
View File

@ -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)