lkml.org 
[lkml]   [2016]   [Jan]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    Date
    From
    SubjectRe: [PATCH] net-libertas: Better exception handling in if_spi_host_to_card_worker()


    On Fri, 1 Jan 2016, SF Markus Elfring wrote:

    > From: Markus Elfring <elfring@users.sourceforge.net>
    > Date: Fri, 1 Jan 2016 22:27:20 +0100
    >
    > This issue was detected by using the Coccinelle software.
    >
    > Move the jump label directly before the desired log statement
    > so that the variable "err" will not be checked once more
    > after it was determined that a function call failed.

    Putting a label inside an if is ugly.

    julia

    > Use the identifier "report_failure" instead of the label "err".
    >
    > Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
    > ---
    > drivers/net/wireless/marvell/libertas/if_spi.c | 11 ++++++-----
    > 1 file changed, 6 insertions(+), 5 deletions(-)
    >
    > diff --git a/drivers/net/wireless/marvell/libertas/if_spi.c b/drivers/net/wireless/marvell/libertas/if_spi.c
    > index 82c0796..c9ae27e 100644
    > --- a/drivers/net/wireless/marvell/libertas/if_spi.c
    > +++ b/drivers/net/wireless/marvell/libertas/if_spi.c
    > @@ -880,18 +880,18 @@ static void if_spi_host_to_card_worker(struct work_struct *work)
    > &hiStatus);
    > if (err) {
    > netdev_err(priv->dev, "I/O error\n");
    > - goto err;
    > + goto report_failure;
    > }
    >
    > if (hiStatus & IF_SPI_HIST_CMD_UPLOAD_RDY) {
    > err = if_spi_c2h_cmd(card);
    > if (err)
    > - goto err;
    > + goto report_failure;
    > }
    > if (hiStatus & IF_SPI_HIST_RX_UPLOAD_RDY) {
    > err = if_spi_c2h_data(card);
    > if (err)
    > - goto err;
    > + goto report_failure;
    > }
    >
    > /*
    > @@ -940,9 +940,10 @@ static void if_spi_host_to_card_worker(struct work_struct *work)
    > if (hiStatus & IF_SPI_HIST_CARD_EVENT)
    > if_spi_e2h(card);
    >
    > -err:
    > - if (err)
    > + if (err) {
    > +report_failure:
    > netdev_err(priv->dev, "%s: got error %d\n", __func__, err);
    > + }
    >
    > lbs_deb_leave(LBS_DEB_SPI);
    > }
    > --
    > 2.6.3
    >
    > --
    > To unsubscribe from this list: send the line "unsubscribe kernel-janitors" in
    > the body of a message to majordomo@vger.kernel.org
    > More majordomo info at http://vger.kernel.org/majordomo-info.html
    >


    \
     
     \ /
      Last update: 2016-01-01 23:21    [W:4.131 / U:0.012 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site