diff options
| author | Stephen Boyd <sboyd@codeaurora.org> | 2015-10-02 11:29:54 -0700 |
|---|---|---|
| committer | Stephen Boyd <sboyd@codeaurora.org> | 2015-10-02 11:29:54 -0700 |
| commit | c0d625cbb541ae68ca3c97fb62f5f6093d3382fa (patch) | |
| tree | c67ca474f4fd998829591b50b6f47e58d5b7c8df /drivers/soc/dove/pmu.c | |
| parent | 3b4261dcf65993f95de80a0d63c5299aab922bd8 (diff) | |
| parent | 9f30a04d768f64280dc0c40b730746e82f298d88 (diff) | |
Merge branch 'clk-fixes' into clk-next
* clk-fixes: (3 commits)
clk: ti: dflt: fix enable_reg validity check
clk: ti: fix dual-registration of uart4_ick
clk: ti: clk-7xx: Remove hardwired ABE clock configuration
Diffstat (limited to 'drivers/soc/dove/pmu.c')
| -rw-r--r-- | drivers/soc/dove/pmu.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/soc/dove/pmu.c b/drivers/soc/dove/pmu.c index 6792aae9e2e5..052aecf29893 100644 --- a/drivers/soc/dove/pmu.c +++ b/drivers/soc/dove/pmu.c @@ -222,9 +222,9 @@ static void __pmu_domain_register(struct pmu_domain *domain, } /* PMU IRQ controller */ -static void pmu_irq_handler(unsigned int irq, struct irq_desc *desc) +static void pmu_irq_handler(struct irq_desc *desc) { - struct pmu_data *pmu = irq_get_handler_data(irq); + struct pmu_data *pmu = irq_desc_get_handler_data(desc); struct irq_chip_generic *gc = pmu->irq_gc; struct irq_domain *domain = pmu->irq_domain; void __iomem *base = gc->reg_base; @@ -232,7 +232,7 @@ static void pmu_irq_handler(unsigned int irq, struct irq_desc *desc) u32 done = ~0; if (stat == 0) { - handle_bad_irq(irq, desc); + handle_bad_irq(desc); return; } |