From patchwork Mon Nov 17 11:03:15 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiang Liu X-Patchwork-Id: 40904 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-lb0-f198.google.com (mail-lb0-f198.google.com [209.85.217.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 6761624035 for ; Mon, 17 Nov 2014 11:02:47 +0000 (UTC) Received: by mail-lb0-f198.google.com with SMTP id 10sf11246297lbg.5 for ; Mon, 17 Nov 2014 03:02:46 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe; bh=KtrTBHrb9pc930BCT2p9EXmsPrtJbAl6HOKZtUOF6H8=; b=COQA8KIvoAo0jNgvmKynTd5rLfBJTFcQ/jIiKsifAHB8C1SjfuwMJJZ2Ul6KXBGcg1 HZnrdULGVi4J3Q1i4xIvvRaCbMFY7ovpZXRU5KZ6cOyxfWb3g0ITV1CQhTflY0BG1Zpj +K0ju5fNPsFUFcRtHziIKXcjWsgUwkAkhQg2k3BnoORf2FUTe+K469joPuhTPx2KrpgW 98ykKxKe7icO01Smz14FYNRMqA7Xsr7PbXDUu7gTFKiOj7h5LOQlFQRYX6+cLu3dXXT5 tTzy33sM7pbqET/i0k4wy6hFnrZzdO1il/IKRAtFZekNSgIcdP0vtvF0W8nfUfk8EF46 xKwQ== X-Gm-Message-State: ALoCoQmc9eQiAFS9S1rL2ksaeD5hqJzuY8NpVYDB3dm+B86wkuJN2xAV0+BTbwqJec5mfgPAlfbC X-Received: by 10.180.85.97 with SMTP id g1mr2197624wiz.0.1416222165957; Mon, 17 Nov 2014 03:02:45 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.36.169 with SMTP id r9ls900267laj.57.gmail; Mon, 17 Nov 2014 03:02:45 -0800 (PST) X-Received: by 10.112.142.197 with SMTP id ry5mr26777224lbb.26.1416222165727; Mon, 17 Nov 2014 03:02:45 -0800 (PST) Received: from mail-la0-f53.google.com (mail-la0-f53.google.com. [209.85.215.53]) by mx.google.com with ESMTPS id o6si30318405lao.129.2014.11.17.03.02.45 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 17 Nov 2014 03:02:45 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.53 as permitted sender) client-ip=209.85.215.53; Received: by mail-la0-f53.google.com with SMTP id pn19so1128425lab.40 for ; Mon, 17 Nov 2014 03:02:45 -0800 (PST) X-Received: by 10.152.116.102 with SMTP id jv6mr12938721lab.40.1416222165599; Mon, 17 Nov 2014 03:02:45 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.184.201 with SMTP id ew9csp1135046lbc; Mon, 17 Nov 2014 03:02:44 -0800 (PST) X-Received: by 10.66.222.100 with SMTP id ql4mr2985340pac.123.1416222163717; Mon, 17 Nov 2014 03:02:43 -0800 (PST) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id xx2si2593599pac.158.2014.11.17.03.02.42 for ; Mon, 17 Nov 2014 03:02:43 -0800 (PST) Received-SPF: none (google.com: linux-kernel-owner@vger.kernel.org does not designate permitted sender hosts) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753138AbaKQLCb (ORCPT + 26 others); Mon, 17 Nov 2014 06:02:31 -0500 Received: from mga02.intel.com ([134.134.136.20]:1455 "EHLO mga02.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752914AbaKQLAP (ORCPT ); Mon, 17 Nov 2014 06:00:15 -0500 Received: from orsmga003.jf.intel.com ([10.7.209.27]) by orsmga101.jf.intel.com with ESMTP; 17 Nov 2014 03:00:15 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.04,691,1406617200"; d="scan'208";a="487988957" Received: from gerry-dev.bj.intel.com ([10.238.158.52]) by orsmga003.jf.intel.com with ESMTP; 17 Nov 2014 02:58:01 -0800 From: Jiang Liu To: Bjorn Helgaas , Thomas Gleixner , Ingo Molnar , Grant Likely , Marc Zyngier , Yijing Wang , Yingjoe Chen , Borislav Petkov , "H. Peter Anvin" , Benjamin Herrenschmidt , Matthias Brugger Cc: Tony Luck , linux-kernel@vger.kernel.org, linux-pci@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Jiang Liu Subject: [Patch V3 2/9] irqdomain: Use consistent prototype for irq_domain_free_irqs_* Date: Mon, 17 Nov 2014 19:03:15 +0800 Message-Id: <1416222202-28002-3-git-send-email-jiang.liu@linux.intel.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1416222202-28002-1-git-send-email-jiang.liu@linux.intel.com> References: <1416222202-28002-1-git-send-email-jiang.liu@linux.intel.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: linux-kernel-owner@vger.kernel.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.53 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , From: Yingjoe Chen When using irq_domain_free_irqs_top() directly in irq_domain_ops, gcc generate the following warnings: ../drivers/irqchip/irq-gic.c:879:2: warning: initialization from incompatible pointer type [enabled by default] ../drivers/irqchip/irq-gic.c:879:2: warning: (near initialization for 'gic_irq_domain_hierarchy_ops.free') [enabled by default] Change to use consistent prototype for all irq_domain_free_irqs* Better to fold this into "irqdomain: Introduce new interfaces to support hierarchy irqdomains". Signed-off-by: Yingjoe Chen Signed-off-by: Jiang Liu --- include/linux/irqdomain.h | 9 +++++---- kernel/irq/irqdomain.c | 8 ++++---- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/include/linux/irqdomain.h b/include/linux/irqdomain.h index 640a1ec54772..fbe542967c20 100644 --- a/include/linux/irqdomain.h +++ b/include/linux/irqdomain.h @@ -270,12 +270,13 @@ extern void irq_domain_set_info(struct irq_domain *domain, unsigned int virq, void *handler_data, const char *handler_name); extern void irq_domain_reset_irq_data(struct irq_data *irq_data); extern void irq_domain_free_irqs_common(struct irq_domain *domain, - int virq, int nr_irqs); + unsigned int virq, + unsigned int nr_irqs); extern void irq_domain_free_irqs_top(struct irq_domain *domain, - int virq, int nr_irqs); + unsigned int virq, unsigned int nr_irqs); static inline int irq_domain_alloc_irqs_parent(struct irq_domain *domain, - int irq_base, unsigned int nr_irqs, void *arg) + unsigned int irq_base, unsigned int nr_irqs, void *arg) { if (domain->parent && domain->parent->ops->alloc) return domain->parent->ops->alloc(domain->parent, irq_base, @@ -284,7 +285,7 @@ static inline int irq_domain_alloc_irqs_parent(struct irq_domain *domain, } static inline void irq_domain_free_irqs_parent(struct irq_domain *domain, - int irq_base, unsigned int nr_irqs) + unsigned int irq_base, unsigned int nr_irqs) { if (domain->parent && domain->parent->ops->free) domain->parent->ops->free(domain->parent, irq_base, nr_irqs); diff --git a/kernel/irq/irqdomain.c b/kernel/irq/irqdomain.c index 8b0eddee0b21..705fb573e509 100644 --- a/kernel/irq/irqdomain.c +++ b/kernel/irq/irqdomain.c @@ -899,8 +899,8 @@ void irq_domain_reset_irq_data(struct irq_data *irq_data) irq_data->chip_data = NULL; } -void irq_domain_free_irqs_common(struct irq_domain *domain, int virq, - int nr_irqs) +void irq_domain_free_irqs_common(struct irq_domain *domain, unsigned int virq, + unsigned int nr_irqs) { int i; struct irq_data *irq_data; @@ -913,8 +913,8 @@ void irq_domain_free_irqs_common(struct irq_domain *domain, int virq, irq_domain_free_irqs_parent(domain, virq, nr_irqs); } -void irq_domain_free_irqs_top(struct irq_domain *domain, int virq, - int nr_irqs) +void irq_domain_free_irqs_top(struct irq_domain *domain, unsigned int virq, + unsigned int nr_irqs) { int i;