From b0f801b8dcd07e3bc661513f6099ff9b167f2f69 Mon Sep 17 00:00:00 2001
From: Bjorn Helgaas <bhelgaas@google.com>
Date: Fri, 9 Nov 2012 20:35:01 -0700
Subject: [PATCH] --- yaml --- r: 343261 b: refs/heads/master c:
 1452cd76a97bf7b93a015586dcabc73fd935e692 h: refs/heads/master i:   343259:
 414ef63fa02c6e9eb8c03616c5e84fc2e81df8e3 v: v3

---
 [refs]                  |  2 +-
 trunk/drivers/pci/iov.c | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index 0795f00e71f0..c5fa4b450a25 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6b136724691a6f247ada0c6a5f02370ed46de9f4
+refs/heads/master: 1452cd76a97bf7b93a015586dcabc73fd935e692
diff --git a/trunk/drivers/pci/iov.c b/trunk/drivers/pci/iov.c
index a32bd9ad0931..bafd2bbcaf65 100644
--- a/trunk/drivers/pci/iov.c
+++ b/trunk/drivers/pci/iov.c
@@ -729,10 +729,10 @@ EXPORT_SYMBOL_GPL(pci_sriov_migration);
  */
 int pci_num_vf(struct pci_dev *dev)
 {
-	if (!dev || !dev->is_physfn)
+	if (!dev->is_physfn)
 		return 0;
-	else
-		return dev->sriov->num_VFs;
+
+	return dev->sriov->num_VFs;
 }
 EXPORT_SYMBOL_GPL(pci_num_vf);
 
@@ -750,7 +750,7 @@ EXPORT_SYMBOL_GPL(pci_num_vf);
  */
 int pci_sriov_set_totalvfs(struct pci_dev *dev, u16 numvfs)
 {
-	if (!dev || !dev->is_physfn || (numvfs > dev->sriov->total_VFs))
+	if (!dev->is_physfn || (numvfs > dev->sriov->total_VFs))
 		return -EINVAL;
 
 	/* Shouldn't change if VFs already enabled */
@@ -773,12 +773,12 @@ EXPORT_SYMBOL_GPL(pci_sriov_set_totalvfs);
  */
 int pci_sriov_get_totalvfs(struct pci_dev *dev)
 {
-	if (!dev || !dev->is_physfn)
+	if (!dev->is_physfn)
 		return -EINVAL;
 
 	if (dev->sriov->driver_max_VFs)
 		return dev->sriov->driver_max_VFs;
-	else
-		return dev->sriov->total_VFs;
+
+	return dev->sriov->total_VFs;
 }
 EXPORT_SYMBOL_GPL(pci_sriov_get_totalvfs);