Re: [RFC PATCH v2 2/6] net: Add netif_num_vf function

[Ben Hutchings <bhutchings@solarflare.com>]

On Thu, 2009-12-17 at 17:34 -0800, Jeff Kirsher wrote:
> From: Williams, Mitch A <mitch.a.williams@intel.com>
> 
> Add a convenience function to determine how many VF devices are associated
> with a given PF network interface. If the device is not an SR-IOV physical
> function device, the function returns 0.
[...]
> +/**
> + *	netif_num_vf - return number of SR-IOV VFs
> + *	@dev: network device
> + *
> + *	Return the number of SR-IOV virtual function devices that are
> + *	associated with this physical function device. Returns 0 if
> + *	device is not a PF device, or if SR-IOV not enabled.
> + */
> +static inline int netif_num_vf(const struct net_device *dev)
> +{
> +	struct pci_dev *pdev;
> +	int retval = 0;
> +
> +	if (!dev)
> +		goto out;

Why should this function allow dev == NULL?

> +	if (!dev->dev.parent)
> +		goto out;
> +
> +	if (dev->dev.parent->bus == &pci_bus_type) {
> +		pdev = to_pci_dev(dev->dev.parent);
> +		retval = pci_num_vf(pdev);
> +	}
> +out:
> +	return retval;
[...]

It would be much clearer to write:

	struct pci_dev *pdev;

	if (dev && dev->dev.parent &&
	    dev->dev.parent->bus == &pci_bus_type) {
		pdev = to_pci_dev(dev->dev.parent);
		return pci_num_vf(pdev);
	} else {
		return 0;
	}

Ben.

-- 
Ben Hutchings, Senior Software Engineer, Solarflare Communications
Not speaking for my employer; that's the marketing department's job.
They asked us to note that Solarflare product names are trademarked.