Commit 6a42265c authored by Leon Romanovsky's avatar Leon Romanovsky Committed by Jason Gunthorpe
Browse files

RDMA/ocrdma: Make ocrdma_pma_counters() return void 

This function always returns 0, so just use void and remove the bogus
checking at the only call site.

Link: https://lore.kernel.org/r/20191029062745.7932-6-leon@kernel.org


Signed-off-by: default avatarLeon Romanovsky <leonro@mellanox.com>
Signed-off-by: default avatarJason Gunthorpe <jgg@mellanox.com>
parent be4a8d46

drivers/infiniband/hw/ocrdma/ocrdma_ah.c

+2 −4
Original line number Diff line number Diff line
@@ -268,10 +268,8 @@ int ocrdma_process_mad(struct ib_device *ibdev, 
	switch (in_mad->mad_hdr.mgmt_class) {

	case IB_MGMT_CLASS_PERF_MGMT:

		dev = get_ocrdma_dev(ibdev);

		if (!ocrdma_pma_counters(dev, out_mad))

		ocrdma_pma_counters(dev, out_mad);

		status = IB_MAD_RESULT_SUCCESS | IB_MAD_RESULT_REPLY;

		else

			status = IB_MAD_RESULT_SUCCESS;

		break;

	default:

		status = IB_MAD_RESULT_SUCCESS;

drivers/infiniband/hw/ocrdma/ocrdma_stats.c

+1 −3
Original line number Diff line number Diff line
@@ -670,8 +670,7 @@ err: 
	return -EFAULT;

}



int ocrdma_pma_counters(struct ocrdma_dev *dev,

			struct ib_mad *out_mad)

void ocrdma_pma_counters(struct ocrdma_dev *dev, struct ib_mad *out_mad)

{

	struct ib_pma_portcounters *pma_cnt;
@@ -682,7 +681,6 @@ int ocrdma_pma_counters(struct ocrdma_dev *dev, 
	pma_cnt->port_rcv_data     = cpu_to_be32(ocrdma_sysfs_rcv_data(dev));

	pma_cnt->port_xmit_packets = cpu_to_be32(ocrdma_sysfs_xmit_pkts(dev));

	pma_cnt->port_rcv_packets  = cpu_to_be32(ocrdma_sysfs_rcv_pkts(dev));

	return 0;

}



static ssize_t ocrdma_dbgfs_ops_read(struct file *filp, char __user *buffer,

drivers/infiniband/hw/ocrdma/ocrdma_stats.h

+1 −2
Original line number Diff line number Diff line
@@ -69,7 +69,6 @@ bool ocrdma_alloc_stats_resources(struct ocrdma_dev *dev); 
void ocrdma_release_stats_resources(struct ocrdma_dev *dev);

void ocrdma_rem_port_stats(struct ocrdma_dev *dev);

void ocrdma_add_port_stats(struct ocrdma_dev *dev);

int ocrdma_pma_counters(struct ocrdma_dev *dev,

			struct ib_mad *out_mad);

void ocrdma_pma_counters(struct ocrdma_dev *dev, struct ib_mad *out_mad);



#endif	/* __OCRDMA_STATS_H__ */

CRA Git | Maintained and supported by SUSTech CRA and CCSE