| Message ID | 20210715064206.3193-1-thunder.leizhen@huawei.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | pinctrl: single: Fix error return code in pcs_parse_bits_in_pinctrl_entry() | expand |
> Fix to return -ENOTSUPP instead of 0 when PCS_HAS_PINCONF is true, which > is the same as that returned in pcs_parse_pinconf(). > > In addition, I found the value of pcs->flags is not overwritten in > pcs_parse_bits_in_pinctrl_entry() and its subfunctions, so moving this > check to the beginning of the function eliminates unnecessary rollback > operations. > > Fixes: 4e7e8017a80e ("pinctrl: pinctrl-single: enhance to configure multiple pins of different modules") > Reported-by: Hulk Robot <hulkci@huawei.com> > Signed-off-by: Zhen Lei <thunder.leizhen@huawei.com> > --- > drivers/pinctrl/pinctrl-single.c | 21 ++++++++------------- > 1 file changed, 8 insertions(+), 13 deletions(-) > > > npins_in_row = pcs->width / pcs->bits_per_pin; > > vals = devm_kzalloc(pcs->dev, > @@ -1212,29 +1217,19 @@ static int pcs_parse_bits_in_pinctrl_entry(struct pcs_device *pcs, > goto free_pins; > } > > - gsel = pinctrl_generic_add_group(pcs->pctl, np->name, pins, found, pcs); > - if (gsel < 0) { > - res = gsel; > + res = pinctrl_generic_add_group(pcs->pctl, np->name, pins, found, pcs); > + if (res < 0) > goto free_function; > - } This change cause 'gsel' not set. Do not mix this cleanup with bugfix.
On 2021/7/15 19:49, weiyongjun (A) wrote: >> Fix to return -ENOTSUPP instead of 0 when PCS_HAS_PINCONF is true, which >> is the same as that returned in pcs_parse_pinconf(). >> >> In addition, I found the value of pcs->flags is not overwritten in >> pcs_parse_bits_in_pinctrl_entry() and its subfunctions, so moving this >> check to the beginning of the function eliminates unnecessary rollback >> operations. >> >> Fixes: 4e7e8017a80e ("pinctrl: pinctrl-single: enhance to configure multiple pins of different modules") >> Reported-by: Hulk Robot <hulkci@huawei.com> >> Signed-off-by: Zhen Lei <thunder.leizhen@huawei.com> >> --- >> drivers/pinctrl/pinctrl-single.c | 21 ++++++++------------- >> 1 file changed, 8 insertions(+), 13 deletions(-) >> >> >> npins_in_row = pcs->width / pcs->bits_per_pin; >> vals = devm_kzalloc(pcs->dev, >> @@ -1212,29 +1217,19 @@ static int pcs_parse_bits_in_pinctrl_entry(struct pcs_device *pcs, >> goto free_pins; >> } >> - gsel = pinctrl_generic_add_group(pcs->pctl, np->name, pins, found, pcs); >> - if (gsel < 0) { >> - res = gsel; >> + res = pinctrl_generic_add_group(pcs->pctl, np->name, pins, found, pcs); >> + if (res < 0) >> goto free_function; >> - } > > > This change cause 'gsel' not set. > > Do not mix this cleanup with bugfix. gsel已经不需要了，已经被我删掉了 > > > > . >
On 2021/7/15 19:49, weiyongjun (A) wrote: >> Fix to return -ENOTSUPP instead of 0 when PCS_HAS_PINCONF is true, which >> is the same as that returned in pcs_parse_pinconf(). >> >> In addition, I found the value of pcs->flags is not overwritten in >> pcs_parse_bits_in_pinctrl_entry() and its subfunctions, so moving this >> check to the beginning of the function eliminates unnecessary rollback >> operations. >> >> Fixes: 4e7e8017a80e ("pinctrl: pinctrl-single: enhance to configure multiple pins of different modules") >> Reported-by: Hulk Robot <hulkci@huawei.com> >> Signed-off-by: Zhen Lei <thunder.leizhen@huawei.com> >> --- >> drivers/pinctrl/pinctrl-single.c | 21 ++++++++------------- >> 1 file changed, 8 insertions(+), 13 deletions(-) >> >> >> npins_in_row = pcs->width / pcs->bits_per_pin; >> vals = devm_kzalloc(pcs->dev, >> @@ -1212,29 +1217,19 @@ static int pcs_parse_bits_in_pinctrl_entry(struct pcs_device *pcs, >> goto free_pins; >> } >> - gsel = pinctrl_generic_add_group(pcs->pctl, np->name, pins, found, pcs); >> - if (gsel < 0) { >> - res = gsel; >> + res = pinctrl_generic_add_group(pcs->pctl, np->name, pins, found, pcs); >> + if (res < 0) >> goto free_function; >> - } > > > This change cause 'gsel' not set. The local variable 'gsel' is no longer needed. I have deleted it. > > Do not mix this cleanup with bugfix. Yes, it might be clearer. > > > > . >
diff --git a/drivers/pinctrl/pinctrl-single.c b/drivers/pinctrl/pinctrl-single.c index e3aa64798f7d..d8b4dc40f3c6 100644 --- a/drivers/pinctrl/pinctrl-single.c +++ b/drivers/pinctrl/pinctrl-single.c @@ -1115,7 +1115,7 @@ static int pcs_parse_bits_in_pinctrl_entry(struct pcs_device *pcs, { const char *name = "pinctrl-single,bits"; struct pcs_func_vals *vals; - int rows, *pins, found = 0, res = -ENOMEM, i, fsel, gsel; + int rows, *pins, found = 0, res = -ENOMEM, i, fsel; int npins_in_row; struct pcs_function *function = NULL; @@ -1125,6 +1125,11 @@ static int pcs_parse_bits_in_pinctrl_entry(struct pcs_device *pcs, return -EINVAL; } + if (PCS_HAS_PINCONF) { + dev_err(pcs->dev, "pinconf not supported\n"); + return -ENOTSUPP; + } + npins_in_row = pcs->width / pcs->bits_per_pin; vals = devm_kzalloc(pcs->dev, @@ -1212,29 +1217,19 @@ static int pcs_parse_bits_in_pinctrl_entry(struct pcs_device *pcs, goto free_pins; } - gsel = pinctrl_generic_add_group(pcs->pctl, np->name, pins, found, pcs); - if (gsel < 0) { - res = gsel; + res = pinctrl_generic_add_group(pcs->pctl, np->name, pins, found, pcs); + if (res < 0) goto free_function; - } (*map)->type = PIN_MAP_TYPE_MUX_GROUP; (*map)->data.mux.group = np->name; (*map)->data.mux.function = np->name; - if (PCS_HAS_PINCONF) { - dev_err(pcs->dev, "pinconf not supported\n"); - goto free_pingroups; - } - *num_maps = 1; mutex_unlock(&pcs->mutex); return 0; -free_pingroups: - pinctrl_generic_remove_group(pcs->pctl, gsel); - *num_maps = 1; free_function: pinmux_generic_remove_function(pcs->pctl, fsel); free_pins:
Fix to return -ENOTSUPP instead of 0 when PCS_HAS_PINCONF is true, which is the same as that returned in pcs_parse_pinconf(). In addition, I found the value of pcs->flags is not overwritten in pcs_parse_bits_in_pinctrl_entry() and its subfunctions, so moving this check to the beginning of the function eliminates unnecessary rollback operations. Fixes: 4e7e8017a80e ("pinctrl: pinctrl-single: enhance to configure multiple pins of different modules") Reported-by: Hulk Robot <hulkci@huawei.com> Signed-off-by: Zhen Lei <thunder.leizhen@huawei.com> --- drivers/pinctrl/pinctrl-single.c | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-)