Re: [PATCH v2] RDMA/core: Make function rdma_copy_addr return void

[Leon Romanovsky <leonro-VPRAkNaXOzVWk0Htik3J/w@public.gmane.org>]

[-- Attachment #1: Type: text/plain, Size: 3632 bytes --]

On Tue, Nov 07, 2017 at 08:44:24AM +0200, Yuval Shaia wrote:
> Function returns zero - make it void.
>
> While there make struct net_device const.
>
> Signed-off-by: Yuval Shaia <yuval.shaia-QHcLZuEGTsvQT0dZR+AlfA@public.gmane.org>
> Reviewed-by: Parav Pandit <parav-VPRAkNaXOzVWk0Htik3J/w@public.gmane.org>
> ---
> v0 -> v1:
> 	* Accept comment from Parav Pandit and make struct net_device const
> v1 -> v2:
> 	* s/IB/RDMA (header)
> 	* Add Parav Pandit r-b
> ---
>  drivers/infiniband/core/addr.c | 26 ++++++++++++++------------
>  drivers/infiniband/core/cma.c  |  8 ++------
>  include/rdma/ib_addr.h         |  5 +++--
>  3 files changed, 19 insertions(+), 20 deletions(-)
>
> diff --git a/drivers/infiniband/core/addr.c b/drivers/infiniband/core/addr.c
> index 12523f630b61..a80a4040352a 100644
> --- a/drivers/infiniband/core/addr.c
> +++ b/drivers/infiniband/core/addr.c
> @@ -229,8 +229,9 @@ void rdma_addr_unregister_client(struct rdma_addr_client *client)
>  }
>  EXPORT_SYMBOL(rdma_addr_unregister_client);
>
> -int rdma_copy_addr(struct rdma_dev_addr *dev_addr, struct net_device *dev,
> -		     const unsigned char *dst_dev_addr)
> +void rdma_copy_addr(struct rdma_dev_addr *dev_addr,
> +		    const struct net_device *dev,
> +		    const unsigned char *dst_dev_addr)
>  {
>  	dev_addr->dev_type = dev->type;
>  	memcpy(dev_addr->src_dev_addr, dev->dev_addr, MAX_ADDR_LEN);
> @@ -238,7 +239,6 @@ int rdma_copy_addr(struct rdma_dev_addr *dev_addr, struct net_device *dev,
>  	if (dst_dev_addr)
>  		memcpy(dev_addr->dst_dev_addr, dst_dev_addr, MAX_ADDR_LEN);
>  	dev_addr->bound_dev_if = dev->ifindex;
> -	return 0;
>  }
>  EXPORT_SYMBOL(rdma_copy_addr);
>
> @@ -247,15 +247,14 @@ int rdma_translate_ip(const struct sockaddr *addr,
>  		      u16 *vlan_id)
>  {
>  	struct net_device *dev;
> -	int ret = -EADDRNOTAVAIL;
>
>  	if (dev_addr->bound_dev_if) {
>  		dev = dev_get_by_index(dev_addr->net, dev_addr->bound_dev_if);
>  		if (!dev)
>  			return -ENODEV;
> -		ret = rdma_copy_addr(dev_addr, dev, NULL);
> +		rdma_copy_addr(dev_addr, dev, NULL);
>  		dev_put(dev);
> -		return ret;
> +		return 0;
>  	}
>
>  	switch (addr->sa_family) {
> @@ -264,9 +263,9 @@ int rdma_translate_ip(const struct sockaddr *addr,
>  			((const struct sockaddr_in *)addr)->sin_addr.s_addr);
>
>  		if (!dev)
> -			return ret;
> +			return -EADDRNOTAVAIL;
>
> -		ret = rdma_copy_addr(dev_addr, dev, NULL);
> +		rdma_copy_addr(dev_addr, dev, NULL);
>  		dev_addr->bound_dev_if = dev->ifindex;
>  		if (vlan_id)
>  			*vlan_id = rdma_vlan_dev_vlan_id(dev);
> @@ -279,7 +278,7 @@ int rdma_translate_ip(const struct sockaddr *addr,
>  			if (ipv6_chk_addr(dev_addr->net,
>  					  &((const struct sockaddr_in6 *)addr)->sin6_addr,
>  					  dev, 1)) {
> -				ret = rdma_copy_addr(dev_addr, dev, NULL);
> +				rdma_copy_addr(dev_addr, dev, NULL);
>  				dev_addr->bound_dev_if = dev->ifindex;
>  				if (vlan_id)
>  					*vlan_id = rdma_vlan_dev_vlan_id(dev);
> @@ -290,7 +289,7 @@ int rdma_translate_ip(const struct sockaddr *addr,
>  		break;
>  #endif
>  	}
> -	return ret;
> +	return 0;
>  }
>  EXPORT_SYMBOL(rdma_translate_ip);
>
> @@ -346,7 +345,8 @@ static int dst_fetch_ha(struct dst_entry *dst, struct rdma_dev_addr *dev_addr,
>  			neigh_event_send(n, NULL);
>  		ret = -ENODATA;
>  	} else {
> -		ret = rdma_copy_addr(dev_addr, dst->dev, n->ha);
> +		rdma_copy_addr(dev_addr, dst->dev, n->ha);
> +		ret = 0;

Except very little comment, that is is better to set 0 to "ret"
at the initialization phase and save assignment here.

Looks good, thanks Yuval.
Reviewed-by: Leon Romanovsky <leonro-VPRAkNaXOzVWk0Htik3J/w@public.gmane.org>

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]