diff --git a/iscsi-scst/usr/ctldev.c b/iscsi-scst/usr/ctldev.c index f6a9dbf08..70258cc46 100644 --- a/iscsi-scst/usr/ctldev.c +++ b/iscsi-scst/usr/ctldev.c @@ -338,7 +338,7 @@ int kernel_params_set(u32 tid, u64 sid, int type, u32 partial, if ((err = ioctl(ctrl_fd, ISCSI_PARAM_SET, &info)) < 0) { err = -errno; - log_error("Can't set session params for session 0x%" PRIx64 + log_error("Can't set session params for session 0x%" PRIx64 " (tid %u, type %d, partial %d, err %d): %s\n", sid, tid, type, partial, err, strerror(errno)); } diff --git a/iscsi-scst/usr/misc.h b/iscsi-scst/usr/misc.h index 3b7a2af84..89f9aba36 100644 --- a/iscsi-scst/usr/misc.h +++ b/iscsi-scst/usr/misc.h @@ -50,7 +50,7 @@ static inline int list_length_is_one(const struct __qelem *head) #define container_of(ptr, type, member) ({ \ const typeof( ((type *)0)->member ) *__mptr = (ptr); \ - (type *)( (char *)__mptr - offsetof(type,member) );}) + (type *)((char *)__mptr - offsetof(type, member)); }) #define list_entry(ptr, type, member) \ container_of(ptr, type, member) diff --git a/iscsi-scst/usr/target.c b/iscsi-scst/usr/target.c index 2aa7de3ea..7a2bb818a 100644 --- a/iscsi-scst/usr/target.c +++ b/iscsi-scst/usr/target.c @@ -355,7 +355,8 @@ int target_del(u32 tid, u32 cookie) while (1) { /* We might need to handle session(s) removal event(s) from the kernel */ - while (handle_iscsi_events(nl_fd, false) == 0); + while (handle_iscsi_events(nl_fd, false) == 0) + ; /* Someone else may have already freed the target object by now. */ target = target_find_by_id(tid); diff --git a/qla2x00t-32gbit/qla2x00-target/qla_tgt.c b/qla2x00t-32gbit/qla2x00-target/qla_tgt.c index 0dd5b619b..03fb20cc8 100644 --- a/qla2x00t-32gbit/qla2x00-target/qla_tgt.c +++ b/qla2x00t-32gbit/qla2x00-target/qla_tgt.c @@ -95,7 +95,7 @@ size_t qlt_del_vtarget(u64 port_name) unsigned long flags; int match = 0; - pr_info("%s: %llx",__func__, port_name); + pr_info("%s: %llx", __func__, port_name); mutex_lock(&qla_tgt_mutex); list_for_each_entry_safe(tgt, t, &qla_tgt_glist, tgt_list_entry) { vha = tgt->vha; diff --git a/qla2x00t-32gbit/qla2x00-target/scst_qla2xxx.c b/qla2x00t-32gbit/qla2x00-target/scst_qla2xxx.c index 147f91e53..18a1e2c06 100644 --- a/qla2x00t-32gbit/qla2x00-target/scst_qla2xxx.c +++ b/qla2x00t-32gbit/qla2x00-target/scst_qla2xxx.c @@ -1619,8 +1619,8 @@ static int sqa_rdy_to_xfer(struct scst_cmd *scst_cmd) qla_tgt_set_cmd_prot_op(cmd, false); TRACE_DBG("%s: cmd[%p] ulpcmd[%p] dif_actions=0x%x, cdb=0x%x, " - "prot_sg_cnt[%x], prot_type[%x] prot_op[%x], bufflen[%x]",__func__, - cmd, cmd->scst_cmd, + "prot_sg_cnt[%x], prot_type[%x] prot_op[%x], bufflen[%x]", + __func__, cmd, cmd->scst_cmd, scst_cmd->cmd_dif_actions, scst_cmd->cdb_buf[0], cmd->prot_sg_cnt, cmd->se_cmd.prot_type, cmd->se_cmd.prot_op, cmd->bufflen); @@ -1953,7 +1953,7 @@ static int sqa_enable_tgt(struct scst_tgt *scst_tgt, bool enable) PRINT_INFO("sqatgt(%ld/%d): %s target pwwn=" "%02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x", - vha->host_no, vha->vp_idx, enable ? "Enabling": "Disabling", + vha->host_no, vha->vp_idx, enable ? "Enabling" : "Disabling", vha->port_name[0], vha->port_name[1], vha->port_name[2], vha->port_name[3], vha->port_name[4], vha->port_name[5], diff --git a/qla2x00t-32gbit/qla_def.h b/qla2x00t-32gbit/qla_def.h index 5d19ce746..94ac0a0af 100644 --- a/qla2x00t-32gbit/qla_def.h +++ b/qla2x00t-32gbit/qla_def.h @@ -145,9 +145,9 @@ typedef struct { #define RD_REG_BYTE_RELAXED(addr) readb_relaxed(addr) #define RD_REG_WORD_RELAXED(addr) readw_relaxed(addr) #define RD_REG_DWORD_RELAXED(addr) readl_relaxed(addr) -#define WRT_REG_BYTE(addr, data) writeb(data,addr) -#define WRT_REG_WORD(addr, data) writew(data,addr) -#define WRT_REG_DWORD(addr, data) writel(data,addr) +#define WRT_REG_BYTE(addr, data) writeb(data, addr) +#define WRT_REG_WORD(addr, data) writew(data, addr) +#define WRT_REG_DWORD(addr, data) writel(data, addr) /* * ISP83XX specific remote register addresses @@ -235,7 +235,7 @@ typedef struct { * 133Mhz slot. */ #define RD_REG_WORD_PIO(addr) (inw((unsigned long)addr)) -#define WRT_REG_WORD_PIO(addr, data) (outw(data,(unsigned long)addr)) +#define WRT_REG_WORD_PIO(addr, data) (outw(data, (unsigned long)addr)) /* * Fibre Channel device definitions. @@ -3926,7 +3926,7 @@ struct qla_hw_data { /* NVRAM configuration data */ #define MAX_NVRAM_SIZE 4096 -#define VPD_OFFSET MAX_NVRAM_SIZE / 2 +#define VPD_OFFSET (MAX_NVRAM_SIZE / 2) uint16_t nvram_size; uint16_t nvram_base; void *nvram; diff --git a/qla2x00t-32gbit/qla_nvme.c b/qla2x00t-32gbit/qla_nvme.c index 58a7d6dd1..cd225b17c 100644 --- a/qla2x00t-32gbit/qla_nvme.c +++ b/qla2x00t-32gbit/qla_nvme.c @@ -605,7 +605,7 @@ static void qla_nvme_unregister_remote_port(struct work_struct *work) return; ql_log(ql_log_warn, NULL, 0x2112, - "%s: unregister remoteport on %p\n",__func__, fcport); + "%s: unregister remoteport on %p\n", __func__, fcport); list_for_each_entry_safe(qla_rport, trport, &fcport->vha->nvme_rport_list, list) { diff --git a/qla2x00t-32gbit/qla_nx.c b/qla2x00t-32gbit/qla_nx.c index a5df4ae99..f72d25be4 100644 --- a/qla2x00t-32gbit/qla_nx.c +++ b/qla2x00t-32gbit/qla_nx.c @@ -1984,7 +1984,7 @@ qla82xx_check_rcvpeg_state(struct qla_hw_data *ha) } /* ISR related functions */ -static struct qla82xx_legacy_intr_set legacy_intr[] = \ +static struct qla82xx_legacy_intr_set legacy_intr[] = QLA82XX_LEGACY_INTR_CONFIG; /* @@ -3285,7 +3285,7 @@ qla82xx_device_state_handler(scsi_qla_host_t *vha) case QLA8XXX_DEV_NEED_QUIESCENT: qla82xx_need_qsnt_handler(vha); /* Reset timeout value after quiescence handler */ - dev_init_timeout = jiffies + (ha->fcoe_dev_init_timeout\ + dev_init_timeout = jiffies + (ha->fcoe_dev_init_timeout * HZ); break; case QLA8XXX_DEV_QUIESCENT: @@ -3300,7 +3300,7 @@ qla82xx_device_state_handler(scsi_qla_host_t *vha) qla82xx_idc_lock(ha); /* Reset timeout value after quiescence handler */ - dev_init_timeout = jiffies + (ha->fcoe_dev_init_timeout\ + dev_init_timeout = jiffies + (ha->fcoe_dev_init_timeout * HZ); break; case QLA8XXX_DEV_FAILED: @@ -4231,7 +4231,7 @@ qla82xx_md_collect(scsi_qla_host_t *vha) goto md_failed; } - entry_hdr = (qla82xx_md_entry_hdr_t *) \ + entry_hdr = (qla82xx_md_entry_hdr_t *) (((uint8_t *)ha->md_tmplt_hdr) + tmplt_hdr->first_entry_offset); /* Walk through the entry headers */ @@ -4338,7 +4338,7 @@ qla82xx_md_collect(scsi_qla_host_t *vha) data_collected = (uint8_t *)data_ptr - (uint8_t *)ha->md_dump; skip_nxt_entry: - entry_hdr = (qla82xx_md_entry_hdr_t *) \ + entry_hdr = (qla82xx_md_entry_hdr_t *) (((uint8_t *)entry_hdr) + entry_hdr->entry_size); } diff --git a/qla2x00t-32gbit/qla_nx.h b/qla2x00t-32gbit/qla_nx.h index e2e08cacf..17110c94a 100644 --- a/qla2x00t-32gbit/qla_nx.h +++ b/qla2x00t-32gbit/qla_nx.h @@ -488,13 +488,13 @@ #define QLA82XX_ADDR_QDR_NET (0x0000000300000000ULL) #define QLA82XX_P3_ADDR_QDR_NET_MAX (0x0000000303ffffffULL) -#define QLA82XX_PCI_CRBSPACE (unsigned long)0x06000000 -#define QLA82XX_PCI_DIRECT_CRB (unsigned long)0x04400000 -#define QLA82XX_PCI_CAMQM (unsigned long)0x04800000 -#define QLA82XX_PCI_CAMQM_MAX (unsigned long)0x04ffffff -#define QLA82XX_PCI_DDR_NET (unsigned long)0x00000000 -#define QLA82XX_PCI_QDR_NET (unsigned long)0x04000000 -#define QLA82XX_PCI_QDR_NET_MAX (unsigned long)0x043fffff +#define QLA82XX_PCI_CRBSPACE 0x06000000UL +#define QLA82XX_PCI_DIRECT_CRB 0x04400000UL +#define QLA82XX_PCI_CAMQM 0x04800000UL +#define QLA82XX_PCI_CAMQM_MAX 0x04ffffffUL +#define QLA82XX_PCI_DDR_NET 0x00000000UL +#define QLA82XX_PCI_QDR_NET 0x04000000UL +#define QLA82XX_PCI_QDR_NET_MAX 0x043fffffUL /* * Register offsets for MN diff --git a/qla2x00t-32gbit/qla_os.c b/qla2x00t-32gbit/qla_os.c index 3ced38e91..4b4f87e4f 100644 --- a/qla2x00t-32gbit/qla_os.c +++ b/qla2x00t-32gbit/qla_os.c @@ -82,12 +82,12 @@ MODULE_PARM_DESC(ql2xplogiabsentdevice, "a Fabric scan. This is needed for several broken switches. " "Default is 0 - no PLOGI. 1 - perform PLOGI."); -int ql2xloginretrycount = 0; +int ql2xloginretrycount; module_param(ql2xloginretrycount, int, S_IRUGO); MODULE_PARM_DESC(ql2xloginretrycount, "Specify an alternate value for the NVRAM login retry count."); -int ql2xallocfwdump = 0; +int ql2xallocfwdump; module_param(ql2xallocfwdump, int, S_IRUGO); MODULE_PARM_DESC(ql2xallocfwdump, "Option to enable allocation of memory for a firmware dump " diff --git a/qla2x00t/qla_attr.c b/qla2x00t/qla_attr.c index b6f37980e..e7cc73cc1 100644 --- a/qla2x00t/qla_attr.c +++ b/qla2x00t/qla_attr.c @@ -1179,7 +1179,7 @@ do_read: count = 0; } - count = actual_size > count ? count: actual_size; + count = actual_size > count ? count : actual_size; memcpy(buf, ha->xgmac_data, count); return count; diff --git a/qla2x00t/qla_def.h b/qla2x00t/qla_def.h index 2bb941796..31d4e79ca 100644 --- a/qla2x00t/qla_def.h +++ b/qla2x00t/qla_def.h @@ -137,7 +137,7 @@ * 133Mhz slot. */ #define RD_REG_WORD_PIO(addr) (inw((unsigned long)addr)) -#define WRT_REG_WORD_PIO(addr, data) (outw(data,(unsigned long)addr)) +#define WRT_REG_WORD_PIO(addr, data) (outw(data, (unsigned long)addr)) /* * Fibre Channel device definitions. @@ -2729,7 +2729,7 @@ struct qla_hw_data { /* NVRAM configuration data */ #define MAX_NVRAM_SIZE 4096 -#define VPD_OFFSET MAX_NVRAM_SIZE / 2 +#define VPD_OFFSET (MAX_NVRAM_SIZE / 2) uint16_t nvram_size; uint16_t nvram_base; void *nvram; diff --git a/qla2x00t/qla_mbx.c b/qla2x00t/qla_mbx.c index f0dd3d509..104ed82f3 100644 --- a/qla2x00t/qla_mbx.c +++ b/qla2x00t/qla_mbx.c @@ -4785,7 +4785,7 @@ qla82xx_md_get_template_size(scsi_qla_host_t *vha) mcp->mb[3] = MSW(RQST_TMPLT_SIZE); mcp->out_mb = MBX_3|MBX_2|MBX_1|MBX_0; - mcp->in_mb = MBX_14|MBX_13|MBX_12|MBX_11|MBX_10|MBX_9|MBX_8| \ + mcp->in_mb = MBX_14|MBX_13|MBX_12|MBX_11|MBX_10|MBX_9|MBX_8| MBX_7|MBX_6|MBX_5|MBX_4|MBX_3|MBX_2|MBX_1|MBX_0; mcp->flags = MBX_DMA_OUT|MBX_DMA_IN|IOCTL_CMD; @@ -4844,7 +4844,7 @@ qla82xx_md_get_template(scsi_qla_host_t *vha) mcp->flags = MBX_DMA_OUT|MBX_DMA_IN|IOCTL_CMD; mcp->tov = MBX_TOV_SECONDS; - mcp->out_mb = MBX_11|MBX_10|MBX_9|MBX_8| \ + mcp->out_mb = MBX_11|MBX_10|MBX_9|MBX_8| MBX_7|MBX_6|MBX_5|MBX_4|MBX_3|MBX_2|MBX_1|MBX_0; mcp->in_mb = MBX_3|MBX_2|MBX_1|MBX_0; rval = qla2x00_mailbox_command(vha, mcp); diff --git a/qla2x00t/qla_nx.c b/qla2x00t/qla_nx.c index c459ba629..5b5a0fb27 100644 --- a/qla2x00t/qla_nx.c +++ b/qla2x00t/qla_nx.c @@ -1977,7 +1977,7 @@ qla82xx_check_rcvpeg_state(struct qla_hw_data *ha) } /* ISR related functions */ -static struct qla82xx_legacy_intr_set legacy_intr[] = \ +static struct qla82xx_legacy_intr_set legacy_intr[] = QLA82XX_LEGACY_INTR_CONFIG; /* @@ -3268,7 +3268,7 @@ qla82xx_device_state_handler(scsi_qla_host_t *vha) case QLA82XX_DEV_NEED_QUIESCENT: qla82xx_need_qsnt_handler(vha); /* Reset timeout value after quiescence handler */ - dev_init_timeout = jiffies + (ha->nx_dev_init_timeout\ + dev_init_timeout = jiffies + (ha->nx_dev_init_timeout * HZ); break; case QLA82XX_DEV_QUIESCENT: @@ -3283,7 +3283,7 @@ qla82xx_device_state_handler(scsi_qla_host_t *vha) qla82xx_idc_lock(ha); /* Reset timeout value after quiescence handler */ - dev_init_timeout = jiffies + (ha->nx_dev_init_timeout\ + dev_init_timeout = jiffies + (ha->nx_dev_init_timeout * HZ); break; case QLA82XX_DEV_FAILED: @@ -4168,7 +4168,7 @@ qla82xx_md_collect(scsi_qla_host_t *vha) goto md_failed; } - entry_hdr = (qla82xx_md_entry_hdr_t *) \ + entry_hdr = (qla82xx_md_entry_hdr_t *) (((uint8_t *)ha->md_tmplt_hdr) + tmplt_hdr->first_entry_offset); /* Walk through the entry headers */ @@ -4275,7 +4275,7 @@ qla82xx_md_collect(scsi_qla_host_t *vha) data_collected = (uint8_t *)data_ptr - (uint8_t *)ha->md_dump; skip_nxt_entry: - entry_hdr = (qla82xx_md_entry_hdr_t *) \ + entry_hdr = (qla82xx_md_entry_hdr_t *) (((uint8_t *)entry_hdr) + entry_hdr->entry_size); } diff --git a/qla2x00t/qla_nx.h b/qla2x00t/qla_nx.h index 30c4de772..f395d6cfb 100644 --- a/qla2x00t/qla_nx.h +++ b/qla2x00t/qla_nx.h @@ -487,13 +487,13 @@ #define QLA82XX_ADDR_QDR_NET (0x0000000300000000ULL) #define QLA82XX_P3_ADDR_QDR_NET_MAX (0x0000000303ffffffULL) -#define QLA82XX_PCI_CRBSPACE (unsigned long)0x06000000 -#define QLA82XX_PCI_DIRECT_CRB (unsigned long)0x04400000 -#define QLA82XX_PCI_CAMQM (unsigned long)0x04800000 -#define QLA82XX_PCI_CAMQM_MAX (unsigned long)0x04ffffff -#define QLA82XX_PCI_DDR_NET (unsigned long)0x00000000 -#define QLA82XX_PCI_QDR_NET (unsigned long)0x04000000 -#define QLA82XX_PCI_QDR_NET_MAX (unsigned long)0x043fffff +#define QLA82XX_PCI_CRBSPACE 0x06000000UL +#define QLA82XX_PCI_DIRECT_CRB 0x04400000UL +#define QLA82XX_PCI_CAMQM 0x04800000UL +#define QLA82XX_PCI_CAMQM_MAX 0x04ffffffUL +#define QLA82XX_PCI_DDR_NET 0x00000000UL +#define QLA82XX_PCI_QDR_NET 0x04000000UL +#define QLA82XX_PCI_QDR_NET_MAX 0x043fffffUL /* * diff --git a/scst/src/scst_sysfs.c b/scst/src/scst_sysfs.c index dc26bc668..33710e4b5 100644 --- a/scst/src/scst_sysfs.c +++ b/scst/src/scst_sysfs.c @@ -4335,10 +4335,18 @@ static ssize_t scst_sess_latency_show(struct kobject *kobj, char state_name[32]; switch (attr->attr.name[0]) { - case 'n': j = SCST_DATA_NONE & 3; break; - case 'r': j = SCST_DATA_READ; break; - case 'w': j = SCST_DATA_WRITE; break; - case 'b': j = SCST_DATA_BIDI; break; + case 'n': + j = SCST_DATA_NONE & 3; + break; + case 'r': + j = SCST_DATA_READ; + break; + case 'w': + j = SCST_DATA_WRITE; + break; + case 'b': + j = SCST_DATA_BIDI; + break; default: return -EINVAL; } diff --git a/usr/fileio/common.c b/usr/fileio/common.c index c6e33c8e9..830d7aa96 100644 --- a/usr/fileio/common.c +++ b/usr/fileio/common.c @@ -845,6 +845,7 @@ void *main_loop(void *arg) multi.multi_cmd.preplies = (uintptr_t)&multi.replies[0]; multi.multi_cmd.replies_cnt = 0; multi.multi_cmd.cmds_cnt = MULTI_CMDS_CNT; + /* fall through */ case EINTR: continue; case EAGAIN: @@ -1561,7 +1562,7 @@ static void exec_read_capacity16(struct vdisk_cmd *vcmd) buffer[4] = (nblocks >> 24) & 0xFF; buffer[5] = (nblocks >> 16) & 0xFF; buffer[6] = (nblocks >> 8) & 0xFF; - buffer[7] = nblocks& 0xFF; + buffer[7] = nblocks & 0xFF; buffer[8] = (blocksize >> (BYTE * 3)) & 0xFF; buffer[9] = (blocksize >> (BYTE * 2)) & 0xFF; @@ -1602,7 +1603,7 @@ static void exec_read_toc(struct vdisk_cmd *vcmd) struct scst_user_scsi_cmd_reply_exec *reply = &vcmd->reply->exec_reply; int32_t off = 0; int length = cmd->bufflen; - uint8_t *address = (uint8_t*)(unsigned long)cmd->pbuf; + uint8_t *address = (uint8_t *)(unsigned long)cmd->pbuf; uint32_t nblocks; uint8_t buffer[4+8+8] = { 0x00, 0x0a, 0x01, 0x01, 0x00, 0x14, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00 }; diff --git a/usr/fileio/common.h b/usr/fileio/common.h index 5977580ab..9b6e1d2c7 100644 --- a/usr/fileio/common.h +++ b/usr/fileio/common.h @@ -107,13 +107,13 @@ struct vdisk_cmd * strict type-checking.. See the * "unnecessary" pointer comparison. */ -#define min(x,y) ({ \ +#define min(x, y) ({ \ typeof(x) _x = (x); \ typeof(y) _y = (y); \ (void) (&_x == &_y); \ _x < _y ? _x : _y; }) -#define max(x,y) ({ \ +#define max(x, y) ({ \ typeof(x) _x = (x); \ typeof(y) _y = (y); \ (void) (&_x == &_y); \ diff --git a/usr/fileio/crc32.c b/usr/fileio/crc32.c index d87bc6d2e..4f0d4ac58 100644 --- a/usr/fileio/crc32.c +++ b/usr/fileio/crc32.c @@ -92,17 +92,18 @@ static uint32_t crc_32_tab[] = { /* CRC polynomial 0xedb88320 */ 0xb40bbe37, 0xc30c8ea1, 0x5a05df1b, 0x2d02ef8d }; -#define UPDC32(octet,crc) (crc_32_tab[((crc) ^ ((uint8_t)octet)) & 0xff] ^ ((crc) >> 8)) +#define UPDC32(octet, crc) \ + (crc_32_tab[((crc) ^ ((uint8_t)octet)) & 0xff] ^ ((crc) >> 8)) uint32_t crc32buf(const char *buf, size_t len) { - register uint32_t oldcrc32; + register uint32_t oldcrc32; - oldcrc32 = 0xFFFFFFFF; + oldcrc32 = 0xFFFFFFFF; - for ( ; len; --len, ++buf) { - oldcrc32 = UPDC32(*buf, oldcrc32); - } + for ( ; len; --len, ++buf) { + oldcrc32 = UPDC32(*buf, oldcrc32); + } - return ~oldcrc32; + return ~oldcrc32; }