diff options
Diffstat (limited to 'include/arch/x86_64/scsi/fc')
| -rw-r--r-- | include/arch/x86_64/scsi/fc/fc_els.h | 3 | ||||
| -rw-r--r-- | include/arch/x86_64/scsi/fc/fc_fs.h | 10 |
2 files changed, 5 insertions, 8 deletions
diff --git a/include/arch/x86_64/scsi/fc/fc_els.h b/include/arch/x86_64/scsi/fc/fc_els.h index 6507344f..945c9468 100644 --- a/include/arch/x86_64/scsi/fc/fc_els.h +++ b/include/arch/x86_64/scsi/fc/fc_els.h @@ -279,8 +279,7 @@ struct fc_tlv_desc { #define FC_TLV_DESC_LENGTH_FROM_SZ(desc) (sizeof(desc) - FC_TLV_DESC_HDR_SZ) /* Macro, used on received payloads, to return the descriptor length */ -#define FC_TLV_DESC_SZ_FROM_LENGTH(tlv) \ - (__be32_to_cpu((tlv)->desc_len) + FC_TLV_DESC_HDR_SZ) +#define FC_TLV_DESC_SZ_FROM_LENGTH(tlv) (__be32_to_cpu((tlv)->desc_len) + FC_TLV_DESC_HDR_SZ) /* * This helper is used to walk descriptors in a descriptor list. diff --git a/include/arch/x86_64/scsi/fc/fc_fs.h b/include/arch/x86_64/scsi/fc/fc_fs.h index 36d2f1fe..3068d5a0 100644 --- a/include/arch/x86_64/scsi/fc/fc_fs.h +++ b/include/arch/x86_64/scsi/fc/fc_fs.h @@ -186,12 +186,10 @@ enum fc_fh_type { * FC_TYPE names initializer. * Please keep this matching the above definitions. */ -#define FC_TYPE_NAMES_INIT \ - { \ - [FC_TYPE_BLS] = "BLS", [FC_TYPE_ELS] = "ELS", \ - [FC_TYPE_IP] = "IP", [FC_TYPE_FCP] = "FCP", \ - [FC_TYPE_CT] = "CT", [FC_TYPE_ILS] = "ILS", \ - [FC_TYPE_NVME] = "NVME", \ +#define FC_TYPE_NAMES_INIT \ + { \ + [FC_TYPE_BLS] = "BLS", [FC_TYPE_ELS] = "ELS", [FC_TYPE_IP] = "IP", [FC_TYPE_FCP] = "FCP", \ + [FC_TYPE_CT] = "CT", [FC_TYPE_ILS] = "ILS", [FC_TYPE_NVME] = "NVME", \ } /* |