Commit 1bae7589 authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Andi Shyti
Browse files

i2c: rcar: tidyup priv->devtype handling on rcar_i2c_probe() 



rcar_i2c_probe() has priv->devtype operation, but handling (A) and (C)
in same place is more understandable ( (A) and (B) are independent).

(A)	if (priv->devtype < I2C_RCAR_GEN3) {
		...
	}

(B)	...

(C)	if (priv->devtype >= I2C_RCAR_GEN3) {
		...
	}

Let's merge it with if-else

Signed-off-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Reviewed-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Reviewed-by: default avatarWolfram Sang <wsa+renesas@sang-engineering.com>
Signed-off-by: default avatarAndi Shyti <andi.shyti@kernel.org>
parent c9e8f5a5

drivers/i2c/busses/i2c-rcar.c

+5 −7
Original line number Diff line number Diff line
@@ -1164,11 +1164,6 @@ static int rcar_i2c_probe(struct platform_device *pdev) 
	rcar_i2c_init(priv);

	rcar_i2c_reset_slave(priv);



	if (priv->devtype < I2C_RCAR_GEN3) {

		irqflags |= IRQF_NO_THREAD;

		irqhandler = rcar_i2c_gen2_irq;

	}



	/* Stay always active when multi-master to keep arbitration working */

	if (of_property_read_bool(dev->of_node, "multi-master"))

		priv->flags |= ID_P_PM_BLOCKED;
@@ -1178,8 +1173,11 @@ static int rcar_i2c_probe(struct platform_device *pdev) 
	if (of_property_read_bool(dev->of_node, "smbus"))

		priv->flags |= ID_P_HOST_NOTIFY;



	if (priv->devtype < I2C_RCAR_GEN3) {

		irqflags |= IRQF_NO_THREAD;

		irqhandler = rcar_i2c_gen2_irq;

	} else {

		/* R-Car Gen3+ needs a reset before every transfer */

	if (priv->devtype >= I2C_RCAR_GEN3) {

		priv->rstc = devm_reset_control_get_exclusive(&pdev->dev, NULL);

		if (IS_ERR(priv->rstc)) {

			ret = PTR_ERR(priv->rstc);