Re: [PATCH v2 4/8] phy: kill useless local variables

[Joe Perches <joe@perches.com>]

On Sun, 2014-01-05 at 03:21 +0300, Sergei Shtylyov wrote:
> A number of functions (especially in phy.c) has local variables that were hardly
> needed in the first place -- remove them.
[]
> +++ net-next/drivers/net/phy/phy.c
> @@ -67,12 +67,10 @@ EXPORT_SYMBOL(phy_print_status);
>   */
>  static int phy_clear_interrupt(struct phy_device *phydev)
>  {
> -	int err = 0;
> -
>  	if (phydev->drv->ack_interrupt)
> -		err = phydev->drv->ack_interrupt(phydev);
> +		return phydev->drv->ack_interrupt(phydev);
>  
> -	return err;
> +	return 0;
>  }

My preference for this sort of conversion would be to
make the generic return at the bottom of the block like:

static int phy_clear_interrupt(struct phy_device *phydev)
{
	if (!phydev->drv->ack_interrupt)
		return 0;

	return phydev->drv->ack_interrupt(phydev);
}

> @@ -84,13 +82,11 @@ static int phy_clear_interrupt(struct ph
>   */
>  static int phy_config_interrupt(struct phy_device *phydev, u32 interrupts)
>  {
> -	int err = 0;
> -
>  	phydev->interrupts = interrupts;
>  	if (phydev->drv->config_intr)
> -		err = phydev->drv->config_intr(phydev);
> +		return phydev->drv->config_intr(phydev);
>  
> -	return err;
> +	return 0;
>  }

etc..,