From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752779AbbCXXeF (ORCPT ); Tue, 24 Mar 2015 19:34:05 -0400 Received: from mail-ie0-f169.google.com ([209.85.223.169]:35280 "EHLO mail-ie0-f169.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752190AbbCXXeB (ORCPT ); Tue, 24 Mar 2015 19:34:01 -0400 Date: Tue, 24 Mar 2015 18:33:57 -0500 From: Bjorn Helgaas To: "Michael S. Tsirkin" Cc: linux-kernel@vger.kernel.org, stable@vger.kernel.org, linux-pci@vger.kernel.org, Fam Zheng , Yinghai Lu Subject: Re: [PATCH v3 03/10] pci: drop some duplicate code Message-ID: <20150324233357.GF2495@google.com> References: <1427211032-2270-1-git-send-email-mst@redhat.com> <1427211032-2270-4-git-send-email-mst@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1427211032-2270-4-git-send-email-mst@redhat.com> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, Mar 24, 2015 at 04:42:35PM +0100, Michael S. Tsirkin wrote: > pci_msi_init_pci_dev and pci_msi_off share a lot of code. > This used to be justified since pci_msi_init_pci_dev > wasn't compiled in when CONFIG_PCI_MSI is off. > Now that it is, let's reuse code. > > Signed-off-by: Michael S. Tsirkin > --- > drivers/pci/pci.c | 24 +++++------------------- > drivers/pci/probe.c | 11 ++++------- > 2 files changed, 9 insertions(+), 26 deletions(-) > > diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c > index 81f06e8..d5f297a 100644 > --- a/drivers/pci/pci.c > +++ b/drivers/pci/pci.c > @@ -3106,26 +3106,12 @@ EXPORT_SYMBOL_GPL(pci_check_and_unmask_intx); > */ > void pci_msi_off(struct pci_dev *dev) > { > - int pos; > - u16 control; > + if (dev->msi_cap) > + pci_msi_set_enable(dev, 0); > > - /* > - * 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); > - } > + dev->msix_cap = pci_find_capability(dev, PCI_CAP_ID_MSIX); I think the above line is superfluous, isn't it? You already do the same in pci_msi_init_pci_dev() (below). > + if (dev->msix_cap) > + pci_msix_clear_and_set_ctrl(dev, PCI_MSIX_FLAGS_ENABLE, 0); > } > EXPORT_SYMBOL_GPL(pci_msi_off); > > diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c > index 45d6d5c..baf8ddd 100644 > --- a/drivers/pci/probe.c > +++ b/drivers/pci/probe.c > @@ -1489,17 +1489,14 @@ static void pci_msi_init_pci_dev(struct pci_dev *dev) > INIT_LIST_HEAD(&dev->msi_list); > #endif > > + dev->msi_cap = pci_find_capability(dev, PCI_CAP_ID_MSI); > + dev->msix_cap = pci_find_capability(dev, PCI_CAP_ID_MSIX); > + > /* Disable the msi hardware to avoid screaming interrupts > * during boot. This is the power on reset default so > * usually this should be a noop. > */ > - dev->msi_cap = pci_find_capability(dev, PCI_CAP_ID_MSI); > - if (dev->msi_cap) > - pci_msi_set_enable(dev, 0); > - > - dev->msix_cap = pci_find_capability(dev, PCI_CAP_ID_MSIX); > - if (dev->msix_cap) > - pci_msix_clear_and_set_ctrl(dev, PCI_MSIX_FLAGS_ENABLE, 0); > + pci_msi_off(dev); > } > > static void pci_init_capabilities(struct pci_dev *dev) > -- > MST >