Commit 95ddc5f2 authored by Inaky Perez-Gonzalez's avatar Inaky Perez-Gonzalez Committed by Greg Kroah-Hartman

PCI: pci_{enable,disable}_device() nestable ports

Change drivers/message/i20 pci driver to simply do a nestable
enable()/disable() instead of checking for it.
Signed-off-by: default avatarInaky Perez-Gonzalez <inaky@linux.intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent bae94d02
...@@ -320,7 +320,6 @@ static int __devinit i2o_pci_probe(struct pci_dev *pdev, ...@@ -320,7 +320,6 @@ static int __devinit i2o_pci_probe(struct pci_dev *pdev,
struct i2o_controller *c; struct i2o_controller *c;
int rc; int rc;
struct pci_dev *i960 = NULL; struct pci_dev *i960 = NULL;
int enabled = pdev->is_enabled;
printk(KERN_INFO "i2o: Checking for PCI I2O controllers...\n"); printk(KERN_INFO "i2o: Checking for PCI I2O controllers...\n");
...@@ -330,7 +329,6 @@ static int __devinit i2o_pci_probe(struct pci_dev *pdev, ...@@ -330,7 +329,6 @@ static int __devinit i2o_pci_probe(struct pci_dev *pdev,
return -ENODEV; return -ENODEV;
} }
if (!enabled)
if ((rc = pci_enable_device(pdev))) { if ((rc = pci_enable_device(pdev))) {
printk(KERN_WARNING "i2o: couldn't enable device %s\n", printk(KERN_WARNING "i2o: couldn't enable device %s\n",
pci_name(pdev)); pci_name(pdev));
...@@ -442,7 +440,6 @@ static int __devinit i2o_pci_probe(struct pci_dev *pdev, ...@@ -442,7 +440,6 @@ static int __devinit i2o_pci_probe(struct pci_dev *pdev,
i2o_iop_free(c); i2o_iop_free(c);
disable: disable:
if (!enabled)
pci_disable_device(pdev); pci_disable_device(pdev);
return rc; return rc;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment