lkml.org 
[lkml]   [2014]   [Apr]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.11 061/182] IB/qib: add missing braces in do_qib_user_sdma_queue_create()
    Date
    3.11.10.9 -stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Yann Droneaud <ydroneaud@opteya.com>

    commit 37a967651caf99dd267017023737bd442f5acb3d upstream.

    Commit c804f07248895ff9c moved qib_assign_ctxt() to
    do_qib_user_sdma_queue_create() but dropped the braces
    around the statements.

    This was spotted by coccicheck (coccinelle/spatch):

    $ make C=2 CHECK=scripts/coccicheck drivers/infiniband/hw/qib/

    CHECK drivers/infiniband/hw/qib/qib_file_ops.c
    drivers/infiniband/hw/qib/qib_file_ops.c:1583:2-23: code aligned with following code on line 1587

    This patch adds braces back.

    Link: http://marc.info/?i=cover.1394485254.git.ydroneaud@opteya.com
    Cc: Mike Marciniszyn <mike.marciniszyn@intel.com>
    Cc: infinipath@intel.com
    Cc: Julia Lawall <julia.lawall@lip6.fr>
    Cc: cocci@systeme.lip6.fr
    Signed-off-by: Yann Droneaud <ydroneaud@opteya.com>
    Tested-by: Mike Marciniszyn <mike.marciniszyn@intel.com>
    Acked-by: Mike Marciniszyn <mike.marciniszyn@intel.com>
    Signed-off-by: Roland Dreier <roland@purestorage.com>
    Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
    ---
    drivers/infiniband/hw/qib/qib_file_ops.c | 3 ++-
    1 file changed, 2 insertions(+), 1 deletion(-)

    diff --git a/drivers/infiniband/hw/qib/qib_file_ops.c b/drivers/infiniband/hw/qib/qib_file_ops.c
    index b51a514..72d8781 100644
    --- a/drivers/infiniband/hw/qib/qib_file_ops.c
    +++ b/drivers/infiniband/hw/qib/qib_file_ops.c
    @@ -1578,7 +1578,7 @@ static int do_qib_user_sdma_queue_create(struct file *fp)
    struct qib_ctxtdata *rcd = fd->rcd;
    struct qib_devdata *dd = rcd->dd;

    - if (dd->flags & QIB_HAS_SEND_DMA)
    + if (dd->flags & QIB_HAS_SEND_DMA) {

    fd->pq = qib_user_sdma_queue_create(&dd->pcidev->dev,
    dd->unit,
    @@ -1586,6 +1586,7 @@ static int do_qib_user_sdma_queue_create(struct file *fp)
    fd->subctxt);
    if (!fd->pq)
    return -ENOMEM;
    + }

    return 0;
    }
    --
    1.9.1


    \
     
     \ /
      Last update: 2014-04-28 12:21    [W:5.177 / U:0.136 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site