PCI: Remove users of pci_enable_device_bars()

This patch converts users of pci_enable_device_bars() to the new
pci_enable_device_{io,mem} interface.

The new API fits nicely, except maybe for the QLA case where a bit of
code re-organization might be a good idea but I prefer sticking to the
simple patch as I don't have hardware to test on.

I'll also need some feedback on the cs5520 change.

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

2 files changed, 12 insertions, 4 deletions

diff --git a/drivers/ide/pci/cs5520.c b/drivers/ide/pci/cs5520.c
index 6ec00b8d7ec1..10adc49f80ca 100644
--- a/drivers/ide/pci/cs5520.c
+++ b/drivers/ide/pci/cs5520.c
@@ -156,8 +156,14 @@ static int __devinit cs5520_init_one(struct pci_dev *dev, const struct pci_devic
         ide_setup_pci_noise(dev, d);
 
         /* We must not grab the entire device, it has 'ISA' space in its
-           BARS too and we will freak out other bits of the kernel */
-        if (pci_enable_device_bars(dev, 1<<2)) {
+         * BARS too and we will freak out other bits of the kernel
+         *
+         * pci_enable_device_bars() is going away. I replaced it with
+         * IO only enable for now but I'll need confirmation this is
+         * allright for that device. If not, it will need some kind of
+         * quirk. --BenH.
+         */
+        if (pci_enable_device_io(dev)) {
                 printk(KERN_WARNING "%s: Unable to enable 55x0.\n", d->name);
                 return -ENODEV;
         }
diff --git a/drivers/ide/setup-pci.c b/drivers/ide/setup-pci.c
index 676c66e72881..cf79470a932d 100644
--- a/drivers/ide/setup-pci.c
+++ b/drivers/ide/setup-pci.c
@@ -240,7 +240,9 @@ EXPORT_SYMBOL_GPL(ide_setup_pci_noise);
  *      @d: IDE port info
  *
  *      Enable the IDE PCI device. We attempt to enable the device in full
- *      but if that fails then we only need BAR4 so we will enable that.
+ *      but if that fails then we only need IO space. The PCI code should
+ *      have setup the proper resources for us already for controllers in
+ *      legacy mode.
  *      
  *      Returns zero on success or an error code
  */
@@ -250,7 +252,7 @@ static int ide_pci_enable(struct pci_dev *dev, const struct ide_port_info *d)
         int ret;
 
         if (pci_enable_device(dev)) {
-                ret = pci_enable_device_bars(dev, 1 << 4);
+                ret = pci_enable_device_io(dev);
                 if (ret < 0) {
                         printk(KERN_WARNING "%s: (ide_setup_pci_device:) "
                                 "Could not enable device.\n", d->name);