Message ID | 1413342435-7876-19-git-send-email-wangyijing@huawei.com |
---|---|
State | Accepted |
Commit | d5a238df0a29f271069a1d3bb2c58ddec3cb4669 |
Headers | show
Return-Path: <patchwork-forward+bncBDP3JFH37QKRBG5Y66QQKGQEHVGF4DQ@linaro.org> X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ee0-f69.google.com (mail-ee0-f69.google.com [74.125.83.69]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id CFEE120973 for <linaro@patches.linaro.org>; Wed, 15 Oct 2014 02:29:48 +0000 (UTC) Received: by mail-ee0-f69.google.com with SMTP id b57sf265617eek.8 for <linaro@patches.linaro.org>; Tue, 14 Oct 2014 19:29:47 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe:content-type; bh=p1Si0O25Qw+bJCH3s8W+I0BQ0YJ/fU5mcAhB1xtydiE=; b=NXAtlbOdthHQDuJ4bA8pNWgeTtPE/2/lTUPA298v+Q4Ss1zSyEBOKT+xBlSbm7qKGR Cv7BXeyvrgPRiL6IAhn2OLQN4p7ga0nerP2Gh5AleF+MGHUejsI0zVHrZipgqvh3lSz+ 4L+veof5G+x0KHVEJ0TOESgmPz/FPLqFJ9fxzfrymZysLyNCTXKLL2bxVn3Ehm1onbfw ggKbPPqIidCz+0YCULBSe4tjsYOC2eQOZzZuByYibtYXDtNHsgGtlC3GjLc6bG3j0Dd+ 62XsFNKNz2CGuutlsmUehxhHN6o6WB9j+I1KrMb2K7Qu7pr79jKA3i7ImZx9jg9zrmBB Tiew== X-Gm-Message-State: ALoCoQnZ4AXqjJLzH+shev7nO9U5PeuYMcoMfuJxK4revmPAXKCv6+uzINcmukBctq0QMAp0TcTp X-Received: by 10.194.241.232 with SMTP id wl8mr310607wjc.5.1413340187921; Tue, 14 Oct 2014 19:29:47 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.23.227 with SMTP id p3ls9597laf.39.gmail; Tue, 14 Oct 2014 19:29:47 -0700 (PDT) X-Received: by 10.112.198.226 with SMTP id jf2mr99334lbc.84.1413340187662; Tue, 14 Oct 2014 19:29:47 -0700 (PDT) Received: from mail-la0-f44.google.com (mail-la0-f44.google.com [209.85.215.44]) by mx.google.com with ESMTPS id s6si28556252las.121.2014.10.14.19.29.47 for <patchwork-forward@linaro.org> (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 14 Oct 2014 19:29:47 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.44 as permitted sender) client-ip=209.85.215.44; Received: by mail-la0-f44.google.com with SMTP id hs14so242520lab.31 for <patchwork-forward@linaro.org>; Tue, 14 Oct 2014 19:29:47 -0700 (PDT) X-Received: by 10.112.54.162 with SMTP id k2mr9007177lbp.63.1413340187548; Tue, 14 Oct 2014 19:29:47 -0700 (PDT) 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.84.229 with SMTP id c5csp517554lbz; Tue, 14 Oct 2014 19:29:46 -0700 (PDT) X-Received: by 10.70.36.202 with SMTP id s10mr9145753pdj.101.1413340185953; Tue, 14 Oct 2014 19:29:45 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id gw7si14653836pac.38.2014.10.14.19.29.45 for <multiple recipients>; Tue, 14 Oct 2014 19:29:45 -0700 (PDT) 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 S1756038AbaJOC3n (ORCPT <rfc822;ankit.jindal@linaro.org> + 27 others); Tue, 14 Oct 2014 22:29:43 -0400 Received: from szxga03-in.huawei.com ([119.145.14.66]:56298 "EHLO szxga03-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932791AbaJOC0G (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Tue, 14 Oct 2014 22:26:06 -0400 Received: from 172.24.2.119 (EHLO szxeml412-hub.china.huawei.com) ([172.24.2.119]) by szxrg03-dlp.huawei.com (MOS 4.4.3-GA FastPath queued) with ESMTP id AVO63799; Wed, 15 Oct 2014 10:25:58 +0800 (CST) Received: from localhost.localdomain (10.175.100.166) by szxeml412-hub.china.huawei.com (10.82.67.91) with Microsoft SMTP Server id 14.3.158.1; Wed, 15 Oct 2014 10:25:45 +0800 From: Yijing Wang <wangyijing@huawei.com> To: Bjorn Helgaas <bhelgaas@google.com> CC: <linux-pci@vger.kernel.org>, <linux-kernel@vger.kernel.org>, Xinwei Hu <huxinwei@huawei.com>, Wuyun <wuyun.wu@huawei.com>, <linux-arm-kernel@lists.infradead.org>, Russell King <linux@arm.linux.org.uk>, <linux-arch@vger.kernel.org>, <arnab.basu@freescale.com>, <Bharat.Bhushan@freescale.com>, <x86@kernel.org>, Arnd Bergmann <arnd@arndb.de>, Thomas Gleixner <tglx@linutronix.de>, "Konrad Rzeszutek Wilk" <konrad.wilk@oracle.com>, <xen-devel@lists.xenproject.org>, Joerg Roedel <joro@8bytes.org>, <iommu@lists.linux-foundation.org>, <linux-mips@linux-mips.org>, Benjamin Herrenschmidt <benh@kernel.crashing.org>, <linuxppc-dev@lists.ozlabs.org>, <linux-s390@vger.kernel.org>, Sebastian Ott <sebott@linux.vnet.ibm.com>, "Tony Luck" <tony.luck@intel.com>, <linux-ia64@vger.kernel.org>, "David S. Miller" <davem@davemloft.net>, <sparclinux@vger.kernel.org>, Chris Metcalf <cmetcalf@tilera.com>, Ralf Baechle <ralf@linux-mips.org>, Lucas Stach <l.stach@pengutronix.de>, David Vrabel <david.vrabel@citrix.com>, "Sergei Shtylyov" <sergei.shtylyov@cogentembedded.com>, Michael Ellerman <mpe@ellerman.id.au>, Thierry Reding <thierry.reding@gmail.com>, "Thomas Petazzoni" <thomas.petazzoni@free-electrons.com>, Liviu Dudau <liviu@dudau.co.uk>, Yijing Wang <wangyijing@huawei.com> Subject: [PATCH v3 18/27] MIPS/Xlp: Remove the dead function destroy_irq() to fix build error Date: Wed, 15 Oct 2014 11:07:06 +0800 Message-ID: <1413342435-7876-19-git-send-email-wangyijing@huawei.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1413342435-7876-1-git-send-email-wangyijing@huawei.com> References: <1413342435-7876-1-git-send-email-wangyijing@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.175.100.166] X-CFilter-Loop: Reflected X-Mirapoint-Virus-RAPID-Raw: score=unknown(0), refid=str=0001.0A020206.543DDB36.0181, ss=1, re=0.000, recu=0.000, reip=0.000, cl=1, cld=1, fgs=0, ip=0.0.0.0, so=2013-05-26 15:14:31, dmn=2013-03-21 17:37:32 X-Mirapoint-Loop-Id: 2f02b8c0cbe2e526cbd60b8ad861fcf5 Sender: linux-kernel-owner@vger.kernel.org Precedence: list List-ID: <patchwork-forward.linaro.org> X-Mailing-List: linux-kernel@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: wangyijing@huawei.com 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.44 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: <http://groups.google.com/a/linaro.org/group/patchwork-forward/post>, <mailto:patchwork-forward@linaro.org> List-Help: <http://support.google.com/a/linaro.org/bin/topic.py?topic=25838>, <mailto:patchwork-forward+help@linaro.org> List-Archive: <http://groups.google.com/a/linaro.org/group/patchwork-forward/> List-Unsubscribe: <mailto:googlegroups-manage+836684582541+unsubscribe@googlegroups.com>, <http://groups.google.com/a/linaro.org/group/patchwork-forward/subscribe> Content-Type: text/plain |
diff --git a/arch/mips/pci/msi-xlp.c b/arch/mips/pci/msi-xlp.c index fa374fe..e469dc7 100644 --- a/arch/mips/pci/msi-xlp.c +++ b/arch/mips/pci/msi-xlp.c @@ -443,10 +443,8 @@ static int xlp_setup_msix(uint64_t lnkbase, int node, int link, msg.data = 0xc00 | msixvec; ret = irq_set_msi_desc(xirq, desc); - if (ret < 0) { - destroy_irq(xirq); + if (ret < 0) return ret; - } write_msi_msg(xirq, &msg); return 0;
Commit 465665f78a7 ("mips: Kill pointless destroy_irq()") removed the destroy_irq(). So remove the leftover one in xlp_setup_msix() to fix build error. arch/mips/pci/msi-xlp.c: In function 'xlp_setup_msix': arch/mips/pci/msi-xlp.c:447:3: error: implicit declaration of function 'destroy_irq'.. cc1: some warnings being treated as errors make[1]: *** [arch/mips/pci/msi-xlp.o] Error 1 make: *** [arch/mips/pci/] Error 2 Signed-off-by: Yijing Wang <wangyijing@huawei.com> Cc: Thomas Gleixner <tglx@linutronix.de> --- arch/mips/pci/msi-xlp.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-)