Hi Markus,
> Adjust a jump target so that a bit of exception handling can be better
> reused at the end of this function.
>
> This issue was detected by using the Coccinelle software.
>
> Signed-off-by: Markus Elfring <elfring@xxxxxxxxxxxxxxxxxxxxx>
> ---
> drivers/bluetooth/btmrvl_sdio.c | 50 ++++++++++++++++-------------------------
> 1 file changed, 19 insertions(+), 31 deletions(-)
>
> diff --git a/drivers/bluetooth/btmrvl_sdio.c b/drivers/bluetooth/btmrvl_sdio.c
> index 0f020254fd39..df2a04bd8428 100644
> --- a/drivers/bluetooth/btmrvl_sdio.c
> +++ b/drivers/bluetooth/btmrvl_sdio.c
> @@ -949,31 +949,24 @@ static int btmrvl_sdio_register_dev(struct btmrvl_sdio_card *card)
> ret = sdio_set_block_size(card->func, SDIO_BLOCK_SIZE);
> if (ret) {
> BT_ERR("cannot set SDIO block size");
> - ret = -EIO;
> - goto release_irq;
> + goto release_with_eio;
> }
>
> reg = sdio_readb(func, card->reg->io_port_0, &ret);
> - if (ret < 0) {
> - ret = -EIO;
> - goto release_irq;
> - }
> + if (ret < 0)
> + goto release_with_eio;
>
> card->ioport = reg;
>
> reg = sdio_readb(func, card->reg->io_port_1, &ret);
> - if (ret < 0) {
> - ret = -EIO;
> - goto release_irq;
> - }
> + if (ret < 0)
> + goto release_with_eio;
>
> card->ioport |= (reg << 8);
>
> reg = sdio_readb(func, card->reg->io_port_2, &ret);
> - if (ret < 0) {
> - ret = -EIO;
> - goto release_irq;
> - }
> + if (ret < 0)
> + goto release_with_eio;
>
> card->ioport |= (reg << 16);
>
> @@ -981,26 +974,20 @@ static int btmrvl_sdio_register_dev(struct btmrvl_sdio_card *card)
>
> if (card->reg->int_read_to_clear) {
> reg = sdio_readb(func, card->reg->host_int_rsr, &ret);
> - if (ret < 0) {
> - ret = -EIO;
> - goto release_irq;
> - }
> + if (ret < 0)
> + goto release_with_eio;
> +
> sdio_writeb(func, reg | 0x3f, card->reg->host_int_rsr, &ret);
> - if (ret < 0) {
> - ret = -EIO;
> - goto release_irq;
> - }
> + if (ret < 0)
> + goto release_with_eio;
>
> reg = sdio_readb(func, card->reg->card_misc_cfg, &ret);
> - if (ret < 0) {
> - ret = -EIO;
> - goto release_irq;
> - }
> + if (ret < 0)
> + goto release_with_eio;
> +
> sdio_writeb(func, reg | 0x10, card->reg->card_misc_cfg, &ret);
> - if (ret < 0) {
> - ret = -EIO;
> - goto release_irq;
> - }
> + if (ret < 0)
> + goto release_with_eio;
> }
>
> sdio_set_drvdata(func, card);
> @@ -1009,7 +996,8 @@ static int btmrvl_sdio_register_dev(struct btmrvl_sdio_card *card)
>
> return 0;
>
> -release_irq:
> +release_with_eio:
> + ret = -EIO;
> sdio_release_irq(func);
>
> disable_func:
please do not send me any patches with renaming goto labels. I dislike long goto labels anyway and it doesn’t make it any better in mind.
In addition, this patch is half baked. If you want to do something, then you replace all err = -EIO and use this.
release_irq:
sdio_release_irq(func);
disable_func:
sdio_disable_func(func);
release_host:
sdio_release_host(func);
return -EIO;
And replace goto failed with return -EINVAL;
Regards
Marcel
--
To unsubscribe from this list: send the line "unsubscribe kernel-janitors" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
