From patchwork Thu Sep 25 03:14:15 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: wangyijing X-Patchwork-Id: 37884 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 CD2DF20063 for ; Thu, 25 Sep 2014 02:51:07 +0000 (UTC) Received: by mail-wg0-f72.google.com with SMTP id k14sf2367939wgh.3 for ; Wed, 24 Sep 2014 19:51:06 -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=97OJut5Fyz5RCPkshr3/Aoprqc7PCYkB5XKuwW7tLwE=; b=W4ndHBit0pj659/Z4xhuakrS1zYV6YKfm24gBsB2EkWgE78L0LRrYf8vnILrN/MjRa HarzdocLHr7xTc8PyAsJSOXZ1WXSPxmyKdPVlJcdGDtl7aVwghtEuRFCIph+o98yEUqh RnhxIvTAM4DAC470SrhR0RKOCJ9Z5HauQ9EgJhmUYPLIeg8W98IdRN00kb66uBZ5t4+S KMVIPo2sJoZycVTSFptDDZAxF4DPXWEnInLbKab0Mop8wIsGmFU7HIl1XWzP22VtDo/e jdwETPFR5javuoE/KcJ3QwVZep3JjWlsaYie3xEWLJSEnmB7qD8NjyEbVnJlrXLNDiU7 QFpg== X-Gm-Message-State: ALoCoQlpXR1Ov1/XalMhumBz3OmvrUkIqUrbt56SJZdWWZ1bnBh6oqUv2E4tPqjYYVXU/fs+3wNe X-Received: by 10.152.18.199 with SMTP id y7mr82104lad.9.1411613466851; Wed, 24 Sep 2014 19:51:06 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.88.8 with SMTP id bc8ls211385lab.86.gmail; Wed, 24 Sep 2014 19:51:06 -0700 (PDT) X-Received: by 10.152.19.225 with SMTP id i1mr10090071lae.21.1411613466664; Wed, 24 Sep 2014 19:51:06 -0700 (PDT) Received: from mail-la0-f41.google.com (mail-la0-f41.google.com [209.85.215.41]) by mx.google.com with ESMTPS id z9si1035732laa.99.2014.09.24.19.51.06 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 24 Sep 2014 19:51:06 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.41 as permitted sender) client-ip=209.85.215.41; Received: by mail-la0-f41.google.com with SMTP id s18so11894207lam.28 for ; Wed, 24 Sep 2014 19:51:06 -0700 (PDT) X-Received: by 10.152.8.9 with SMTP id n9mr10342170laa.2.1411613466553; Wed, 24 Sep 2014 19:51:06 -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 of9csp683208lbb; Wed, 24 Sep 2014 19:51:05 -0700 (PDT) X-Received: by 10.68.178.36 with SMTP id cv4mr14061804pbc.136.1411613465050; Wed, 24 Sep 2014 19:51:05 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id j11si1170309pdm.137.2014.09.24.19.51.03 for ; Wed, 24 Sep 2014 19:51:04 -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 S1752868AbaIYCu7 (ORCPT + 27 others); Wed, 24 Sep 2014 22:50:59 -0400 Received: from szxga03-in.huawei.com ([119.145.14.66]:61828 "EHLO szxga03-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751412AbaIYCut (ORCPT ); Wed, 24 Sep 2014 22:50:49 -0400 Received: from 172.24.2.119 (EHLO szxeml409-hub.china.huawei.com) ([172.24.2.119]) by szxrg03-dlp.huawei.com (MOS 4.4.3-GA FastPath queued) with ESMTP id AUU79110; Thu, 25 Sep 2014 10:50:39 +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:26 +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" , Yijing Wang Subject: [PATCH v2 05/22] s390/MSI: Use __msi_mask_irq() instead of default_msi_mask_irq() Date: Thu, 25 Sep 2014 11:14:15 +0800 Message-ID: <1411614872-4009-6-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 X-Mirapoint-Virus-RAPID-Raw: score=unknown(0), refid=str=0001.0A020205.542382FF.0088, 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: f8bda5302f64146b26f7a8578b0a1b99 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.41 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 cc46a62..6fdc5c6 100644 --- a/include/linux/msi.h +++ b/include/linux/msi.h @@ -61,8 +61,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;