Re: [patch 3/5][RFC] Update e100 driver to use devres.

[Tejun Heo <htejun@gmail.com>]

On Thu, Aug 02, 2007 at 03:45:37PM -0700, Brandon Philips wrote:
>  	if((err = pci_request_regions(pdev, DRV_NAME))) {
>  		DPRINTK(PROBE, ERR, "Cannot obtain PCI resources, aborting.\n");
> -		goto err_out_disable_pdev;
> +		return err;
>  	}
>  
>  	if((err = pci_set_dma_mask(pdev, DMA_32BIT_MASK))) {
>  		DPRINTK(PROBE, ERR, "No usable DMA configuration, aborting.\n");
> -		goto err_out_free_res;
> +		return err;
>  	}
>  
>  	SET_MODULE_OWNER(netdev);
> @@ -2613,11 +2606,11 @@ static int __devinit e100_probe(struct p
>  	if (use_io)
>  		DPRINTK(PROBE, INFO, "using i/o access mode\n");
>  
> -	nic->csr = pci_iomap(pdev, (use_io ? 1 : 0), sizeof(struct csr));
> +	nic->csr = pcim_iomap(pdev, (use_io ? 1 : 0), sizeof(struct csr));
>  	if(!nic->csr) {
>  		DPRINTK(PROBE, ERR, "Cannot map device registers, aborting.\n");
>  		err = -ENOMEM;
> -		goto err_out_free_res;
> +		return err;

Calls to pci_request_regions() and pcim_iomap() can be merged into
pcim_iomap_regions().

Other than that, Acked-by: Tejun Heo <htejun@gmail.com>

-- 
tejun