| Message ID | 20200921131058.92941-1-miaoqinglang@huawei.com |
|---|---|
| State | Accepted |
| Commit | 5608215665b905632dc0dd43c075aeffc00b3818 |
| Headers | show |
| Series | [-next] pinctrl: spear: simplify the return expression of tvc_connect() | expand |
On 21-09-20, 21:10, Qinglang Miao wrote: > Simplify the return expression. > > Signed-off-by: Qinglang Miao <miaoqinglang@huawei.com> > --- > drivers/pinctrl/spear/pinctrl-spear320.c | 8 +------- > 1 file changed, 1 insertion(+), 7 deletions(-) > > diff --git a/drivers/pinctrl/spear/pinctrl-spear320.c b/drivers/pinctrl/spear/pinctrl-spear320.c > index 99c10fc3d..e629e3035 100644 > --- a/drivers/pinctrl/spear/pinctrl-spear320.c > +++ b/drivers/pinctrl/spear/pinctrl-spear320.c > @@ -3418,8 +3418,6 @@ static const struct of_device_id spear320_pinctrl_of_match[] = { > > static int spear320_pinctrl_probe(struct platform_device *pdev) > { > - int ret; > - > spear3xx_machdata.groups = spear320_pingroups; > spear3xx_machdata.ngroups = ARRAY_SIZE(spear320_pingroups); > spear3xx_machdata.functions = spear320_functions; > @@ -3433,11 +3431,7 @@ static int spear320_pinctrl_probe(struct platform_device *pdev) > pmx_init_gpio_pingroup_addr(spear3xx_machdata.gpio_pingroups, > spear3xx_machdata.ngpio_pingroups, PMX_CONFIG_REG); > > - ret = spear_pinctrl_probe(pdev, &spear3xx_machdata); > - if (ret) > - return ret; > - > - return 0; > + return spear_pinctrl_probe(pdev, &spear3xx_machdata); > } > > static struct platform_driver spear320_pinctrl_driver = { Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
On Mon, Sep 21, 2020 at 3:10 PM Qinglang Miao <miaoqinglang@huawei.com> wrote: > Simplify the return expression. > > Signed-off-by: Qinglang Miao <miaoqinglang@huawei.com> Patch applied. Yours, Linus Walleij
diff --git a/drivers/pinctrl/spear/pinctrl-spear320.c b/drivers/pinctrl/spear/pinctrl-spear320.c index 99c10fc3d..e629e3035 100644 --- a/drivers/pinctrl/spear/pinctrl-spear320.c +++ b/drivers/pinctrl/spear/pinctrl-spear320.c @@ -3418,8 +3418,6 @@ static const struct of_device_id spear320_pinctrl_of_match[] = { static int spear320_pinctrl_probe(struct platform_device *pdev) { - int ret; - spear3xx_machdata.groups = spear320_pingroups; spear3xx_machdata.ngroups = ARRAY_SIZE(spear320_pingroups); spear3xx_machdata.functions = spear320_functions; @@ -3433,11 +3431,7 @@ static int spear320_pinctrl_probe(struct platform_device *pdev) pmx_init_gpio_pingroup_addr(spear3xx_machdata.gpio_pingroups, spear3xx_machdata.ngpio_pingroups, PMX_CONFIG_REG); - ret = spear_pinctrl_probe(pdev, &spear3xx_machdata); - if (ret) - return ret; - - return 0; + return spear_pinctrl_probe(pdev, &spear3xx_machdata); } static struct platform_driver spear320_pinctrl_driver = {
Simplify the return expression. Signed-off-by: Qinglang Miao <miaoqinglang@huawei.com> --- drivers/pinctrl/spear/pinctrl-spear320.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-)