Message ID | 1411614872-4009-14-git-send-email-wangyijing@huawei.com |
---|---|
State | New |
Headers | show
Return-Path: <patchwork-forward+bncBDP3JFH37QKRB3EHR2QQKGQEGOZWFVI@linaro.org> X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-we0-f197.google.com (mail-we0-f197.google.com [74.125.82.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id BB34520063 for <linaro@patches.linaro.org>; Thu, 25 Sep 2014 02:54:37 +0000 (UTC) Received: by mail-we0-f197.google.com with SMTP id p10sf3401024wes.8 for <linaro@patches.linaro.org>; Wed, 24 Sep 2014 19:54:36 -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=CvSyBcxAlvbfpdOb0nvEdRonskEyG9/3a4geWtEb7h0f/3fteZfx4EaldKOO7Bamof LDGCkQiNSt2JR81IUY7XC3tDAh5YzMTwS6zmwuBuB0ZJCLi7fNq5Cf77vzKnRWjpgRZS xweH8Z5VnSkr1tf75kno9LGPcQR4aWXg4fD+pkibicfSHibjS7QO1yTCwDGXAdHt4b+4 1mZgfAuhVhOQdwZm+gRBsuuanb1iOpgxre51c1XSAMbXJmREOHbxxWfh5rzk5RaE0BKQ rY+H9LeqxVvB50+5iMwajO6j9WmAEkPTbZljKu9W643aGDdcQ7r56fsGxde4kri4ggSY aDvQ== X-Gm-Message-State: ALoCoQkOQOXsbUzeKJxjmXadDxvVirRUsOs7g/BBql9DVj1cXjHURx1/snBxV6h84aXuXs2CBB/u X-Received: by 10.112.167.138 with SMTP id zo10mr1613024lbb.3.1411613676874; Wed, 24 Sep 2014 19:54:36 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.7.169 with SMTP id k9ls237914laa.91.gmail; Wed, 24 Sep 2014 19:54:36 -0700 (PDT) X-Received: by 10.112.149.2 with SMTP id tw2mr9629268lbb.21.1411613676715; Wed, 24 Sep 2014 19:54:36 -0700 (PDT) Received: from mail-la0-f46.google.com (mail-la0-f46.google.com [209.85.215.46]) by mx.google.com with ESMTPS id ba3si1052092lbc.92.2014.09.24.19.54.36 for <patchwork-forward@linaro.org> (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 24 Sep 2014 19:54:36 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.46 as permitted sender) client-ip=209.85.215.46; Received: by mail-la0-f46.google.com with SMTP id gi9so1485602lab.33 for <patchwork-forward@linaro.org>; Wed, 24 Sep 2014 19:54:36 -0700 (PDT) X-Received: by 10.112.48.100 with SMTP id k4mr357744lbn.95.1411613676618; Wed, 24 Sep 2014 19:54:36 -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.130.169 with SMTP id of9csp683451lbb; Wed, 24 Sep 2014 19:54:35 -0700 (PDT) X-Received: by 10.70.9.129 with SMTP id z1mr439554pda.37.1411613673802; Wed, 24 Sep 2014 19:54:33 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id cg2si1343671pad.34.2014.09.24.19.54.33 for <multiple recipients>; Wed, 24 Sep 2014 19:54:33 -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 S1753520AbaIYCyb (ORCPT <rfc822;ankit.jindal@linaro.org> + 27 others); Wed, 24 Sep 2014 22:54:31 -0400 Received: from szxga02-in.huawei.com ([119.145.14.65]:41649 "EHLO szxga02-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752311AbaIYCuz (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Wed, 24 Sep 2014 22:50:55 -0400 Received: from 172.24.2.119 (EHLO szxeml409-hub.china.huawei.com) ([172.24.2.119]) by szxrg02-dlp.huawei.com (MOS 4.3.7-GA FastPath queued) with ESMTP id BZX30383; Thu, 25 Sep 2014 10:50:47 +0800 (CST) Received: from localhost.localdomain (10.175.100.166) by szxeml409-hub.china.huawei.com (10.82.67.136) with Microsoft SMTP Server id 14.3.158.1; Thu, 25 Sep 2014 10:50:38 +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>, Yijing Wang <wangyijing@huawei.com> Subject: [PATCH v2 13/22] MIPS/Xlp: Remove the dead function destroy_irq() to fix build error Date: Thu, 25 Sep 2014 11:14:23 +0800 Message-ID: <1411614872-4009-14-git-send-email-wangyijing@huawei.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1411614872-4009-1-git-send-email-wangyijing@huawei.com> References: <1411614872-4009-1-git-send-email-wangyijing@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.175.100.166] X-CFilter-Loop: Reflected 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.46 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(-)