diff options
author | Colin Ian King <colin.king@canonical.com> | 2017-12-06 10:02:43 -0500 |
---|---|---|
committer | Martin K. Petersen <martin.petersen@oracle.com> | 2017-12-07 21:16:41 -0500 |
commit | afcfa2c8ed637a2b7e567856b5d3daf02b172a38 (patch) | |
tree | 24e00bc3bdf95ec354104c7ae94c04b1e68c9534 /drivers/message/fusion/mptbase.c | |
parent | a5c351110a140a280ee2532f5a56b774f0ac0cfb (diff) |
scsi: fusion: clean up some indentations
There are several places where the source is not indented correctly with
either too many or too few levels of intentation. Fix these.
Signed-off-by: Colin Ian King <colin.king@canonical.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Diffstat (limited to 'drivers/message/fusion/mptbase.c')
-rw-r--r-- | drivers/message/fusion/mptbase.c | 57 |
1 files changed, 29 insertions, 28 deletions
diff --git a/drivers/message/fusion/mptbase.c b/drivers/message/fusion/mptbase.c index 7a93400eea2a..8df37fa1e977 100644 --- a/drivers/message/fusion/mptbase.c +++ b/drivers/message/fusion/mptbase.c | |||
@@ -958,7 +958,7 @@ mpt_put_msg_frame(u8 cb_idx, MPT_ADAPTER *ioc, MPT_FRAME_HDR *mf) | |||
958 | { | 958 | { |
959 | u32 mf_dma_addr; | 959 | u32 mf_dma_addr; |
960 | int req_offset; | 960 | int req_offset; |
961 | u16 req_idx; /* Request index */ | 961 | u16 req_idx; /* Request index */ |
962 | 962 | ||
963 | /* ensure values are reset properly! */ | 963 | /* ensure values are reset properly! */ |
964 | mf->u.frame.hwhdr.msgctxu.fld.cb_idx = cb_idx; /* byte */ | 964 | mf->u.frame.hwhdr.msgctxu.fld.cb_idx = cb_idx; /* byte */ |
@@ -994,7 +994,7 @@ mpt_put_msg_frame_hi_pri(u8 cb_idx, MPT_ADAPTER *ioc, MPT_FRAME_HDR *mf) | |||
994 | { | 994 | { |
995 | u32 mf_dma_addr; | 995 | u32 mf_dma_addr; |
996 | int req_offset; | 996 | int req_offset; |
997 | u16 req_idx; /* Request index */ | 997 | u16 req_idx; /* Request index */ |
998 | 998 | ||
999 | /* ensure values are reset properly! */ | 999 | /* ensure values are reset properly! */ |
1000 | mf->u.frame.hwhdr.msgctxu.fld.cb_idx = cb_idx; | 1000 | mf->u.frame.hwhdr.msgctxu.fld.cb_idx = cb_idx; |
@@ -1128,11 +1128,12 @@ mpt_add_sge_64bit_1078(void *pAddr, u32 flagslength, dma_addr_t dma_addr) | |||
1128 | static void | 1128 | static void |
1129 | mpt_add_chain(void *pAddr, u8 next, u16 length, dma_addr_t dma_addr) | 1129 | mpt_add_chain(void *pAddr, u8 next, u16 length, dma_addr_t dma_addr) |
1130 | { | 1130 | { |
1131 | SGEChain32_t *pChain = (SGEChain32_t *) pAddr; | 1131 | SGEChain32_t *pChain = (SGEChain32_t *) pAddr; |
1132 | pChain->Length = cpu_to_le16(length); | 1132 | |
1133 | pChain->Flags = MPI_SGE_FLAGS_CHAIN_ELEMENT; | 1133 | pChain->Length = cpu_to_le16(length); |
1134 | pChain->NextChainOffset = next; | 1134 | pChain->Flags = MPI_SGE_FLAGS_CHAIN_ELEMENT; |
1135 | pChain->Address = cpu_to_le32(dma_addr); | 1135 | pChain->NextChainOffset = next; |
1136 | pChain->Address = cpu_to_le32(dma_addr); | ||
1136 | } | 1137 | } |
1137 | 1138 | ||
1138 | /*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/ | 1139 | /*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/ |
@@ -1147,18 +1148,18 @@ mpt_add_chain(void *pAddr, u8 next, u16 length, dma_addr_t dma_addr) | |||
1147 | static void | 1148 | static void |
1148 | mpt_add_chain_64bit(void *pAddr, u8 next, u16 length, dma_addr_t dma_addr) | 1149 | mpt_add_chain_64bit(void *pAddr, u8 next, u16 length, dma_addr_t dma_addr) |
1149 | { | 1150 | { |
1150 | SGEChain64_t *pChain = (SGEChain64_t *) pAddr; | 1151 | SGEChain64_t *pChain = (SGEChain64_t *) pAddr; |
1151 | u32 tmp = dma_addr & 0xFFFFFFFF; | 1152 | u32 tmp = dma_addr & 0xFFFFFFFF; |
1152 | 1153 | ||
1153 | pChain->Length = cpu_to_le16(length); | 1154 | pChain->Length = cpu_to_le16(length); |
1154 | pChain->Flags = (MPI_SGE_FLAGS_CHAIN_ELEMENT | | 1155 | pChain->Flags = (MPI_SGE_FLAGS_CHAIN_ELEMENT | |
1155 | MPI_SGE_FLAGS_64_BIT_ADDRESSING); | 1156 | MPI_SGE_FLAGS_64_BIT_ADDRESSING); |
1156 | 1157 | ||
1157 | pChain->NextChainOffset = next; | 1158 | pChain->NextChainOffset = next; |
1158 | 1159 | ||
1159 | pChain->Address.Low = cpu_to_le32(tmp); | 1160 | pChain->Address.Low = cpu_to_le32(tmp); |
1160 | tmp = (u32)(upper_32_bits(dma_addr)); | 1161 | tmp = (u32)(upper_32_bits(dma_addr)); |
1161 | pChain->Address.High = cpu_to_le32(tmp); | 1162 | pChain->Address.High = cpu_to_le32(tmp); |
1162 | } | 1163 | } |
1163 | 1164 | ||
1164 | /*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/ | 1165 | /*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/ |
@@ -1360,7 +1361,7 @@ mpt_host_page_alloc(MPT_ADAPTER *ioc, pIOCInit_t ioc_init) | |||
1360 | ioc->add_sge(psge, flags_length, ioc->HostPageBuffer_dma); | 1361 | ioc->add_sge(psge, flags_length, ioc->HostPageBuffer_dma); |
1361 | ioc->facts.HostPageBufferSGE = ioc_init->HostPageBufferSGE; | 1362 | ioc->facts.HostPageBufferSGE = ioc_init->HostPageBufferSGE; |
1362 | 1363 | ||
1363 | return 0; | 1364 | return 0; |
1364 | } | 1365 | } |
1365 | 1366 | ||
1366 | /*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/ | 1367 | /*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/ |
@@ -2152,7 +2153,7 @@ mpt_suspend(struct pci_dev *pdev, pm_message_t state) | |||
2152 | device_state); | 2153 | device_state); |
2153 | 2154 | ||
2154 | /* put ioc into READY_STATE */ | 2155 | /* put ioc into READY_STATE */ |
2155 | if(SendIocReset(ioc, MPI_FUNCTION_IOC_MESSAGE_UNIT_RESET, CAN_SLEEP)) { | 2156 | if (SendIocReset(ioc, MPI_FUNCTION_IOC_MESSAGE_UNIT_RESET, CAN_SLEEP)) { |
2156 | printk(MYIOC_s_ERR_FMT | 2157 | printk(MYIOC_s_ERR_FMT |
2157 | "pci-suspend: IOC msg unit reset failed!\n", ioc->name); | 2158 | "pci-suspend: IOC msg unit reset failed!\n", ioc->name); |
2158 | } | 2159 | } |
@@ -6348,7 +6349,7 @@ mpt_config(MPT_ADAPTER *ioc, CONFIGPARMS *pCfg) | |||
6348 | u8 page_type = 0, extend_page; | 6349 | u8 page_type = 0, extend_page; |
6349 | unsigned long timeleft; | 6350 | unsigned long timeleft; |
6350 | unsigned long flags; | 6351 | unsigned long flags; |
6351 | int in_isr; | 6352 | int in_isr; |
6352 | u8 issue_hard_reset = 0; | 6353 | u8 issue_hard_reset = 0; |
6353 | u8 retry_count = 0; | 6354 | u8 retry_count = 0; |
6354 | 6355 | ||
@@ -8092,15 +8093,15 @@ mpt_spi_log_info(MPT_ADAPTER *ioc, u32 log_info) | |||
8092 | static void | 8093 | static void |
8093 | mpt_sas_log_info(MPT_ADAPTER *ioc, u32 log_info, u8 cb_idx) | 8094 | mpt_sas_log_info(MPT_ADAPTER *ioc, u32 log_info, u8 cb_idx) |
8094 | { | 8095 | { |
8095 | union loginfo_type { | 8096 | union loginfo_type { |
8096 | u32 loginfo; | 8097 | u32 loginfo; |
8097 | struct { | 8098 | struct { |
8098 | u32 subcode:16; | 8099 | u32 subcode:16; |
8099 | u32 code:8; | 8100 | u32 code:8; |
8100 | u32 originator:4; | 8101 | u32 originator:4; |
8101 | u32 bus_type:4; | 8102 | u32 bus_type:4; |
8102 | }dw; | 8103 | } dw; |
8103 | }; | 8104 | }; |
8104 | union loginfo_type sas_loginfo; | 8105 | union loginfo_type sas_loginfo; |
8105 | char *originator_desc = NULL; | 8106 | char *originator_desc = NULL; |
8106 | char *code_desc = NULL; | 8107 | char *code_desc = NULL; |