Re: PCI: Remove users of pci_enable_device_bars()

[Jeff Garzik]

Linux Kernel Mailing List wrote:
> Commit:     0948391641918b95d8d96c15089eb5ac156850b3

>     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@xxxxxxxxxxxxxxxxxxx>
>     Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>

> --- a/drivers/ata/pata_cs5520.c
> +++ b/drivers/ata/pata_cs5520.c
> @@ -229,7 +229,7 @@ static int __devinit cs5520_init_one(struct pci_dev *pdev, const struct pci_devi
>  		return -ENOMEM;
>  
>  	/* Perform set up for DMA */
> -	if (pci_enable_device_bars(pdev, 1<<2)) {
> +	if (pci_enable_device_io(pdev)) {
>  		printk(KERN_ERR DRV_NAME ": unable to configure BAR2.\n");
>  		return -ENODEV;
>  	}
> diff --git a/drivers/ide/pci/cs5520.c b/drivers/ide/pci/cs5520.c
> index 6ec00b8..10adc49 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;
>  	}

So...  did the feedback mentioned in the commit log ever appear?  :)

	Jeff



--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/