staging: typec: tcpci: Only touch target bit when enable vconn

Junlisuzhou · gregkh · commit 002514880ef3 · 2018-06-28T19:49:48.000+09:00
We need regmap_update_bits to avoid touch any other bits when
enable or disable vconn.

Reviewed-by: Guenter Roeck &lt;linux@roeck-us.net&gt;
Reviewed-by: Heikki Krogerus &lt;heikki.krogerus@linux.intel.com&gt;
Signed-off-by: Li Jun &lt;jun.li@nxp.com&gt;
Signed-off-by: Greg Kroah-Hartman &lt;gregkh@linuxfoundation.org&gt;
diff --git a/drivers/staging/typec/tcpci.c b/drivers/staging/typec/tcpci.c
@@ -218,12 +218,9 @@ static int tcpci_set_vconn(struct tcpc_dev *tcpc, bool enable)
 			return ret;
 	}
 
-	ret = regmap_write(tcpci->regmap, TCPC_POWER_CTRL,
-			   enable ? TCPC_POWER_CTRL_VCONN_ENABLE : 0);
-	if (ret < 0)
-		return ret;
-
-	return 0;
+	return regmap_update_bits(tcpci->regmap, TCPC_POWER_CTRL,
+				TCPC_POWER_CTRL_VCONN_ENABLE,
+				enable ? TCPC_POWER_CTRL_VCONN_ENABLE : 0);
 }
 
 static int tcpci_set_roles(struct tcpc_dev *tcpc, bool attached,

Original file line number	Diff line number	Diff line change
`@@ -218,12 +218,9 @@ static int tcpci_set_vconn(struct tcpc_dev *tcpc, bool enable)`
`218`	`218`	`return ret;`
`219`	`219`	`}`
`220`	`220`
`221`		`- ret = regmap_write(tcpci->regmap, TCPC_POWER_CTRL,`
`222`		`- enable ? TCPC_POWER_CTRL_VCONN_ENABLE : 0);`
`223`		`- if (ret < 0)`
`224`		`- return ret;`
`225`		`-`
`226`		`- return 0;`
	`221`	`+ return regmap_update_bits(tcpci->regmap, TCPC_POWER_CTRL,`
	`222`	`+ TCPC_POWER_CTRL_VCONN_ENABLE,`
	`223`	`+ enable ? TCPC_POWER_CTRL_VCONN_ENABLE : 0);`
`227`	`224`	`}`
`228`	`225`
`229`	`226`	`static int tcpci_set_roles(struct tcpc_dev *tcpc, bool attached,`