From: Bjorn Helgaas <bhelgaas@google.com>
To: linux-pci@vger.kernel.org
Cc: "Dexuan Cui" <dexuan.cui@intel.com>,
"Matthew Wilcox" <matthew@wil.cx>,
x86@kernel.org, "Felipe Balbi" <balbi@ti.com>,
"Yu Zhao" <yu.zhao@intel.com>, "Huang Rui" <ray.huang@amd.com>,
"Krzysztof Hałasa" <khalasa@piap.pl>,
"Jason Chang" <jason.chang@amd.com>
Subject: [PATCH 5/6] PCI: Simplify reset_intel_generic_dev()
Date: Fri, 19 Jun 2015 17:42:51 -0500 [thread overview]
Message-ID: <20150619224251.14626.51652.stgit@bhelgaas-glaptop2.roam.corp.google.com> (raw)
In-Reply-To: <20150619223325.14626.66402.stgit@bhelgaas-glaptop2.roam.corp.google.com>
Restructure reset_intel_generic_dev() slightly to return early for non-USB
devices. That makes the body of the function non-indented.
No functional change.
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
CC: Dexuan Cui <dexuan.cui@intel.com>
CC: Yu Zhao <yu.zhao@intel.com>
---
drivers/pci/quirks.c | 23 +++++++++++------------
1 file changed, 11 insertions(+), 12 deletions(-)
diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
index 356a401..ed2763b2 100644
--- a/drivers/pci/quirks.c
+++ b/drivers/pci/quirks.c
@@ -3358,21 +3358,20 @@ static int reset_intel_generic_dev(struct pci_dev *dev, int probe)
int pos;
/* only implement PCI_CLASS_SERIAL_USB at present */
- if ((dev->class >> 8) == PCI_CLASS_SERIAL_USB) {
- pos = pci_find_capability(dev, PCI_CAP_ID_VNDR);
- if (!pos)
- return -ENOTTY;
-
- if (probe)
- return 0;
+ if ((dev->class >> 8) != PCI_CLASS_SERIAL_USB)
+ return -ENOTTY;
- pci_write_config_byte(dev, pos + 0x4, 1);
- msleep(100);
+ pos = pci_find_capability(dev, PCI_CAP_ID_VNDR);
+ if (!pos)
+ return -ENOTTY;
+ if (probe)
return 0;
- } else {
- return -ENOTTY;
- }
+
+ pci_write_config_byte(dev, pos + 0x4, 1);
+ msleep(100);
+
+ return 0;
}
static int reset_intel_82599_sfp_virtfn(struct pci_dev *dev, int probe)
--
To unsubscribe from this list: send the line "unsubscribe linux-pci" in
next prev parent reply other threads:[~2015-06-19 22:42 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-06-19 22:42 [PATCH 0/6] PCI: Fix class code usage Bjorn Helgaas
2015-06-19 22:42 ` [PATCH 1/6] PCI: Use PCI_CLASS_SERIAL_USB instead of bare number Bjorn Helgaas
2015-06-23 2:07 ` Huang Rui
2015-06-19 22:42 ` [PATCH 2/6] PCI: Fix generic NCR 53c810 class code quirk Bjorn Helgaas
2015-06-19 22:58 ` Bjorn Helgaas
2015-06-19 22:42 ` [PATCH 3/6] PCI: Fix TI816X " Bjorn Helgaas
2015-06-19 22:42 ` [PATCH 4/6] PCI: Fix Intel generic reset quirk class code check Bjorn Helgaas
2015-06-19 23:06 ` Bjorn Helgaas
2015-06-24 20:46 ` Bjorn Helgaas
2015-06-19 22:42 ` Bjorn Helgaas [this message]
2015-06-19 22:42 ` [PATCH 6/6] PCI: Shift PCI_CLASS_NOT_DEFINED consistently with other classes Bjorn Helgaas
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20150619224251.14626.51652.stgit@bhelgaas-glaptop2.roam.corp.google.com \
--to=bhelgaas@google.com \
--cc=balbi@ti.com \
--cc=dexuan.cui@intel.com \
--cc=jason.chang@amd.com \
--cc=khalasa@piap.pl \
--cc=linux-pci@vger.kernel.org \
--cc=matthew@wil.cx \
--cc=ray.huang@amd.com \
--cc=x86@kernel.org \
--cc=yu.zhao@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.