---

yaml --- r: 343261 b: refs/heads/master c: 1452cd7 h: refs/heads/master i: 343259: 414ef63 v: v3
git-mirror · Nov 10, 2012 · b0f801b · b0f801b
1 parent 121c0d0
commit b0f801b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git 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
@@ -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);