Re: [PATCH v2] p54: Fix an error handling path in p54spi_probe()

[Christophe JAILLET]

Le 13/06/2022 à 22:02, Christian Lamparter a écrit :
> On Sun, Jun 12, 2022 at 11:12 PM Christophe JAILLET
> <christophe.jaillet@xxxxxxxxxx> wrote:
> > If an error occurs after a successful call to p54spi_request_firmware(), it
> > must be undone by a corresponding release_firmware() as already done in
> > the error handling path of p54spi_request_firmware() and in the .remove()
> > function.
> >
> > Add the missing call in the error handling path and remove it from
> > p54spi_request_firmware() now that it is the responsibility of the caller
> > to release the firmawre
>
> that last word hast a typo:  firmware. (maybe Kalle can fix this in post).

More or less the same typo twice in a row... _Embarrassed_

> > Fixes: cd8d3d321285 ("p54spi: p54spi driver")
> > Signed-off-by: Christophe JAILLET <christophe.jaillet@xxxxxxxxxx>
> Acked-by: Christian Lamparter <chunkeey@xxxxxxxxx>
> (Though, v1 was fine too.)
> > ---
> > v2: reduce diffstat and take advantage on the fact that release_firmware()
> > checks for NULL
>
> Heh, ok ;) . Now that I see it,  the "ret = p54_parse_firmware(...); ... "
> could have been replaced with "return p54_parse_firmware(dev, priv->firmware);"
> so the p54spi.c could shrink another 5-6 lines.
>
> I think leaving p54spi_request_firmware() callee to deal with
> releasing the firmware
> in the error case as well is nicer because it gets rid of a "but in
> this case" complexity.


Take the one you consider being the best one.

If it deserves a v3 to axe some lines of code, I can do it but, as said 
previously, v1 is for me the cleaner and more future proof.

CJ

> (I still have hope for the devres-firmware to hit some day).
>
> Cheers
> Christian
>
> > ---
> >   drivers/net/wireless/intersil/p54/p54spi.c | 3 ++-
> >   1 file changed, 2 insertions(+), 1 deletion(-)
> >
> > diff --git a/drivers/net/wireless/intersil/p54/p54spi.c b/drivers/net/wireless/intersil/p54/p54spi.c
> > index f99b7ba69fc3..19152fd449ba 100644
> > --- a/drivers/net/wireless/intersil/p54/p54spi.c
> > +++ b/drivers/net/wireless/intersil/p54/p54spi.c
> > @@ -164,7 +164,7 @@ static int p54spi_request_firmware(struct ieee80211_hw *dev)
> >
> >          ret = p54_parse_firmware(dev, priv->firmware);
> >          if (ret) {
> > -               release_firmware(priv->firmware);
> > +               /* the firmware is released by the caller */
> >                  return ret;
> >          }
> >
> > @@ -659,6 +659,7 @@ static int p54spi_probe(struct spi_device *spi)
> >          return 0;
> >
> >   err_free_common:
> > +       release_firmware(priv->firmware);
> >          free_irq(gpio_to_irq(p54spi_gpio_irq), spi);
> >   err_free_gpio_irq:
> >          gpio_free(p54spi_gpio_irq);
> > --
> > 2.34.1