summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorBjorn Helgaas <bhelgaas@google.com>2014-09-23 22:38:28 +0200
committerBjorn Helgaas <bhelgaas@google.com>2014-10-01 20:21:46 +0200
commit5ec094057c7df5ff80f5e7fe282f47ad205fb976 (patch)
tree6b7769b0acde248c5ca37ebb825b2a8b6e1409e8 /drivers
parentPCI/MSI: Use __write_msi_msg() instead of write_msi_msg() (diff)
downloadlinux-5ec094057c7df5ff80f5e7fe282f47ad205fb976.tar.xz
linux-5ec094057c7df5ff80f5e7fe282f47ad205fb976.zip
PCI/MSI: Remove unnecessary temporary variable
The only use of "status" is to hold a value which is immediately returned, so just return and remove the variable directly. Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/pci/msi.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c
index 6413c5a08373..2f7c92c4757a 100644
--- a/drivers/pci/msi.c
+++ b/drivers/pci/msi.c
@@ -920,7 +920,7 @@ EXPORT_SYMBOL(pci_msix_vec_count);
**/
int pci_enable_msix(struct pci_dev *dev, struct msix_entry *entries, int nvec)
{
- int status, nr_entries;
+ int nr_entries;
int i, j;
if (!pci_msi_supported(dev, nvec))
@@ -951,8 +951,7 @@ int pci_enable_msix(struct pci_dev *dev, struct msix_entry *entries, int nvec)
dev_info(&dev->dev, "can't enable MSI-X (MSI IRQ already assigned)\n");
return -EINVAL;
}
- status = msix_capability_init(dev, entries, nvec);
- return status;
+ return msix_capability_init(dev, entries, nvec);
}
EXPORT_SYMBOL(pci_enable_msix);