From patchwork Fri Apr 10 22:55:27 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Helgaas X-Patchwork-Id: 6200311 X-Patchwork-Delegate: bhelgaas@google.com Return-Path: X-Original-To: patchwork-linux-pci@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 8338FBF4A6 for ; Fri, 10 Apr 2015 22:55:34 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 9E6AD20295 for ; Fri, 10 Apr 2015 22:55:33 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A6B5B20270 for ; Fri, 10 Apr 2015 22:55:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932441AbbDJWzb (ORCPT ); Fri, 10 Apr 2015 18:55:31 -0400 Received: from mail-ie0-f178.google.com ([209.85.223.178]:33950 "EHLO mail-ie0-f178.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932205AbbDJWza (ORCPT ); Fri, 10 Apr 2015 18:55:30 -0400 Received: by iedfl3 with SMTP id fl3so32537463ied.1 for ; Fri, 10 Apr 2015 15:55:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=subject:to:from:cc:date:message-id:in-reply-to:references :user-agent:mime-version:content-type:content-transfer-encoding; bh=r6do9BWOzlDblS3KErA8NN2dTkWID9wFujRsJFHpEBw=; b=Fz65n4KGPMHDVNBzUv0e/lKLLTKREPnF3aIoeriINg7/QchmO17jUbFwvsaKdKYgkt JFTAv3DqnoN9CARxX3usqWRWrkDUIR5IAOnT9aNWrpWNC8hWZccAmUvWU9xwZQhbQoo/ c9r3EoVxkp8id/Yrvw2ElKIPnkffw9oqyGon9f/WYFfaZenXc1IUysqp0OMYxnmxQ2cb qWZE0VuPlPBXdqQ9yno5tDJ0UptCI+AiyEf1MgxlMXJmFtE3oMzZ90yT5VfwUVOInnwU PA5ZNvlnekjY0nZf/JW6MhyR+O+74AFWsQEgnuUpfajvW2zh5BRJBiicAL4D6+QMjLU9 6hxA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:subject:to:from:cc:date:message-id:in-reply-to :references:user-agent:mime-version:content-type :content-transfer-encoding; bh=r6do9BWOzlDblS3KErA8NN2dTkWID9wFujRsJFHpEBw=; b=PHpOLTQXz9xKPFmW48WJT1+5+ZwzYS8hyYfoL6IvfQ4Gw1KZ3ij2bOKAzJJDtSIPy5 z5+OiTw15zpanPMAoNRkTWg4tWAUYyBNyggDGBXx6ccjpZbf1EuA1YoTxronN6R8BPUb lquYyX2HH8OY1XYqAAdUT4v7Kn8JCBy5e59SA5/tG8OIRJq2iZTwBSM9mrTM8KpJdVv4 U5fS2FbrNJkSW+ioO4Avt/jh99eTt24FKIxVH0SbV52/YcOLeCx382unILRW1p6Y907o bHcA5PEhQv718U10grq/zRn+jGVbMoEH01Om4cQr7omZoaRMx3CoB890s8y8Vj5G5nNX IVDQ== X-Gm-Message-State: ALoCoQkppY+doAYCAX9AMi/P31Qzsve42xU9p4l0cV5tX/Bg9KerbcDduiMnDtfn+3tj1LLX5BRS X-Received: by 10.107.14.141 with SMTP id 135mr6228740ioo.15.1428706529568; Fri, 10 Apr 2015 15:55:29 -0700 (PDT) Received: from localhost ([69.71.1.1]) by mx.google.com with ESMTPSA id gz4sm675829igb.19.2015.04.10.15.55.28 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Fri, 10 Apr 2015 15:55:28 -0700 (PDT) Subject: [PATCH v6 10/10] PCI/MSI: Remove unused pci_msi_off() To: "Michael S. Tsirkin" From: Bjorn Helgaas Cc: Yijing Wang , linux-pci@vger.kernel.org, Fam Zheng , Yinghai Lu , "Eric W. Biederman" Date: Fri, 10 Apr 2015 17:55:27 -0500 Message-ID: <20150410225527.20848.88717.stgit@bhelgaas-glaptop2.roam.corp.google.com> In-Reply-To: <20150410223533.20848.95316.stgit@bhelgaas-glaptop2.roam.corp.google.com> References: <20150410223533.20848.95316.stgit@bhelgaas-glaptop2.roam.corp.google.com> User-Agent: StGit/0.16 MIME-Version: 1.0 Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,RCVD_IN_DNSWL_HI,T_DKIM_INVALID,T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP pci_msi_off() is unused, so remove it. Removes the exported symbol pci_msi_off(). Signed-off-by: Bjorn Helgaas --- drivers/pci/pci.c | 33 --------------------------------- include/linux/pci.h | 1 - 2 files changed, 34 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c index 81f06e8dcc04..3d938a7d3b04 100644 --- a/drivers/pci/pci.c +++ b/drivers/pci/pci.c @@ -3096,39 +3096,6 @@ bool pci_check_and_unmask_intx(struct pci_dev *dev) } EXPORT_SYMBOL_GPL(pci_check_and_unmask_intx); -/** - * pci_msi_off - disables any MSI or MSI-X capabilities - * @dev: the PCI device to operate on - * - * If you want to use MSI, see pci_enable_msi() and friends. - * This is a lower-level primitive that allows us to disable - * MSI operation at the device level. - */ -void pci_msi_off(struct pci_dev *dev) -{ - int pos; - u16 control; - - /* - * This looks like it could go in msi.c, but we need it even when - * CONFIG_PCI_MSI=n. For the same reason, we can't use - * dev->msi_cap or dev->msix_cap here. - */ - pos = pci_find_capability(dev, PCI_CAP_ID_MSI); - if (pos) { - pci_read_config_word(dev, pos + PCI_MSI_FLAGS, &control); - control &= ~PCI_MSI_FLAGS_ENABLE; - pci_write_config_word(dev, pos + PCI_MSI_FLAGS, control); - } - pos = pci_find_capability(dev, PCI_CAP_ID_MSIX); - if (pos) { - pci_read_config_word(dev, pos + PCI_MSIX_FLAGS, &control); - control &= ~PCI_MSIX_FLAGS_ENABLE; - pci_write_config_word(dev, pos + PCI_MSIX_FLAGS, control); - } -} -EXPORT_SYMBOL_GPL(pci_msi_off); - int pci_set_dma_max_seg_size(struct pci_dev *dev, unsigned int size) { return dma_set_max_seg_size(&dev->dev, size); diff --git a/include/linux/pci.h b/include/linux/pci.h index a34df456faf2..ef15f91207b4 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -970,7 +970,6 @@ void pci_intx(struct pci_dev *dev, int enable); bool pci_intx_mask_supported(struct pci_dev *dev); bool pci_check_and_mask_intx(struct pci_dev *dev); bool pci_check_and_unmask_intx(struct pci_dev *dev); -void pci_msi_off(struct pci_dev *dev); int pci_set_dma_max_seg_size(struct pci_dev *dev, unsigned int size); int pci_set_dma_seg_boundary(struct pci_dev *dev, unsigned long mask); int pci_wait_for_pending(struct pci_dev *dev, int pos, u16 mask);