From patchwork Wed Oct 15 03:06:51 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: wangyijing X-Patchwork-Id: 38752 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wg0-f72.google.com (mail-wg0-f72.google.com [74.125.82.72]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 4E59720973 for ; Wed, 15 Oct 2014 02:32:25 +0000 (UTC) Received: by mail-wg0-f72.google.com with SMTP id m15sf147357wgh.3 for ; Tue, 14 Oct 2014 19:32:24 -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=obbnjOOLk1p7bHbJbvkXJJYLXp+1FHEIqfonXVrqtZ8=; b=YQTf4LRM65HnMokJ4IpklG1etY6PW3afeFgon6qtQnDuqUaYHWUneO1vr0MprCYyc1 Cl8yxIFKmZvtcGvr+2IFSwO9t9ABBiMSnP9W1A1CFz3un6hL7HZRJ2HcpRfIHDh2Bf8C rwBztLczGYlJJ4sZ3yO+SVdo60mvZ4UwzMRt5wWcMsq8tuWTaGPrp3DvSeRCXe1NO+0P QcPZjerrZ/4vCOT0m5N2djC7V30iSAnllsfWix6q6shd/FROHWhazOqzdCeTmx5X4iWS BwtIzC9vg8+DBsb/bYj82x2XHot8MuFKDa8Te6595zGaLnG4kEY/wtRbDpGkugQqcdWW /UrA== X-Gm-Message-State: ALoCoQnkLrFW+4SLjf6bz21dKQPXh4OD0hHWpiMi+tS9du3uOsKtHKAzbUwU+LRTddYGC8IEuOMS X-Received: by 10.180.76.42 with SMTP id h10mr1586585wiw.6.1413340344471; Tue, 14 Oct 2014 19:32:24 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.7.66 with SMTP id h2ls6885laa.58.gmail; Tue, 14 Oct 2014 19:32:23 -0700 (PDT) X-Received: by 10.112.97.135 with SMTP id ea7mr9275665lbb.46.1413340343974; Tue, 14 Oct 2014 19:32:23 -0700 (PDT) Received: from mail-la0-f53.google.com (mail-la0-f53.google.com [209.85.215.53]) by mx.google.com with ESMTPS id r1si28680080lar.58.2014.10.14.19.32.23 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 14 Oct 2014 19:32:23 -0700 (PDT) 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 gq15so237347lab.40 for ; Tue, 14 Oct 2014 19:32:23 -0700 (PDT) X-Received: by 10.152.30.33 with SMTP id p1mr9025099lah.78.1413340343892; Tue, 14 Oct 2014 19:32:23 -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 c5csp517778lbz; Tue, 14 Oct 2014 19:32:23 -0700 (PDT) X-Received: by 10.66.243.36 with SMTP id wv4mr9193847pac.36.1413340342321; Tue, 14 Oct 2014 19:32:22 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id cl3si14557091pdb.68.2014.10.14.19.32.21 for ; Tue, 14 Oct 2014 19:32:22 -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 S932732AbaJOCZy (ORCPT + 27 others); Tue, 14 Oct 2014 22:25:54 -0400 Received: from szxga02-in.huawei.com ([119.145.14.65]:39159 "EHLO szxga02-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932094AbaJOCZr (ORCPT ); Tue, 14 Oct 2014 22:25:47 -0400 Received: from 172.24.2.119 (EHLO szxeml412-hub.china.huawei.com) ([172.24.2.119]) by szxrg02-dlp.huawei.com (MOS 4.3.7-GA FastPath queued) with ESMTP id CAT35323; Wed, 15 Oct 2014 10:25:25 +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:13 +0800 From: Yijing Wang To: Bjorn Helgaas CC: , , Xinwei Hu , Wuyun , , Russell King , , , , , Arnd Bergmann , Thomas Gleixner , "Konrad Rzeszutek Wilk" , , Joerg Roedel , , , Benjamin Herrenschmidt , , , Sebastian Ott , "Tony Luck" , , "David S. Miller" , , Chris Metcalf , Ralf Baechle , Lucas Stach , David Vrabel , "Sergei Shtylyov" , Michael Ellerman , Thierry Reding , "Thomas Petazzoni" , Liviu Dudau , Yijing Wang Subject: [PATCH v3 03/27] s390/MSI: Use __msi_mask_irq() instead of default_msi_mask_irq() Date: Wed, 15 Oct 2014 11:06:51 +0800 Message-ID: <1413342435-7876-4-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 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: 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.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: , Now only s390/MSI use default_msi_mask_irq() and default_msix_mask_irq(), replace them with the common msi mask irq functions __msi_mask_irq() and __msix_mask_irq(). Remove default_msi_mask_irq() and default_msix_mask_irq(). Signed-off-by: Yijing Wang --- arch/s390/pci/pci.c | 4 ++-- include/linux/msi.h | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/arch/s390/pci/pci.c b/arch/s390/pci/pci.c index 2fa7b14..552b990 100644 --- a/arch/s390/pci/pci.c +++ b/arch/s390/pci/pci.c @@ -448,9 +448,9 @@ void arch_teardown_msi_irqs(struct pci_dev *pdev) /* Release MSI interrupts */ list_for_each_entry(msi, &pdev->msi_list, list) { if (msi->msi_attrib.is_msix) - default_msix_mask_irq(msi, 1); + __msix_mask_irq(msi, 1); else - default_msi_mask_irq(msi, 1, 1); + __msi_mask_irq(msi, 1, 1); irq_set_msi_desc(msi->irq, NULL); irq_free_desc(msi->irq); msi->msg.address_lo = 0; diff --git a/include/linux/msi.h b/include/linux/msi.h index 9ac1e3b..175aa21 100644 --- a/include/linux/msi.h +++ b/include/linux/msi.h @@ -65,8 +65,6 @@ void arch_restore_msi_irqs(struct pci_dev *dev); void default_teardown_msi_irqs(struct pci_dev *dev); void default_restore_msi_irqs(struct pci_dev *dev); -#define default_msi_mask_irq __msi_mask_irq -#define default_msix_mask_irq __msix_mask_irq struct msi_chip { struct module *owner;