Re: [PATCH v34 net-next 1/8] net/nebula-matrix: add channel layer

[Breno Leitao <leitao@debian.org>]

> @@ -75,27 +215,32 @@ static int nbl_probe(struct pci_dev *pdev,
>  	struct nbl_adapter *adapter;
>  	int err;
>  
> +	nbl_get_func_param(pdev, id->driver_data, &param);
>  	err = pcim_enable_device(pdev);
>  	if (err) {
>  		dev_err(&pdev->dev, "Failed to enable PCI dev, err=%d\n", err);
>  		return err;
>  	}
>  
> -	nbl_get_func_param(pdev, id->driver_data, &param);
>  	/* never return fail when DMA_BIT_MASK(64) */
>  	dma_set_mask_and_coherent(dev, DMA_BIT_MASK(64));
>  
>  	pci_set_master(pdev);
>  
> +	err = nbl_probe_chip_deps(pdev, param.caps.has_ctrl);
> +	if (err)
> +		goto out_clear_master;
> +
>  	adapter = nbl_core_init(pdev, &param);
>  	if (IS_ERR(adapter)) {
>  		dev_err(dev, "Nbl adapter init fail: %pe\n", adapter);
>  		err = PTR_ERR(adapter);
> -		goto adapter_init_err;
> +		goto out_clear_master;
>  	}

nbl_get_func_param() now runs before pcim_enable_device(), but
nbl_probe_chip_deps() still runs after pcim_enable_device() and
pci_set_master().

Shouldn't nbl_probe_chip_deps() be on called earlier?