| Message ID | 1386718523-2587-7-git-send-email-sboyd@codeaurora.org (mailing list archive) |
|---|---|
| State | Superseded, archived |
| Headers | show |
> Since this code has been marked broken for some time a few genirq > tree wide changes weren't made. set_irq_wake() was renamed to > irq_set_irq_wake() in commit a0cd9ca2b (genirq: Namespace > cleanup, 2011-02-10) and commit 10a8c383 (irq: introduce entry > and exit functions for chained handlers) introduced the chained > irq functions but this driver wasn't updated to use them. Fix > these problems and remove the BROKEN marking on this driver. > > Signed-off-by: Stephen Boyd <sboyd@codeaurora.org> > --- > drivers/mfd/Kconfig | 1 - > drivers/mfd/pm8921-core.c | 7 +++++-- > 2 files changed, 5 insertions(+), 3 deletions(-) This driver was marked as BROKEN due to compilation failures only, so as long as it now compiles cleanly (which I'm sure you've tested) I'm happy with this patch. It doesn't apply, without your 5th patch, so for now I'll just Ack it. Please remember to apply my Ack when you resubmit, as it will act as a reminder and I won't have to re-review. Acked-by: Lee Jones <lee.jones@linaro.org>
diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig index 9ee4ce6..35007ed 100644 --- a/drivers/mfd/Kconfig +++ b/drivers/mfd/Kconfig @@ -453,7 +453,6 @@ config MFD_PM8XXX config MFD_PM8921_CORE tristate "Qualcomm PM8921 PMIC chip" depends on (ARCH_MSM || HEXAGON) - depends on BROKEN select MFD_CORE select MFD_PM8XXX help diff --git a/drivers/mfd/pm8921-core.c b/drivers/mfd/pm8921-core.c index 143f59d..083fab2 100644 --- a/drivers/mfd/pm8921-core.c +++ b/drivers/mfd/pm8921-core.c @@ -15,6 +15,7 @@ #include <linux/kernel.h> #include <linux/interrupt.h> +#include <linux/irqchip/chained_irq.h> #include <linux/irq.h> #include <linux/module.h> #include <linux/platform_device.h> @@ -174,6 +175,8 @@ static void pm8xxx_irq_handler(unsigned int irq, struct irq_desc *desc) u8 root; int i, ret, masters = 0; + chained_irq_enter(irq_chip, desc); + ret = pm8xxx_read_root_irq(chip, &root); if (ret) { pr_err("Can't read root status ret=%d\n", ret); @@ -188,7 +191,7 @@ static void pm8xxx_irq_handler(unsigned int irq, struct irq_desc *desc) if (masters & (1 << i)) pm8xxx_irq_master_handler(chip, i); - irq_chip->irq_ack(&desc->irq_data); + chained_irq_exit(irq_chip, desc); } static void pm8xxx_irq_mask_ack(struct irq_data *d) @@ -368,7 +371,7 @@ struct pm_irq_chip * pm8xxx_irq_init(struct device *dev, irq_set_irq_type(devirq, pdata->irq_trigger_flag); irq_set_handler_data(devirq, chip); irq_set_chained_handler(devirq, pm8xxx_irq_handler); - set_irq_wake(devirq, 1); + irq_set_irq_wake(devirq, 1); return chip; }
Since this code has been marked broken for some time a few genirq tree wide changes weren't made. set_irq_wake() was renamed to irq_set_irq_wake() in commit a0cd9ca2b (genirq: Namespace cleanup, 2011-02-10) and commit 10a8c383 (irq: introduce entry and exit functions for chained handlers) introduced the chained irq functions but this driver wasn't updated to use them. Fix these problems and remove the BROKEN marking on this driver. Signed-off-by: Stephen Boyd <sboyd@codeaurora.org> --- drivers/mfd/Kconfig | 1 - drivers/mfd/pm8921-core.c | 7 +++++-- 2 files changed, 5 insertions(+), 3 deletions(-)