From mboxrd@z Thu Jan  1 00:00:00 1970
From: hanjun.guo@linaro.org (Hanjun Guo)
Date: Fri, 24 Jul 2015 18:06:52 +0800
Subject: [PATCH v2 7/7] acpi: gsi: Cleanup acpi_register_gsi
In-Reply-To: <1437656713-9677-8-git-send-email-marc.zyngier@arm.com>
References: <1437656713-9677-1-git-send-email-marc.zyngier@arm.com>
 <1437656713-9677-8-git-send-email-marc.zyngier@arm.com>
Message-ID: <55B20E3C.1010809@linaro.org>
To: linux-arm-kernel@lists.infradead.org
List-Id: linux-arm-kernel.lists.infradead.org

On 07/23/2015 09:05 PM, Marc Zyngier wrote:
> As the only user of drivers/acpi/gsi.c is now using acpi_set_irq_model
> to set acpi_gsi_descriptor_populate to something meaningful, we can
> always rely on that information to be present (its absence is an error),
> and guarantee that new interrupt controllers will use this API.
>
> Take this opportunity to cleanup acpi_register_gsi.
>
> Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
> ---
>   drivers/acpi/gsi.c | 24 ++++++++----------------
>   1 file changed, 8 insertions(+), 16 deletions(-)
>
> diff --git a/drivers/acpi/gsi.c b/drivers/acpi/gsi.c
> index e6f4a0c..85aa831 100644
> --- a/drivers/acpi/gsi.c
> +++ b/drivers/acpi/gsi.c
> @@ -75,28 +75,20 @@ int acpi_register_gsi(struct device *dev, u32 gsi, int trigger,
>   		      int polarity)
>   {
>   	int err;
> -	unsigned int irq;
> +	struct acpi_gsi_descriptor data;
>   	unsigned int irq_type = acpi_gsi_get_irq_type(trigger, polarity);
>   	struct irq_domain *d = irq_find_host(acpi_gsi_domain_token);
>
> -	if (acpi_gsi_descriptor_populate) {
> -		struct acpi_gsi_descriptor data;
> -		err = acpi_gsi_descriptor_populate(&data, gsi, irq_type);
> -		if (err)
> -			return err;
> -
> -		return irq_create_acpi_mapping(d, &data);
> +	if (WARN_ON(!acpi_gsi_descriptor_populate)) {
> +		pr_warn("GSI: No registered irqchip, giving up\n");
> +		return -EINVAL;
>   	}
>
> -	irq = irq_create_mapping(d, gsi);
> -	if (!irq)
> -		return -EINVAL;
> +	err = acpi_gsi_descriptor_populate(&data, gsi, irq_type);
> +	if (err)
> +		return err;
>
> -	/* Set irq type if specified and different than the current one */
> -	if (irq_type != IRQ_TYPE_NONE &&
> -		irq_type != irq_get_trigger_type(irq))
> -		irq_set_irq_type(irq, irq_type);
> -	return irq;
> +	return irq_create_acpi_mapping(d, &data);

For ARM64,

Reviewed-by: Hanjun Guo <hanjun.guo@linaro.org>

Thanks
Hanjun