| Message ID | 20220826074856.253810-1-xu.panda@zte.com.cn (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [linux-next] usb: typec: tcpm: tcpci: Remove the unneeded result variable | expand |
On Fri, Aug 26, 2022 at 07:48:57AM +0000, cgel.zte@gmail.com wrote: > From: xupanda <xu.panda@zte.com.cn> > > Return the value regmap_update_bits() directly instead of > storing it in another redundant variable. > > Reported-by: Zeal Robot <zealci@zte.com.cn> > Signed-off-by: xupanda <xu.panda@zte.com.cn> > --- > drivers/usb/typec/tcpm/tcpci.c | 6 +----- > 1 file changed, 1 insertion(+), 5 deletions(-) > > diff --git a/drivers/usb/typec/tcpm/tcpci.c b/drivers/usb/typec/tcpm/tcpci.c > index b2bfcebe218f..4436e9e5e2f7 100644 > --- a/drivers/usb/typec/tcpm/tcpci.c > +++ b/drivers/usb/typec/tcpm/tcpci.c > @@ -328,11 +328,9 @@ static int tcpci_set_vconn(struct tcpc_dev *tcpc, bool enable) > static int tcpci_enable_auto_vbus_discharge(struct tcpc_dev *dev, bool enable) > { > struct tcpci *tcpci = tcpc_to_tcpci(dev); > - int ret; > > - ret = regmap_update_bits(tcpci->regmap, TCPC_POWER_CTRL, TCPC_POWER_CTRL_AUTO_DISCHARGE, > + return regmap_update_bits(tcpci->regmap, TCPC_POWER_CTRL, TCPC_POWER_CTRL_AUTO_DISCHARGE, > enable ? TCPC_POWER_CTRL_AUTO_DISCHARGE : 0); > - return ret; > } > > static int tcpci_set_auto_vbus_discharge_threshold(struct tcpc_dev *dev, enum typec_pwr_opmode mode, > @@ -884,5 +882,3 @@ static struct i2c_driver tcpci_i2c_driver = { > }; > module_i2c_driver(tcpci_i2c_driver); > > -MODULE_DESCRIPTION("USB Type-C Port Controller Interface driver"); > -MODULE_LICENSE("GPL"); Why are you removing those lines, and how is that related to the above change? thanks,
Hello! On 8/26/22 10:48 AM, cgel.zte@gmail.com wrote: > From: xupanda <xu.panda@zte.com.cn> > > Return the value regmap_update_bits() directly instead of > storing it in another redundant variable. > > Reported-by: Zeal Robot <zealci@zte.com.cn> > Signed-off-by: xupanda <xu.panda@zte.com.cn> Is that a real name? > --- > drivers/usb/typec/tcpm/tcpci.c | 6 +----- > 1 file changed, 1 insertion(+), 5 deletions(-) > > diff --git a/drivers/usb/typec/tcpm/tcpci.c b/drivers/usb/typec/tcpm/tcpci.c > index b2bfcebe218f..4436e9e5e2f7 100644 > --- a/drivers/usb/typec/tcpm/tcpci.c > +++ b/drivers/usb/typec/tcpm/tcpci.c > @@ -328,11 +328,9 @@ static int tcpci_set_vconn(struct tcpc_dev *tcpc, bool enable) > static int tcpci_enable_auto_vbus_discharge(struct tcpc_dev *dev, bool enable) > { > struct tcpci *tcpci = tcpc_to_tcpci(dev); > - int ret; > > - ret = regmap_update_bits(tcpci->regmap, TCPC_POWER_CTRL, TCPC_POWER_CTRL_AUTO_DISCHARGE, > + return regmap_update_bits(tcpci->regmap, TCPC_POWER_CTRL, TCPC_POWER_CTRL_AUTO_DISCHARGE, > enable ? TCPC_POWER_CTRL_AUTO_DISCHARGE : 0); You need to re-align this line now... > - return ret; > } > > static int tcpci_set_auto_vbus_discharge_threshold(struct tcpc_dev *dev, enum typec_pwr_opmode mode, > @@ -884,5 +882,3 @@ static struct i2c_driver tcpci_i2c_driver = { > }; > module_i2c_driver(tcpci_i2c_driver); > > -MODULE_DESCRIPTION("USB Type-C Port Controller Interface driver"); > -MODULE_LICENSE("GPL"); Hm, what's that? MBR, Sergey
diff --git a/drivers/usb/typec/tcpm/tcpci.c b/drivers/usb/typec/tcpm/tcpci.c index b2bfcebe218f..4436e9e5e2f7 100644 --- a/drivers/usb/typec/tcpm/tcpci.c +++ b/drivers/usb/typec/tcpm/tcpci.c @@ -328,11 +328,9 @@ static int tcpci_set_vconn(struct tcpc_dev *tcpc, bool enable) static int tcpci_enable_auto_vbus_discharge(struct tcpc_dev *dev, bool enable) { struct tcpci *tcpci = tcpc_to_tcpci(dev); - int ret; - ret = regmap_update_bits(tcpci->regmap, TCPC_POWER_CTRL, TCPC_POWER_CTRL_AUTO_DISCHARGE, + return regmap_update_bits(tcpci->regmap, TCPC_POWER_CTRL, TCPC_POWER_CTRL_AUTO_DISCHARGE, enable ? TCPC_POWER_CTRL_AUTO_DISCHARGE : 0); - return ret; } static int tcpci_set_auto_vbus_discharge_threshold(struct tcpc_dev *dev, enum typec_pwr_opmode mode, @@ -884,5 +882,3 @@ static struct i2c_driver tcpci_i2c_driver = { }; module_i2c_driver(tcpci_i2c_driver); -MODULE_DESCRIPTION("USB Type-C Port Controller Interface driver"); -MODULE_LICENSE("GPL");