Re: [PATCH] i2c: viperboard: clean up inconsistent indenting

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On Fri, Jul 17, 2015 at 01:01:23PM +0100, Colin King wrote:
> From: Colin Ian King <colin.king@xxxxxxxxxxxxx>
> 
> Minor clean up of indenting, no functional change
> 
> Signed-off-by: Colin Ian King <colin.king@xxxxxxxxxxxxx>
> ---

Applied to for-next, thanks!

>  drivers/i2c/busses/i2c-viperboard.c | 11 ++++++-----
>  1 file changed, 6 insertions(+), 5 deletions(-)
> 
> diff --git a/drivers/i2c/busses/i2c-viperboard.c b/drivers/i2c/busses/i2c-viperboard.c
> index 47e88ad..30cce15 100644
> --- a/drivers/i2c/busses/i2c-viperboard.c
> +++ b/drivers/i2c/busses/i2c-viperboard.c
> @@ -391,11 +391,12 @@ static int vprbrd_i2c_probe(struct platform_device *pdev)
>  			VPRBRD_USB_REQUEST_I2C_FREQ, VPRBRD_USB_TYPE_OUT,
>  			0x0000, 0x0000, &vb_i2c->bus_freq_param, 1,
>  			VPRBRD_USB_TIMEOUT_MS);
> -	    if (ret != 1) {
> -		dev_err(&pdev->dev,
> -			"failure setting i2c_bus_freq to %d\n", i2c_bus_freq);
> -		return -EIO;
> -	    }
> +		if (ret != 1) {
> +			dev_err(&pdev->dev,
> +				"failure setting i2c_bus_freq to %d\n",

Squashed those two lines into one, though.

> +				i2c_bus_freq);
> +			return -EIO;
> +		}
>  	} else {
>  		dev_err(&pdev->dev,
>  			"invalid i2c_bus_freq setting:%d\n", i2c_bus_freq);
> -- 
> 2.1.4
> 

Attachment: signature.asc
Description: Digital signature


[Index of Archives]     [Linux GPIO]     [Linux SPI]     [Linux Hardward Monitoring]     [LM Sensors]     [Linux USB Devel]     [Linux Media]     [Video for Linux]     [Linux Audio Users]     [Yosemite News]     [Linux Kernel]     [Linux SCSI]

  Powered by Linux