RDMA: Delete not-used static inline functions

Perform mass deletion of static inline functions that are not used.

Link: https://lore.kernel.org/r/20210314133908.291945-3-leon@kernel.org
Signed-off-by: Leon Romanovsky <leonro@nvidia.com>
Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>

diff --git a/drivers/infiniband/hw/cxgb4/iw_cxgb4.h b/drivers/infiniband/hw/cxgb4/iw_cxgb4.h
index f85477f3b037d22f2ba0e0b8e0edbd0f8e7e3d9e..cdec5deb37a1f8e3756a98034e25329dc9f62637 100644 (file)
--- a/drivers/infiniband/hw/cxgb4/iw_cxgb4.h
+++ b/drivers/infiniband/hw/cxgb4/iw_cxgb4.h
@@ -341,11 +341,6 @@ static inline struct c4iw_dev *to_c4iw_dev(struct ib_device *ibdev)
        return container_of(ibdev, struct c4iw_dev, ibdev);
 }
 
        return container_of(ibdev, struct c4iw_dev, ibdev);
 }
 

-static inline struct c4iw_dev *rdev_to_c4iw_dev(struct c4iw_rdev *rdev)
-{
-       return container_of(rdev, struct c4iw_dev, rdev);
-}
-

 static inline struct c4iw_cq *get_chp(struct c4iw_dev *rhp, u32 cqid)
 {
        return xa_load(&rhp->cqs, cqid);
 static inline struct c4iw_cq *get_chp(struct c4iw_dev *rhp, u32 cqid)
 {
        return xa_load(&rhp->cqs, cqid);


@@ -659,12 +654,6 @@ static inline u32 c4iw_ib_to_tpt_access(int a)
               FW_RI_MEM_ACCESS_LOCAL_READ;
 }
 
               FW_RI_MEM_ACCESS_LOCAL_READ;
 }
 

-static inline u32 c4iw_ib_to_tpt_bind_access(int acc)
-{
-       return (acc & IB_ACCESS_REMOTE_WRITE ? FW_RI_MEM_ACCESS_REM_WRITE : 0) |
-              (acc & IB_ACCESS_REMOTE_READ ? FW_RI_MEM_ACCESS_REM_READ : 0);
-}
-

 enum c4iw_mmid_state {
        C4IW_STAG_STATE_VALID,
        C4IW_STAG_STATE_INVALID
 enum c4iw_mmid_state {
        C4IW_STAG_STATE_VALID,
        C4IW_STAG_STATE_INVALID

diff --git a/drivers/infiniband/hw/cxgb4/t4.h b/drivers/infiniband/hw/cxgb4/t4.h
index b170817b27419f0d4c589facf55463d5ff7aba62..c3b0e2896475ecaaa16b924c16d309393f714a1e 100644 (file)
--- a/drivers/infiniband/hw/cxgb4/t4.h
+++ b/drivers/infiniband/hw/cxgb4/t4.h
@@ -487,11 +487,6 @@ static inline int t4_rq_empty(struct t4_wq *wq)
        return wq->rq.in_use == 0;
 }
 
        return wq->rq.in_use == 0;
 }
 

-static inline int t4_rq_full(struct t4_wq *wq)
-{
-       return wq->rq.in_use == (wq->rq.size - 1);
-}
-

 static inline u32 t4_rq_avail(struct t4_wq *wq)
 {
        return wq->rq.size - 1 - wq->rq.in_use;
 static inline u32 t4_rq_avail(struct t4_wq *wq)
 {
        return wq->rq.size - 1 - wq->rq.in_use;


@@ -534,11 +529,6 @@ static inline int t4_sq_empty(struct t4_wq *wq)
        return wq->sq.in_use == 0;
 }
 
        return wq->sq.in_use == 0;
 }
 

-static inline int t4_sq_full(struct t4_wq *wq)
-{
-       return wq->sq.in_use == (wq->sq.size - 1);
-}
-

 static inline u32 t4_sq_avail(struct t4_wq *wq)
 {
        return wq->sq.size - 1 - wq->sq.in_use;
 static inline u32 t4_sq_avail(struct t4_wq *wq)
 {
        return wq->sq.size - 1 - wq->sq.in_use;


@@ -679,11 +669,6 @@ static inline void t4_enable_wq_db(struct t4_wq *wq)
        wq->rq.queue[wq->rq.size].status.db_off = 0;
 }
 
        wq->rq.queue[wq->rq.size].status.db_off = 0;
 }
 

-static inline int t4_wq_db_enabled(struct t4_wq *wq)
-{
-       return !wq->rq.queue[wq->rq.size].status.db_off;
-}
-

 enum t4_cq_flags {
        CQ_ARMED        = 1,
 };
 enum t4_cq_flags {
        CQ_ARMED        = 1,
 };


@@ -817,19 +802,6 @@ static inline int t4_next_hw_cqe(struct t4_cq *cq, struct t4_cqe **cqe)
        return ret;
 }
 
        return ret;
 }
 

-static inline struct t4_cqe *t4_next_sw_cqe(struct t4_cq *cq)
-{
-       if (cq->sw_in_use == cq->size) {
-               pr_warn("%s cxgb4 sw cq overflow cqid %u\n",
-                       __func__, cq->cqid);
-               cq->error = 1;
-               return NULL;
-       }
-       if (cq->sw_in_use)
-               return &cq->sw_queue[cq->sw_cidx];
-       return NULL;
-}
-

 static inline int t4_next_cqe(struct t4_cq *cq, struct t4_cqe **cqe)
 {
        int ret = 0;
 static inline int t4_next_cqe(struct t4_cq *cq, struct t4_cqe **cqe)
 {
        int ret = 0;


@@ -843,11 +815,6 @@ static inline int t4_next_cqe(struct t4_cq *cq, struct t4_cqe **cqe)
        return ret;
 }
 
        return ret;
 }
 

-static inline int t4_cq_in_error(struct t4_cq *cq)
-{
-       return *cq->qp_errp;
-}
-

 static inline void t4_set_cq_in_error(struct t4_cq *cq)
 {
        *cq->qp_errp = 1;
 static inline void t4_set_cq_in_error(struct t4_cq *cq)
 {
        *cq->qp_errp = 1;

diff --git a/drivers/infiniband/hw/hfi1/chip.h b/drivers/infiniband/hw/hfi1/chip.h
index 2c6f2de74d4d65cfafef02e022337e29a833b0c6..ac26649d44636996dfb5c4858070ecb3ee66c33f 100644 (file)
--- a/drivers/infiniband/hw/hfi1/chip.h
+++ b/drivers/infiniband/hw/hfi1/chip.h
@@ -822,11 +822,6 @@ int acquire_lcb_access(struct hfi1_devdata *dd, int sleep_ok);
 int release_lcb_access(struct hfi1_devdata *dd, int sleep_ok);
 #define LCB_START DC_LCB_CSRS
 #define LCB_END   DC_8051_CSRS /* next block is 8051 */
 int release_lcb_access(struct hfi1_devdata *dd, int sleep_ok);
 #define LCB_START DC_LCB_CSRS
 #define LCB_END   DC_8051_CSRS /* next block is 8051 */

-static inline int is_lcb_offset(u32 offset)
-{
-       return (offset >= LCB_START && offset < LCB_END);
-}
-

 extern uint num_vls;
 
 extern uint disable_integrity;
 extern uint num_vls;
 
 extern uint disable_integrity;

diff --git a/drivers/infiniband/hw/hfi1/hfi.h b/drivers/infiniband/hw/hfi1/hfi.h
index e09e8244a94c4e2201ce73ea79fd26d04414e349..024ef6e3ab7e8b024e023b454032eada82a5046e 100644 (file)
--- a/drivers/infiniband/hw/hfi1/hfi.h
+++ b/drivers/infiniband/hw/hfi1/hfi.h
@@ -717,12 +717,6 @@ static inline void incr_cntr64(u64 *cntr)
                (*cntr)++;
 }
 
                (*cntr)++;
 }
 

-static inline void incr_cntr32(u32 *cntr)
-{
-       if (*cntr < (u32)-1LL)
-               (*cntr)++;
-}
-

 #define MAX_NAME_SIZE 64
 struct hfi1_msix_entry {
        enum irq_type type;
 #define MAX_NAME_SIZE 64
 struct hfi1_msix_entry {
        enum irq_type type;

diff --git a/drivers/infiniband/hw/hfi1/verbs_txreq.h b/drivers/infiniband/hw/hfi1/verbs_txreq.h
index d2d526c5a756090b9a013a0fbfed52a5a9e495d2..4bdfc79323768d4819c226fd19c33ec2430f3b4d 100644 (file)
--- a/drivers/infiniband/hw/hfi1/verbs_txreq.h
+++ b/drivers/infiniband/hw/hfi1/verbs_txreq.h
@@ -99,11 +99,6 @@ static inline struct verbs_txreq *get_txreq(struct hfi1_ibdev *dev,
        return tx;
 }
 
        return tx;
 }
 

-static inline struct sdma_txreq *get_sdma_txreq(struct verbs_txreq *tx)
-{
-       return &tx->txreq;
-}
-

 static inline struct verbs_txreq *get_waiting_verbs_txreq(struct iowait_work *w)
 {
        struct sdma_txreq *stx;
 static inline struct verbs_txreq *get_waiting_verbs_txreq(struct iowait_work *w)
 {
        struct sdma_txreq *stx;

diff --git a/drivers/infiniband/hw/i40iw/i40iw.h b/drivers/infiniband/hw/i40iw/i40iw.h
index 6a79502c8b53cc77627f0b9a578a1d3bc564951e..be4094ac4fac2535ca8970832daf9388f4c7cddf 100644 (file)
--- a/drivers/infiniband/hw/i40iw/i40iw.h
+++ b/drivers/infiniband/hw/i40iw/i40iw.h
@@ -504,15 +504,6 @@ static inline void i40iw_free_resource(struct i40iw_device *iwdev,
        spin_unlock_irqrestore(&iwdev->resource_lock, flags);
 }
 
        spin_unlock_irqrestore(&iwdev->resource_lock, flags);
 }
 

-/**
- * to_iwhdl - Get the handler from the device pointer
- * @iwdev: device pointer
- **/
-static inline struct i40iw_handler *to_iwhdl(struct i40iw_device *iw_dev)
-{
-       return container_of(iw_dev, struct i40iw_handler, device);
-}
-

 struct i40iw_handler *i40iw_find_netdev(struct net_device *netdev);
 
 /**
 struct i40iw_handler *i40iw_find_netdev(struct net_device *netdev);
 
 /**

diff --git a/drivers/infiniband/hw/i40iw/i40iw_osdep.h b/drivers/infiniband/hw/i40iw/i40iw_osdep.h
index d474aad62a81d44702680b8dd5327c1e3f0cf74c..d938ccb195b11c0a3e9737bba814f7bfac52a590 100644 (file)
--- a/drivers/infiniband/hw/i40iw/i40iw_osdep.h
+++ b/drivers/infiniband/hw/i40iw/i40iw_osdep.h
@@ -50,17 +50,6 @@ static inline void set_64bit_val(u64 *wqe_words, u32 byte_index, u64 value)
        wqe_words[byte_index >> 3] = value;
 }
 
        wqe_words[byte_index >> 3] = value;
 }
 

-/**
- * set_32bit_val - set 32 value to hw wqe
- * @wqe_words: wqe addr to write
- * @byte_index: index in wqe
- * @value: value to write
- **/
-static inline void set_32bit_val(u32 *wqe_words, u32 byte_index, u32 value)
-{
-       wqe_words[byte_index >> 2] = value;
-}
-

 /**
  * get_64bit_val - read 64 bit value from wqe
  * @wqe_words: wqe addr
 /**
  * get_64bit_val - read 64 bit value from wqe
  * @wqe_words: wqe addr


@@ -72,17 +61,6 @@ static inline void get_64bit_val(u64 *wqe_words, u32 byte_index, u64 *value)
        *value = wqe_words[byte_index >> 3];
 }
 
        *value = wqe_words[byte_index >> 3];
 }
 

-/**
- * get_32bit_val - read 32 bit value from wqe
- * @wqe_words: wqe addr
- * @byte_index: index to reaad from
- * @value: return 32 bit value
- **/
-static inline void get_32bit_val(u32 *wqe_words, u32 byte_index, u32 *value)
-{
-       *value = wqe_words[byte_index >> 2];
-}
-

 struct i40iw_dma_mem {
        void *va;
        dma_addr_t pa;
 struct i40iw_dma_mem {
        void *va;
        dma_addr_t pa;

diff --git a/drivers/infiniband/hw/qib/qib.h b/drivers/infiniband/hw/qib/qib.h
index ee211423058a1eee60aefdaa5aba40ea69f05a11..35801c6cc068607c9a461535a37e1030d851d822 100644 (file)
--- a/drivers/infiniband/hw/qib/qib.h
+++ b/drivers/infiniband/hw/qib/qib.h
@@ -1303,11 +1303,6 @@ int qib_sdma_verbs_send(struct qib_pportdata *, struct rvt_sge_state *,
 /* ppd->sdma_lock should be locked before calling this. */
 int qib_sdma_make_progress(struct qib_pportdata *dd);
 
 /* ppd->sdma_lock should be locked before calling this. */
 int qib_sdma_make_progress(struct qib_pportdata *dd);
 

-static inline int qib_sdma_empty(const struct qib_pportdata *ppd)
-{
-       return ppd->sdma_descq_added == ppd->sdma_descq_removed;
-}
-

 /* must be called under qib_sdma_lock */
 static inline u16 qib_sdma_descq_freecnt(const struct qib_pportdata *ppd)
 {
 /* must be called under qib_sdma_lock */
 static inline u16 qib_sdma_descq_freecnt(const struct qib_pportdata *ppd)
 {


@@ -1364,27 +1359,6 @@ static inline u32 qib_get_rcvhdrtail(const struct qib_ctxtdata *rcd)
                *((volatile __le64 *)rcd->rcvhdrtail_kvaddr)); /* DMA'ed */
 }
 
                *((volatile __le64 *)rcd->rcvhdrtail_kvaddr)); /* DMA'ed */
 }
 

-static inline u32 qib_get_hdrqtail(const struct qib_ctxtdata *rcd)
-{
-       const struct qib_devdata *dd = rcd->dd;
-       u32 hdrqtail;
-
-       if (dd->flags & QIB_NODMA_RTAIL) {
-               __le32 *rhf_addr;
-               u32 seq;
-
-               rhf_addr = (__le32 *) rcd->rcvhdrq +
-                       rcd->head + dd->rhf_offset;
-               seq = qib_hdrget_seq(rhf_addr);
-               hdrqtail = rcd->head;
-               if (seq == rcd->seq_cnt)
-                       hdrqtail++;
-       } else
-               hdrqtail = qib_get_rcvhdrtail(rcd);
-
-       return hdrqtail;
-}
-

 /*
  * sysfs interface.
  */
 /*
  * sysfs interface.
  */

diff --git a/drivers/infiniband/hw/qib/qib_common.h b/drivers/infiniband/hw/qib/qib_common.h
index f91f23e02283f01c36be96431a528cfa291011bb..cf652831d8e79c1d9bc1662f570fc78f625e7f94 100644 (file)
--- a/drivers/infiniband/hw/qib/qib_common.h
+++ b/drivers/infiniband/hw/qib/qib_common.h
@@ -795,11 +795,4 @@ static inline __u32 qib_hdrget_use_egr_buf(const __le32 *rbuf)
 {
        return __le32_to_cpu(rbuf[0]) & QLOGIC_IB_RHF_L_USE_EGR;
 }
 {
        return __le32_to_cpu(rbuf[0]) & QLOGIC_IB_RHF_L_USE_EGR;
 }

-
-static inline __u32 qib_hdrget_qib_ver(__le32 hdrword)
-{
-       return (__le32_to_cpu(hdrword) >> QLOGIC_IB_I_VERS_SHIFT) &
-               QLOGIC_IB_I_VERS_MASK;
-}
-

 #endif                          /* _QIB_COMMON_H */
 #endif                          /* _QIB_COMMON_H */

diff --git a/drivers/infiniband/hw/vmw_pvrdma/pvrdma.h b/drivers/infiniband/hw/vmw_pvrdma/pvrdma.h
index de57f2fed743755b8d29ca4b7ae75563cd1c81ba..763ddc6f25d1ae9aca097bcc3de9f9d86425baf4 100644 (file)
--- a/drivers/infiniband/hw/vmw_pvrdma/pvrdma.h
+++ b/drivers/infiniband/hw/vmw_pvrdma/pvrdma.h
@@ -344,11 +344,6 @@ static inline enum ib_port_state pvrdma_port_state_to_ib(
        return (enum ib_port_state)state;
 }
 
        return (enum ib_port_state)state;
 }
 

-static inline int ib_port_cap_flags_to_pvrdma(int flags)
-{
-       return flags & PVRDMA_MASK(PVRDMA_PORT_CAP_FLAGS_MAX);
-}
-

 static inline int pvrdma_port_cap_flags_to_ib(int flags)
 {
        return flags;
 static inline int pvrdma_port_cap_flags_to_ib(int flags)
 {
        return flags;


@@ -410,11 +405,6 @@ static inline enum pvrdma_qp_type ib_qp_type_to_pvrdma(enum ib_qp_type type)
        return (enum pvrdma_qp_type)type;
 }
 
        return (enum pvrdma_qp_type)type;
 }
 

-static inline enum ib_qp_type pvrdma_qp_type_to_ib(enum pvrdma_qp_type type)
-{
-       return (enum ib_qp_type)type;
-}
-

 static inline enum pvrdma_qp_state ib_qp_state_to_pvrdma(enum ib_qp_state state)
 {
        return (enum pvrdma_qp_state)state;
 static inline enum pvrdma_qp_state ib_qp_state_to_pvrdma(enum ib_qp_state state)
 {
        return (enum pvrdma_qp_state)state;

diff --git a/drivers/infiniband/hw/vmw_pvrdma/pvrdma_verbs.h b/drivers/infiniband/hw/vmw_pvrdma/pvrdma_verbs.h
index 97ed8f952f6e94c750083333f4f17dfc03e764a0..4b13c1b6328a701974c9af32ab068342042cf004 100644 (file)
--- a/drivers/infiniband/hw/vmw_pvrdma/pvrdma_verbs.h
+++ b/drivers/infiniband/hw/vmw_pvrdma/pvrdma_verbs.h
@@ -70,30 +70,6 @@ enum pvrdma_mtu {
        PVRDMA_MTU_4096 = 5,
 };
 
        PVRDMA_MTU_4096 = 5,
 };
 

-static inline int pvrdma_mtu_enum_to_int(enum pvrdma_mtu mtu)
-{
-       switch (mtu) {
-       case PVRDMA_MTU_256:    return  256;
-       case PVRDMA_MTU_512:    return  512;
-       case PVRDMA_MTU_1024:   return 1024;
-       case PVRDMA_MTU_2048:   return 2048;
-       case PVRDMA_MTU_4096:   return 4096;
-       default:                return   -1;
-       }
-}
-
-static inline enum pvrdma_mtu pvrdma_mtu_int_to_enum(int mtu)
-{
-       switch (mtu) {
-       case 256:       return PVRDMA_MTU_256;
-       case 512:       return PVRDMA_MTU_512;
-       case 1024:      return PVRDMA_MTU_1024;
-       case 2048:      return PVRDMA_MTU_2048;
-       case 4096:
-       default:        return PVRDMA_MTU_4096;
-       }
-}
-

 enum pvrdma_port_state {
        PVRDMA_PORT_NOP                 = 0,
        PVRDMA_PORT_DOWN                = 1,
 enum pvrdma_port_state {
        PVRDMA_PORT_NOP                 = 0,
        PVRDMA_PORT_DOWN                = 1,


@@ -138,17 +114,6 @@ enum pvrdma_port_width {
        PVRDMA_WIDTH_12X        = 8,
 };
 
        PVRDMA_WIDTH_12X        = 8,
 };
 

-static inline int pvrdma_width_enum_to_int(enum pvrdma_port_width width)
-{
-       switch (width) {
-       case PVRDMA_WIDTH_1X:   return  1;
-       case PVRDMA_WIDTH_4X:   return  4;
-       case PVRDMA_WIDTH_8X:   return  8;
-       case PVRDMA_WIDTH_12X:  return 12;
-       default:                return -1;
-       }
-}
-

 enum pvrdma_port_speed {
        PVRDMA_SPEED_SDR        = 1,
        PVRDMA_SPEED_DDR        = 2,
 enum pvrdma_port_speed {
        PVRDMA_SPEED_SDR        = 1,
        PVRDMA_SPEED_DDR        = 2,

diff --git a/drivers/infiniband/sw/siw/iwarp.h b/drivers/infiniband/sw/siw/iwarp.h
index e8a04d9c89cbcfa67f61085e416b7d32e0850b1e..3f1dedb50a0da75d0823b8f30465e820323e0528 100644 (file)
--- a/drivers/infiniband/sw/siw/iwarp.h
+++ b/drivers/infiniband/sw/siw/iwarp.h
@@ -114,13 +114,6 @@ static inline u8 __ddp_get_version(struct iwarp_ctrl *ctrl)
        return be16_to_cpu(ctrl->ddp_rdmap_ctrl & DDP_MASK_VERSION) >> 8;
 }
 
        return be16_to_cpu(ctrl->ddp_rdmap_ctrl & DDP_MASK_VERSION) >> 8;
 }
 

-static inline void __ddp_set_version(struct iwarp_ctrl *ctrl, u8 version)
-{
-       ctrl->ddp_rdmap_ctrl =
-               (ctrl->ddp_rdmap_ctrl & ~DDP_MASK_VERSION) |
-               (cpu_to_be16((u16)version << 8) & DDP_MASK_VERSION);
-}
-

 static inline u8 __rdmap_get_version(struct iwarp_ctrl *ctrl)
 {
        __be16 ver = ctrl->ddp_rdmap_ctrl & RDMAP_MASK_VERSION;
 static inline u8 __rdmap_get_version(struct iwarp_ctrl *ctrl)
 {
        __be16 ver = ctrl->ddp_rdmap_ctrl & RDMAP_MASK_VERSION;


@@ -128,12 +121,6 @@ static inline u8 __rdmap_get_version(struct iwarp_ctrl *ctrl)
        return be16_to_cpu(ver) >> 6;
 }
 
        return be16_to_cpu(ver) >> 6;
 }
 

-static inline void __rdmap_set_version(struct iwarp_ctrl *ctrl, u8 version)
-{
-       ctrl->ddp_rdmap_ctrl = (ctrl->ddp_rdmap_ctrl & ~RDMAP_MASK_VERSION) |
-                              (cpu_to_be16(version << 6) & RDMAP_MASK_VERSION);
-}
-

 static inline u8 __rdmap_get_opcode(struct iwarp_ctrl *ctrl)
 {
        return be16_to_cpu(ctrl->ddp_rdmap_ctrl & RDMAP_MASK_OPCODE);
 static inline u8 __rdmap_get_opcode(struct iwarp_ctrl *ctrl)
 {
        return be16_to_cpu(ctrl->ddp_rdmap_ctrl & RDMAP_MASK_OPCODE);

diff --git a/drivers/infiniband/sw/siw/siw_mem.h b/drivers/infiniband/sw/siw/siw_mem.h
index db138c8423da547bd35e8737dfa15b04cfaa7c62..f911287576d1dba3dc6d5e4c101b202c98b534a8 100644 (file)
--- a/drivers/infiniband/sw/siw/siw_mem.h
+++ b/drivers/infiniband/sw/siw/siw_mem.h
@@ -29,11 +29,6 @@ static inline void siw_mem_put(struct siw_mem *mem)
        kref_put(&mem->ref, siw_free_mem);
 }
 
        kref_put(&mem->ref, siw_free_mem);
 }
 

-static inline struct siw_mr *siw_mem2mr(struct siw_mem *m)
-{
-       return container_of(m, struct siw_mr, mem);
-}
-

 static inline void siw_unref_mem_sgl(struct siw_mem **mem, unsigned int num_sge)
 {
        while (num_sge) {
 static inline void siw_unref_mem_sgl(struct siw_mem **mem, unsigned int num_sge)
 {
        while (num_sge) {