From: Knut Omang Date: Thu, 20 Oct 2016 12:06:14 +0000 (+0200) Subject: sif: Minor cleanup commit X-Git-Tag: v4.1.12-92~57^2~2 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=f19d1ca8dfa0a960e1824df500d3fec94ec811f0;p=users%2Fjedix%2Flinux-maple.git sif: Minor cleanup commit - Remove some unused variables - Minor changes due to bug fixes in hardware header file generator Signed-off-by: Knut Omang Reviewed-by: Francisco Triviño --- diff --git a/drivers/infiniband/hw/sif/psif_hw_data_be.h b/drivers/infiniband/hw/sif/psif_hw_data_be.h index de64fded345a..7ec8e6ab27e5 100644 --- a/drivers/infiniband/hw/sif/psif_hw_data_be.h +++ b/drivers/infiniband/hw/sif/psif_hw_data_be.h @@ -1654,7 +1654,7 @@ struct psif_modify_command { */ u32 notify_when_zero:1; /* Manually added spacing to pad out psif_modify_command */ - u32 pad05:3; + u32 pad00:3; } PSIF_PACKED; /* struct psif_modify_command [ 5 byte] */ /* @@ -2146,10 +2146,10 @@ struct psif_csr_modify_qp_ctrl { */ u64 notify_when_zero:1; /* Manually added spacing to pad out psif_modify_command */ - u64 pad06:3; + u64 pad00:3; /* Inlined cmd_attributes : struct psif_qp_attributes (24 bits) */ - /* Manually added spacing to pad outpsif_qp_attributes */ - u64 pad07:7; + /* Manually added spacing to pad out psif_qp_attributes */ + u64 pad01:7; /* Change path req_access error if set. */ u64 req_access_error:1; /* Change path MTU if set. */ @@ -3282,7 +3282,7 @@ struct psif_base_addr { /* Subjected to copy and convert */ /* Number of entries in table. */ u32 num_entries; /* Manually added spacing to pad out base addr */ - u32 pad08:27; + u32 pad00:27; /* * clog2_extent used for entry alignment. This field used to calculate * address for a particular entry. Address to an entry is calculated as diff --git a/drivers/infiniband/hw/sif/psif_hw_data_le.h b/drivers/infiniband/hw/sif/psif_hw_data_le.h index ddc3157cbb39..35db0b2614df 100644 --- a/drivers/infiniband/hw/sif/psif_hw_data_le.h +++ b/drivers/infiniband/hw/sif/psif_hw_data_le.h @@ -1631,7 +1631,7 @@ struct psif_modify_qp { /* QP number UF and command for either modify or query QP. */ struct psif_modify_command { /* Manually added spacing to pad out psif_modify_command */ - u32 pad01:3; + u32 pad00:3; /* * This will arm interrupt to be sent when the refcount for the QP index used * have reached zero. It should be used when modify to Reset - when interrupt @@ -2159,11 +2159,11 @@ struct psif_csr_modify_qp_ctrl { u16 path_mtu:1; /* Change path req_access error if set. */ u64 req_access_error:1; - /* Manually added spacing to pad outpsif_qp_attributes */ - u64 pad02:7; + /* Manually added spacing to pad out psif_qp_attributes */ + u64 pad00:7; /* Inlined cmd_attributes : struct psif_qp_attributes (24 bits) */ /* Manually added spacing to pad out psif_modify_command */ - u64 pad03:3; + u64 pad01:3; /* * This will arm interrupt to be sent when the refcount for the QP index used * have reached zero. It should be used when modify to Reset - when interrupt @@ -3286,7 +3286,7 @@ struct psif_base_addr { /* Subjected to copy and convert */ */ u32 extent_log2:5; /* Manually added spacing to pad out base addr */ - u32 pad04:27; + u32 pad00:27; /* Number of entries in table. */ u32 num_entries; } PSIF_PACKED_ALIGNED; /* struct psif_base_addr [24 byte] */ diff --git a/drivers/infiniband/hw/sif/psif_hw_print.c b/drivers/infiniband/hw/sif/psif_hw_print.c index d9a074fa9280..fdd42d28428c 100644 --- a/drivers/infiniband/hw/sif/psif_hw_print.c +++ b/drivers/infiniband/hw/sif/psif_hw_print.c @@ -2524,7 +2524,7 @@ void write_struct_psif_wr(XFILE *fd, xprintf(fd, " .xrc_hdr = "); write_struct_psif_wr_xrc(fd, 0, &(data->xrc_hdr)); xprintf(fd, "}"); - } +} void write_struct_psif_wr_expand(XFILE *fd, int network_order, diff --git a/drivers/infiniband/hw/sif/sif_dev.h b/drivers/infiniband/hw/sif/sif_dev.h index fafe70e22022..30bd7282e39d 100644 --- a/drivers/infiniband/hw/sif/sif_dev.h +++ b/drivers/infiniband/hw/sif/sif_dev.h @@ -295,7 +295,6 @@ struct sif_dev { bool registered; /* Set when we are registered with the verbs layer */ u64 min_resp_ticks; /* expected min. hw resp.time in ticks */ - u16 jiffies_sampling_cnt; /* 1/N counter used to display performance measurement. */ /* Support for workaround for #3552 - feature_mask create_do_not_evict_qp: */ u32 dne_qp; @@ -697,7 +696,6 @@ extern uint sif_rq_size; extern ulong sif_eps_log_size; extern ushort sif_eps_log_level; -extern ushort sif_perf_sampling_threshold; extern uint sif_fmr_cache_flush_threshold; /* Maximum number of outstanding privileged QP requests supported */