From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752855AbeBSNCx (ORCPT ); Mon, 19 Feb 2018 08:02:53 -0500 Received: from cloudserver094114.home.pl ([79.96.170.134]:61606 "EHLO cloudserver094114.home.pl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752638AbeBSNCu (ORCPT ); Mon, 19 Feb 2018 08:02:50 -0500 From: "Rafael J. Wysocki" To: Bjorn Helgaas Cc: linux-pci@vger.kernel.org, Jayachandran Nair , Lorenzo Pieralisi , linux-kernel@vger.kernel.org, Alex Williamson , Robert Richter , Tom Vaden , Mika Westerberg , George Cherian Subject: Re: [PATCH v1 2/2] PCI: Remove redundant probes for device reset support Date: Mon, 19 Feb 2018 14:00:53 +0100 Message-ID: <5209987.iOvtupYxAV@aspire.rjw.lan> In-Reply-To: <20180216225018.67295.36860.stgit@bhelgaas-glaptop.roam.corp.google.com> References: <20180216224213.67295.2251.stgit@bhelgaas-glaptop.roam.corp.google.com> <20180216225018.67295.36860.stgit@bhelgaas-glaptop.roam.corp.google.com> MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Friday, February 16, 2018 11:50:18 PM CET Bjorn Helgaas wrote: > From: Bjorn Helgaas > > We probe every device for whether it supports reset so we can tell whether > to create a sysfs "reset" file for it. We do that probe in > pci_init_capabilities() during enumeration and save the result in > dev->reset_fn. The result doesn't depend on any other devices on the bus > and shouldn't change after boot, so we don't need to do the probe again. > > Remove the pci_probe_reset_function() calls and rely on the dev->reset_fn > we found during enumeration. No functional change intended. > > Signed-off-by: Bjorn Helgaas Reviewed-by: Rafael J. Wysocki > --- > drivers/pci/pci.c | 15 ++++++--------- > 1 file changed, 6 insertions(+), 9 deletions(-) > > diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c > index f6a4dd10d9b0..4db740e4f50a 100644 > --- a/drivers/pci/pci.c > +++ b/drivers/pci/pci.c > @@ -4450,9 +4450,8 @@ int pci_reset_function(struct pci_dev *dev) > { > int rc; > > - rc = pci_probe_reset_function(dev); > - if (rc) > - return rc; > + if (!dev->reset_fn) > + return -ENOTTY; > > pci_dev_lock(dev); > pci_dev_save_and_disable(dev); > @@ -4487,9 +4486,8 @@ int pci_reset_function_locked(struct pci_dev *dev) > { > int rc; > > - rc = pci_probe_reset_function(dev); > - if (rc) > - return rc; > + if (!dev->reset_fn) > + return -ENOTTY; > > pci_dev_save_and_disable(dev); > > @@ -4511,9 +4509,8 @@ int pci_try_reset_function(struct pci_dev *dev) > { > int rc; > > - rc = pci_probe_reset_function(dev); > - if (rc) > - return rc; > + if (!dev->reset_fn) > + return -ENOTTY; > > if (!pci_dev_trylock(dev)) > return -EAGAIN; > >