RDMA/srpt: Improve coding style conformance

Use tabs instead of spaces for indentation. Make sure that multi-line
expressions have the operator at the end of a line instead of the start.
Avoid a complaint about a missing space in a ternary expression by
changing '(boolean) ? 1: 0' into 'boolean'.

Cc: Sergey Gorenko <sergeygo@mellanox.com>
Cc: Max Gurtovoy <maxg@mellanox.com>
Cc: Laurence Oberman <loberman@redhat.com>
Signed-off-by: Bart Van Assche <bvanassche@acm.org>
Signed-off-by: Doug Ledford <dledford@redhat.com>

diff --git a/drivers/infiniband/ulp/srpt/ib_srpt.c b/drivers/infiniband/ulp/srpt/ib_srpt.c
index 02d9b758e58fed0d8487ffbe1c543f7f501c2c6f..6124ff46923abd8bd0e68f97d37f914125432923 100644 (file)
--- a/drivers/infiniband/ulp/srpt/ib_srpt.c
+++ b/drivers/infiniband/ulp/srpt/ib_srpt.c
@@ -716,8 +716,8 @@ static struct srpt_ioctx **srpt_alloc_ioctx_ring(struct srpt_device *sdev,
        struct srpt_ioctx **ring;
        int i;
 
-       WARN_ON(ioctx_size != sizeof(struct srpt_recv_ioctx)
-               && ioctx_size != sizeof(struct srpt_send_ioctx));
+       WARN_ON(ioctx_size != sizeof(struct srpt_recv_ioctx) &&
+               ioctx_size != sizeof(struct srpt_send_ioctx));
 
        ring = kvmalloc_array(ring_size, sizeof(ring[0]), GFP_KERNEL);
        if (!ring)
@@ -1025,7 +1025,7 @@ static int srpt_get_desc_tbl(struct srpt_send_ioctx *ioctx,
 
        if (((srp_cmd->buf_fmt & 0xf) == SRP_DATA_DESC_DIRECT) ||
            ((srp_cmd->buf_fmt >> 4) == SRP_DATA_DESC_DIRECT)) {
-               struct srp_direct_buf *db = srpt_get_desc_buf(srp_cmd);
+               struct srp_direct_buf *db = srpt_get_desc_buf(srp_cmd);
 
                *data_len = be32_to_cpu(db->len);
                return srpt_alloc_rw_ctxs(ioctx, db, 1, sg, sg_cnt);
@@ -3580,7 +3580,7 @@ static ssize_t srpt_tpg_enable_show(struct config_item *item, char *page)
        struct se_portal_group *se_tpg = to_tpg(item);
        struct srpt_port *sport = srpt_tpg_to_sport(se_tpg);
 
-       return snprintf(page, PAGE_SIZE, "%d\n", (sport->enabled) ? 1: 0);
+       return snprintf(page, PAGE_SIZE, "%d\n", sport->enabled);
 }
 
 static ssize_t srpt_tpg_enable_store(struct config_item *item,
@@ -3589,7 +3589,7 @@ static ssize_t srpt_tpg_enable_store(struct config_item *item,
        struct se_portal_group *se_tpg = to_tpg(item);
        struct srpt_port *sport = srpt_tpg_to_sport(se_tpg);
        unsigned long tmp;
-        int ret;
+       int ret;
 
        ret = kstrtoul(page, 0, &tmp);
        if (ret < 0) {

diff --git a/drivers/infiniband/ulp/srpt/ib_srpt.h b/drivers/infiniband/ulp/srpt/ib_srpt.h
index ce8b14f837855ca53b0dd555c77a07c269dd2dfe..c4a0b8519dbb6294af9fe4d7a68f6c417940ed8a 100644 (file)
--- a/drivers/infiniband/ulp/srpt/ib_srpt.h
+++ b/drivers/infiniband/ulp/srpt/ib_srpt.h
@@ -179,7 +179,7 @@ struct srpt_recv_ioctx {
        struct srpt_ioctx       ioctx;
        struct list_head        wait_list;
 };
-       
+
 struct srpt_rw_ctx {
        struct rdma_rw_ctx      rw;
        struct scatterlist      *sg;