diff options
author | Mark Einon <mark.einon@gmail.com> | 2011-10-23 05:22:45 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-10-23 05:35:12 -0400 |
commit | ac8f4837f2240c692b968cdeaa3275ecc2ed173f (patch) | |
tree | aee01677ee30759ce6f174fd3552249a8cde0925 | |
parent | 5ad5be581ed19becd184731fd0e9711abc5650c6 (diff) |
staging: et131x: Remove call to find pci pm capability
pci_find_capability is called, but not used and is now redundant as
power management is handled elsewhere. Removed.
Signed-off-by: Mark Einon <mark.einon@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r-- | drivers/staging/et131x/et131x.c | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/drivers/staging/et131x/et131x.c b/drivers/staging/et131x/et131x.c index f521e3319aab..9383c5c0c4f0 100644 --- a/drivers/staging/et131x/et131x.c +++ b/drivers/staging/et131x/et131x.c | |||
@@ -4356,7 +4356,6 @@ static int __devinit et131x_pci_setup(struct pci_dev *pdev, | |||
4356 | const struct pci_device_id *ent) | 4356 | const struct pci_device_id *ent) |
4357 | { | 4357 | { |
4358 | int result; | 4358 | int result; |
4359 | int pm_cap; | ||
4360 | struct net_device *netdev; | 4359 | struct net_device *netdev; |
4361 | struct et131x_adapter *adapter; | 4360 | struct et131x_adapter *adapter; |
4362 | int ii; | 4361 | int ii; |
@@ -4380,19 +4379,6 @@ static int __devinit et131x_pci_setup(struct pci_dev *pdev, | |||
4380 | 4379 | ||
4381 | pci_set_master(pdev); | 4380 | pci_set_master(pdev); |
4382 | 4381 | ||
4383 | /* Query PCI for Power Mgmt Capabilities | ||
4384 | * | ||
4385 | * NOTE: Now reading PowerMgmt in another location; is this still | ||
4386 | * needed? | ||
4387 | */ | ||
4388 | pm_cap = pci_find_capability(pdev, PCI_CAP_ID_PM); | ||
4389 | if (!pm_cap) { | ||
4390 | dev_err(&pdev->dev, | ||
4391 | "Cannot find Power Management capabilities\n"); | ||
4392 | result = -EIO; | ||
4393 | goto err_release_res; | ||
4394 | } | ||
4395 | |||
4396 | /* Check the DMA addressing support of this device */ | 4382 | /* Check the DMA addressing support of this device */ |
4397 | if (!dma_set_mask(&pdev->dev, DMA_BIT_MASK(64))) { | 4383 | if (!dma_set_mask(&pdev->dev, DMA_BIT_MASK(64))) { |
4398 | result = dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(64)); | 4384 | result = dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(64)); |