From patchwork Mon Sep 16 08:31:59 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thierry Reding X-Patchwork-Id: 275166 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id A8DBD2C00E4 for ; Mon, 16 Sep 2013 18:36:27 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757461Ab3IPIgG (ORCPT ); Mon, 16 Sep 2013 04:36:06 -0400 Received: from mail-bk0-f45.google.com ([209.85.214.45]:59038 "EHLO mail-bk0-f45.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755977Ab3IPIdU (ORCPT ); Mon, 16 Sep 2013 04:33:20 -0400 Received: by mail-bk0-f45.google.com with SMTP id mx11so1331414bkb.4 for ; Mon, 16 Sep 2013 01:33:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=ib/4v+CjPp1P4ER/45ABUDMRnxysMzLeF2WSfIGtBIE=; b=0KeL2qhdBvzvLEdjFIAkylQryUbbzgh42W6gcwoIxSKnlhU3Z4RYu4o2nuwapAyW3U FCyS2td0Oj6Nu5RUvgp7OwDtogwoVYo/jvOKLkgUhyLEEcW9grsOpcZlv3NvngHJpJIS LPMJri3IR0C0RlMIMv/TxCZHUqN0rXmO+5xjpVFP/FTGmO3/T39fDdYfSzhEXF7kTVm3 KjCDtlSe3Pf6Hr6utjgh8xu9ovL5h0/yCXqSQ4/dyoC0mEHKaI3UMKB2T5TJ0hfZbyO3 nWWHD534lT8hGSDPW1o647gKNcQISN2oeB/67Z5oFhhNK7qeLpGG3C/sBy48A7KIQMxO enJQ== X-Received: by 10.204.66.133 with SMTP id n5mr501968bki.38.1379320398491; Mon, 16 Sep 2013 01:33:18 -0700 (PDT) Received: from localhost (port-49886.pppoe.wtnet.de. [46.59.195.122]) by mx.google.com with ESMTPSA id b6sm6847775bko.16.1969.12.31.16.00.00 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Mon, 16 Sep 2013 01:33:17 -0700 (PDT) From: Thierry Reding To: Greg Kroah-Hartman , Linus Walleij , Stephen Warren , Wolfram Sang , Grant Likely , Rob Herring , Benjamin Herrenschmidt , Thomas Gleixner Cc: linux-kernel@vger.kernel.org, linux-gpio@vger.kernel.org, linux-tegra@vger.kernel.org, linux-i2c@vger.kernel.org, devicetree@vger.kernel.org Subject: [PATCH 2/9] irqdomain: Introduce __irq_create_mapping() Date: Mon, 16 Sep 2013 10:31:59 +0200 Message-Id: <1379320326-13241-3-git-send-email-treding@nvidia.com> X-Mailer: git-send-email 1.8.4 In-Reply-To: <1379320326-13241-1-git-send-email-treding@nvidia.com> References: <1379320326-13241-1-git-send-email-treding@nvidia.com> Sender: linux-i2c-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-i2c@vger.kernel.org This is a version of irq_create_mapping() that propagates the precise error code instead of returning 0 for all errors. It will be used in subsequent patches to allow further propagation of error codes. To avoid code duplication, implement irq_create_mapping() as a wrapper around the new __irq_create_mapping(). Signed-off-by: Thierry Reding --- kernel/irq/irqdomain.c | 59 +++++++++++++++++++++++++++++++++----------------- 1 file changed, 39 insertions(+), 20 deletions(-) diff --git a/kernel/irq/irqdomain.c b/kernel/irq/irqdomain.c index 706724e..d2a3b01 100644 --- a/kernel/irq/irqdomain.c +++ b/kernel/irq/irqdomain.c @@ -374,30 +374,21 @@ unsigned int irq_create_direct_mapping(struct irq_domain *domain) } EXPORT_SYMBOL_GPL(irq_create_direct_mapping); -/** - * irq_create_mapping() - Map a hardware interrupt into linux irq space - * @domain: domain owning this hardware interrupt or NULL for default domain - * @hwirq: hardware irq number in that domain space - * - * Only one mapping per hardware interrupt is permitted. Returns a linux - * irq number. - * If the sense/trigger is to be specified, set_irq_type() should be called - * on the number returned from that call. - */ -unsigned int irq_create_mapping(struct irq_domain *domain, - irq_hw_number_t hwirq) +static int __irq_create_mapping(struct irq_domain *domain, + irq_hw_number_t hwirq, unsigned int *virqp) { - unsigned int hint; - int virq; + unsigned int hint, virq; + int ret; - pr_debug("irq_create_mapping(0x%p, 0x%lx)\n", domain, hwirq); + pr_debug("__irq_create_mapping(0x%p, 0x%lx, %p)\n", domain, hwirq, + virqp); /* Look for default domain if nececssary */ if (domain == NULL) domain = irq_default_domain; if (domain == NULL) { WARN(1, "%s(, %lx) called with NULL domain\n", __func__, hwirq); - return 0; + return -ENODEV; } pr_debug("-> using domain @%p\n", domain); @@ -405,7 +396,11 @@ unsigned int irq_create_mapping(struct irq_domain *domain, virq = irq_find_mapping(domain, hwirq); if (virq) { pr_debug("-> existing mapping on virq %d\n", virq); - return virq; + + if (virqp) + *virqp = virq; + + return 0; } /* Allocate a virtual interrupt number */ @@ -417,17 +412,41 @@ unsigned int irq_create_mapping(struct irq_domain *domain, virq = irq_alloc_desc_from(1, of_node_to_nid(domain->of_node)); if (virq <= 0) { pr_debug("-> virq allocation failed\n"); - return 0; + return virq ? : -ENOSPC; } - if (irq_domain_associate(domain, virq, hwirq)) { + ret = irq_domain_associate(domain, virq, hwirq); + if (ret) { irq_free_desc(virq); - return 0; + return ret; } pr_debug("irq %lu on domain %s mapped to virtual irq %u\n", hwirq, of_node_full_name(domain->of_node), virq); + if (virqp) + *virqp = virq; + + return 0; +} +/** + * irq_create_mapping() - Map a hardware interrupt into linux irq space + * @domain: domain owning this hardware interrupt or NULL for default domain + * @hwirq: hardware irq number in that domain space + * + * Only one mapping per hardware interrupt is permitted. Returns a linux + * irq number. + * If the sense/trigger is to be specified, set_irq_type() should be called + * on the number returned from that call. + */ +unsigned int irq_create_mapping(struct irq_domain *domain, + irq_hw_number_t hwirq) +{ + unsigned int virq; + + if (__irq_create_mapping(domain, hwirq, &virq)) + return 0; + return virq; } EXPORT_SYMBOL_GPL(irq_create_mapping);