| Message ID | 20201210135142.1138-1-zhengyongjun3@huawei.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [-next] drivers: gnss: simplify the gnss code return expression | expand |
On Thu, Dec 10, 2020 at 09:51:42PM +0800, Zheng Yongjun wrote: > Simplify the return expression at diffrent .c file, fix this all. > > Signed-off-by: Zheng Yongjun <zhengyongjun3@huawei.com> > --- > drivers/gnss/core.c | 7 +------ > drivers/gnss/mtk.c | 14 ++------------ > drivers/gnss/ubx.c | 14 ++------------ > 3 files changed, 5 insertions(+), 30 deletions(-) > static int __init gnss_module_init(void) > diff --git a/drivers/gnss/mtk.c b/drivers/gnss/mtk.c > index d1fc55560daf..451cb6e66ec3 100644 > --- a/drivers/gnss/mtk.c > +++ b/drivers/gnss/mtk.c > @@ -24,25 +24,15 @@ struct mtk_data { > static int mtk_set_active(struct gnss_serial *gserial) > { > struct mtk_data *data = gnss_serial_get_drvdata(gserial); > - int ret; > > - ret = regulator_enable(data->vcc); > - if (ret) > - return ret; > - > - return 0; > + return regulator_enable(data->vcc); > } These functions where written with explicit success paths on purpose so there's nothing to "fix" here. Johan
diff --git a/drivers/gnss/core.c b/drivers/gnss/core.c index e6f94501cb28..e6b9ac9da92c 100644 --- a/drivers/gnss/core.c +++ b/drivers/gnss/core.c @@ -368,13 +368,8 @@ ATTRIBUTE_GROUPS(gnss); static int gnss_uevent(struct device *dev, struct kobj_uevent_env *env) { struct gnss_device *gdev = to_gnss_device(dev); - int ret; - ret = add_uevent_var(env, "GNSS_TYPE=%s", gnss_type_name(gdev)); - if (ret) - return ret; - - return 0; + return add_uevent_var(env, "GNSS_TYPE=%s", gnss_type_name(gdev)); } static int __init gnss_module_init(void) diff --git a/drivers/gnss/mtk.c b/drivers/gnss/mtk.c index d1fc55560daf..451cb6e66ec3 100644 --- a/drivers/gnss/mtk.c +++ b/drivers/gnss/mtk.c @@ -24,25 +24,15 @@ struct mtk_data { static int mtk_set_active(struct gnss_serial *gserial) { struct mtk_data *data = gnss_serial_get_drvdata(gserial); - int ret; - ret = regulator_enable(data->vcc); - if (ret) - return ret; - - return 0; + return regulator_enable(data->vcc); } static int mtk_set_standby(struct gnss_serial *gserial) { struct mtk_data *data = gnss_serial_get_drvdata(gserial); - int ret; - ret = regulator_disable(data->vcc); - if (ret) - return ret; - - return 0; + return regulator_disable(data->vcc); } static int mtk_set_power(struct gnss_serial *gserial, diff --git a/drivers/gnss/ubx.c b/drivers/gnss/ubx.c index 7b05bc40532e..7a22fc901fab 100644 --- a/drivers/gnss/ubx.c +++ b/drivers/gnss/ubx.c @@ -24,25 +24,15 @@ struct ubx_data { static int ubx_set_active(struct gnss_serial *gserial) { struct ubx_data *data = gnss_serial_get_drvdata(gserial); - int ret; - ret = regulator_enable(data->vcc); - if (ret) - return ret; - - return 0; + return regulator_enable(data->vcc); } static int ubx_set_standby(struct gnss_serial *gserial) { struct ubx_data *data = gnss_serial_get_drvdata(gserial); - int ret; - ret = regulator_disable(data->vcc); - if (ret) - return ret; - - return 0; + return regulator_disable(data->vcc); } static int ubx_set_power(struct gnss_serial *gserial,
Simplify the return expression at diffrent .c file, fix this all. Signed-off-by: Zheng Yongjun <zhengyongjun3@huawei.com> --- drivers/gnss/core.c | 7 +------ drivers/gnss/mtk.c | 14 ++------------ drivers/gnss/ubx.c | 14 ++------------ 3 files changed, 5 insertions(+), 30 deletions(-)