From 1bf5d439d66739f6a829b7696a96c32c21c0d097 Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Thu, 2 Mar 2017 00:10:24 +0000 Subject: [PATCH] scst: Coding style update related to the use of the keyword 'unsigned' Use 'unsigned int' instead of 'unsigned' and 'unsigned long long' instead of 'long long unsigned'. git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@7103 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- scst/src/scst_targ.c | 2 +- srpt/src/ib_srpt.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/scst/src/scst_targ.c b/scst/src/scst_targ.c index 2b04781bf..10cc62657 100644 --- a/scst/src/scst_targ.c +++ b/scst/src/scst_targ.c @@ -7225,7 +7225,7 @@ static int scst_clear_aca_mcmd(struct scst_mgmt_cmd *mcmd) TRACE(TRACE_MGMT, "CLEAR ACA (dev %s, lun=%lld, mcmd %p, tgt_dev %p)", mcmd_tgt_dev->dev->virt_name, - (long long unsigned int)mcmd_tgt_dev->lun, mcmd, mcmd_tgt_dev); + (unsigned long long int)mcmd_tgt_dev->lun, mcmd, mcmd_tgt_dev); spin_lock_irq(&order_data->sn_lock); diff --git a/srpt/src/ib_srpt.c b/srpt/src/ib_srpt.c index 0ebde4e06..7850bb661 100644 --- a/srpt/src/ib_srpt.c +++ b/srpt/src/ib_srpt.c @@ -2881,7 +2881,7 @@ static int srpt_ib_cm_req_recv(struct ib_cm_id *cm_id, private_data, sgid); } -static const char *inet_ntop(const void *sa, char *dst, unsigned size) +static const char *inet_ntop(const void *sa, char *dst, unsigned int size) { switch (((struct sockaddr *)sa)->sa_family) { case AF_INET: @@ -2975,7 +2975,7 @@ static void srpt_check_timeout(struct srpt_rdma_ch *ch) do_div(T_tr_ms, 1000000); pr_debug("%s-%d: QP local ack timeout = %d or T_tr = %u ms; retry_cnt = %d; max compl. time = %d ms\n", ch->sess_name, ch->qp->qp_num, attr.timeout, T_tr_ms, - attr.retry_cnt, (unsigned)max_compl_time_ms); + attr.retry_cnt, (unsigned int)max_compl_time_ms); if (max_compl_time_ms >= RDMA_COMPL_TIMEOUT_S * 1000) { pr_err("Maximum RDMA completion time (%lld ms) exceeds ib_srpt timeout (%d ms)\n", @@ -3533,7 +3533,7 @@ static int srpt_xfer_data(struct srpt_rdma_ch *ch, BUG_ON(!srpt_test_and_set_cmd_state(ioctx, SRPT_STATE_NEED_DATA, SRPT_STATE_DATA_IN)); if (unlikely(!scst_cmd_get_tgt_data_buff_alloced(cmd))) { - unsigned offset = 0, len; + unsigned int offset = 0, len; uint8_t *buf; /*