mirrors/scst
1
0
Fork 0
mirror of https://github.com/SCST-project/scst.git synced 2026-08-18 05:06:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed the following checkpatch complaints:

Browse Source 
- ERROR: open brace '{' following struct go on the same line
- ERROR: return is not a function, parentheses are not required
- ERROR: that open brace { should be on the previous line
- WARNING: %Ld/%Lu are not-standard C, use %lld/%llu
- WARNING: braces {} are not necessary for single statement blocks


git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@1150 d57e44dd-8a1f-0410-8b47-8ef2f437770f
This commit is contained in:
Bart Van Assche
2009-09-26 08:54:42 +00:00
parent a7c8b82516
commit 90bfe40444
2 changed files with 19 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
qla2x00t/qla2x00-target/qla2x00t.c
+12 -20
View File
@@ -236,7 +236,7 @@ static inline int q2t_issue_marker(scsi_qla_host_t *ha, int ha_locked)
}
return rc;
}
return (QLA_SUCCESS);
return QLA_SUCCESS;
}
/*
@@ -1357,9 +1357,7 @@ static int q2t_pci_map_calc_cnt(struct q2t_prm *prm)
prm->tgt->datasegs_per_cont;
if (((uint16_t)(prm->seg_cnt - prm->tgt->datasegs_per_cmd)) %
prm->tgt->datasegs_per_cont)
{
prm->req_cnt++;
}
}
out:
@@ -1439,9 +1437,8 @@ static inline uint32_t q2t_make_handle(scsi_qla_host_t *ha)
/* always increment cmd handle */
do {
++h;
if (h > MAX_OUTSTANDING_COMMANDS) {
if (h > MAX_OUTSTANDING_COMMANDS)
h = 1; /* 0 is Q2T_NULL_HANDLE */
}
if (h == ha->current_handle) {
TRACE(TRACE_OUT_OF_MEM,
"Ran out of empty cmd slots in ha %p", ha);
@@ -1589,8 +1586,7 @@ static void q2t_load_cont_data_segments(struct q2t_prm *prm)
/* Load continuation entry data segments */
for (cnt = 0;
cnt < prm->tgt->datasegs_per_cont && prm->seg_cnt;
cnt++, prm->seg_cnt--)
{
cnt++, prm->seg_cnt--) {
*dword_ptr++ =
cpu_to_le32(pci_dma_lo32
(sg_dma_address(prm->sg)));
@@ -1655,8 +1651,7 @@ static void q2x_load_data_segments(struct q2t_prm *prm)
/* Load command entry data segments */
for (cnt = 0;
(cnt < prm->tgt->datasegs_per_cmd) && prm->seg_cnt;
cnt++, prm->seg_cnt--)
{
cnt++, prm->seg_cnt--) {
*dword_ptr++ =
cpu_to_le32(pci_dma_lo32(sg_dma_address(prm->sg)));
if (enable_64bit_addressing) {
@@ -1720,8 +1715,7 @@ static void q24_load_data_segments(struct q2t_prm *prm)
/* Load command entry data segments */
for (cnt = 0;
(cnt < prm->tgt->datasegs_per_cmd) && prm->seg_cnt;
cnt++, prm->seg_cnt--)
{
cnt++, prm->seg_cnt--) {
*dword_ptr++ =
cpu_to_le32(pci_dma_lo32(sg_dma_address(prm->sg)));
if (enable_64bit_addressing) {
@@ -1782,7 +1776,7 @@ static int q2t_pre_xmit_response(struct q2t_cmd *cmd,
goto out;
}
TRACE(TRACE_SCSI, "tag=%Ld", scst_cmd_get_tag(scst_cmd));
TRACE(TRACE_SCSI, "tag=%lld", scst_cmd_get_tag(scst_cmd));
prm->cmd = cmd;
prm->tgt = tgt;
@@ -1828,7 +1822,7 @@ static int q2t_pre_xmit_response(struct q2t_cmd *cmd,
prm->residual = expected -
scst_cmd_get_resp_data_len(scst_cmd);
if (prm->residual > 0) {
TRACE_DBG("Residual underflow: %d (tag %Ld, "
TRACE_DBG("Residual underflow: %d (tag %lld, "
"op %x, expected %d, resp_data_len "
"%d, bufflen %d, rq_result %x)",
prm->residual, scst_cmd->tag,
@@ -1837,7 +1831,7 @@ static int q2t_pre_xmit_response(struct q2t_cmd *cmd,
cmd->bufflen, prm->rq_result);
prm->rq_result |= SS_RESIDUAL_UNDER;
} else if (prm->residual < 0) {
TRACE_DBG("Residual overflow: %d (tag %Ld, "
TRACE_DBG("Residual overflow: %d (tag %lld, "
"op %x, expected %d, resp_data_len "
"%d, bufflen %d, rq_result %x)",
prm->residual, scst_cmd->tag,
@@ -2381,7 +2375,7 @@ static int q2t_rdy_to_xfer(struct scst_cmd *scst_cmd)
TRACE_ENTRY();
TRACE(TRACE_SCSI, "tag=%Ld", scst_cmd_get_tag(scst_cmd));
TRACE(TRACE_SCSI, "tag=%lld", scst_cmd_get_tag(scst_cmd));
cmd = (struct q2t_cmd *)scst_cmd_get_tgt_priv(scst_cmd);
cmd->bufflen = scst_cmd_get_bufflen(scst_cmd);
@@ -2557,7 +2551,7 @@ static void q2t_on_free_cmd(struct scst_cmd *scst_cmd)
TRACE_ENTRY();
TRACE(TRACE_SCSI, "Freeing command %p, tag %Ld", scst_cmd,
TRACE(TRACE_SCSI, "Freeing command %p, tag %lld", scst_cmd,
scst_cmd_get_tag(scst_cmd));
cmd = (struct q2t_cmd *)scst_cmd_get_tgt_priv(scst_cmd);
@@ -5302,14 +5296,12 @@ static int __init q2t_init(void)
*/
res = q2t_proc_log_entry_build(&tgt2x_template);
if (res < 0) {
if (res < 0)
goto out_unreg_target24;
}
res = q2t_proc_log_entry_build(&tgt24_template);
if (res < 0) {
if (res < 0)
goto out_unreg_proc2x;
}
out:
TRACE_EXIT_RES(res);
qla2x00t/qla2x00-target/qla2x00t.h
+7 -14
View File
@@ -112,8 +112,7 @@
#define pci_dma_hi32(a) 0
#endif
struct q2t_tgt
{
struct q2t_tgt {
struct scst_tgt *scst_tgt;
scsi_qla_host_t *ha;
@@ -168,8 +167,7 @@ struct q2t_tgt
/*
* Equivilant to IT Nexus (Initiator-Target)
*/
struct q2t_sess
{
struct q2t_sess {
uint16_t loop_id;
port_id_t s_id;
@@ -189,8 +187,7 @@ struct q2t_sess
uint8_t port_name[WWN_SIZE];
};
struct q2t_cmd
{
struct q2t_cmd {
struct q2t_sess *sess;
int state;
struct scst_cmd *scst_cmd;
@@ -222,8 +219,7 @@ struct q2t_sess_work_param {
struct q2t_cmd *cmd;
};
struct q2t_mgmt_cmd
{
struct q2t_mgmt_cmd {
struct q2t_sess *sess;
unsigned int flags;
#define Q24_MGMT_SEND_NACK 1
@@ -235,8 +231,7 @@ struct q2t_mgmt_cmd
} __attribute__((packed)) orig_iocb;
};
struct q2t_prm
{
struct q2t_prm {
struct q2t_cmd *cmd;
struct q2t_tgt *tgt;
void *pkt;
@@ -251,8 +246,7 @@ struct q2t_prm
int add_status_pkt;
};
struct srr_imm
{
struct srr_imm {
struct list_head srr_list_entry;
int srr_id;
union {
@@ -261,8 +255,7 @@ struct srr_imm
} __attribute__((packed)) imm;
};
struct srr_ctio
{
struct srr_ctio {
struct list_head srr_list_entry;
int srr_id;
struct q2t_cmd *cmd;