| Message ID | 1437656713-9677-5-git-send-email-marc.zyngier@arm.com (mailing list archive) |
|---|---|
| State | Not Applicable, archived |
| Headers | show |
On 07/23/2015 09:05 PM, Marc Zyngier wrote: > Instead of directly passing NULL to the various irq_domain functions, > start by looking up the domain with a domain_token. > > As domain_token is permanently set to NULL, the lookup function will > return the same value (no domain found) and the default will be used, > preserving the current behaviour. > > Signed-off-by: Marc Zyngier <marc.zyngier@arm.com> > --- > drivers/acpi/gsi.c | 22 +++++++++------------- > 1 file changed, 9 insertions(+), 13 deletions(-) > > diff --git a/drivers/acpi/gsi.c b/drivers/acpi/gsi.c > index 38208f2..a745880 100644 > --- a/drivers/acpi/gsi.c > +++ b/drivers/acpi/gsi.c > @@ -14,6 +14,8 @@ > > enum acpi_irq_model_id acpi_irq_model; > > +static void *acpi_gsi_domain_token; > + > static unsigned int acpi_gsi_get_irq_type(int trigger, int polarity) > { > switch (polarity) { > @@ -45,12 +47,9 @@ static unsigned int acpi_gsi_get_irq_type(int trigger, int polarity) > */ > int acpi_gsi_to_irq(u32 gsi, unsigned int *irq) > { > - /* > - * Only default domain is supported at present, always find > - * the mapping corresponding to default domain by passing NULL > - * as irq_domain parameter > - */ > - *irq = irq_find_mapping(NULL, gsi); > + struct irq_domain *d = irq_find_matching_host(acpi_gsi_domain_token); Typo, should be irq_find_host() or irq_find_matching_host(acpi_gsi_domain_token, DOMAIN_BUS_ANY), it removed in later patch, so no compile error happened when whole patch set applied. Other than that, Reviewed-by: Hanjun Guo <hanjun.guo@linaro.org> Thanks Hanjun -- To unsubscribe from this list: send the line "unsubscribe linux-acpi" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/acpi/gsi.c b/drivers/acpi/gsi.c index 38208f2..a745880 100644 --- a/drivers/acpi/gsi.c +++ b/drivers/acpi/gsi.c @@ -14,6 +14,8 @@ enum acpi_irq_model_id acpi_irq_model; +static void *acpi_gsi_domain_token; + static unsigned int acpi_gsi_get_irq_type(int trigger, int polarity) { switch (polarity) { @@ -45,12 +47,9 @@ static unsigned int acpi_gsi_get_irq_type(int trigger, int polarity) */ int acpi_gsi_to_irq(u32 gsi, unsigned int *irq) { - /* - * Only default domain is supported at present, always find - * the mapping corresponding to default domain by passing NULL - * as irq_domain parameter - */ - *irq = irq_find_mapping(NULL, gsi); + struct irq_domain *d = irq_find_matching_host(acpi_gsi_domain_token); + + *irq = irq_find_mapping(d, gsi); /* * *irq == 0 means no mapping, that should * be reported as a failure @@ -74,13 +73,9 @@ int acpi_register_gsi(struct device *dev, u32 gsi, int trigger, { unsigned int irq; unsigned int irq_type = acpi_gsi_get_irq_type(trigger, polarity); + struct irq_domain *d = irq_find_host(acpi_gsi_domain_token); - /* - * There is no way at present to look-up the IRQ domain on ACPI, - * hence always create mapping referring to the default domain - * by passing NULL as irq_domain parameter - */ - irq = irq_create_mapping(NULL, gsi); + irq = irq_create_mapping(d, gsi); if (!irq) return -EINVAL; @@ -98,7 +93,8 @@ EXPORT_SYMBOL_GPL(acpi_register_gsi); */ void acpi_unregister_gsi(u32 gsi) { - int irq = irq_find_mapping(NULL, gsi); + struct irq_domain *d = irq_find_host(acpi_gsi_domain_token); + int irq = irq_find_mapping(d, gsi); irq_dispose_mapping(irq); }
Instead of directly passing NULL to the various irq_domain functions, start by looking up the domain with a domain_token. As domain_token is permanently set to NULL, the lookup function will return the same value (no domain found) and the default will be used, preserving the current behaviour. Signed-off-by: Marc Zyngier <marc.zyngier@arm.com> --- drivers/acpi/gsi.c | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-)