Commit f67c6275 authored by Doug Maxey's avatar Doug Maxey Committed by David S. Miller
Browse files

ehea: fix qmr checkpatch complaints 



Cc: Jan-Bernd Themann <themann@de.ibm.com>
Signed-off-by: default avatarDoug Maxey <dwm@austin.ibm.com>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e076c872

drivers/net/ehea/ehea_qmr.c

+16 −16
Original line number Diff line number Diff line
@@ -33,8 +33,6 @@ 




struct ehea_busmap ehea_bmap = { 0, 0, NULL };

extern u64 ehea_driver_flags;

extern struct work_struct ehea_rereg_mr_task;





static void *hw_qpageit_get_inc(struct hw_queue *queue)
@@ -235,8 +233,8 @@ int ehea_destroy_cq(struct ehea_cq *cq) 
		return 0;



	hcp_epas_dtor(&cq->epas);



	if ((hret = ehea_destroy_cq_res(cq, NORMAL_FREE)) == H_R_STATE) {

	hret = ehea_destroy_cq_res(cq, NORMAL_FREE);

	if (hret == H_R_STATE) {

		ehea_error_data(cq->adapter, cq->fw_handle);

		hret = ehea_destroy_cq_res(cq, FORCE_FREE);

	}
@@ -301,13 +299,13 @@ struct ehea_eq *ehea_create_eq(struct ehea_adapter *adapter, 
		if (i == (eq->attr.nr_pages - 1)) {

			/* last page */

			vpage = hw_qpageit_get_inc(&eq->hw_queue);

			if ((hret != H_SUCCESS) || (vpage)) {

			if ((hret != H_SUCCESS) || (vpage))

				goto out_kill_hwq;

			}



		} else {

			if ((hret != H_PAGE_REGISTERED) || (!vpage)) {

			if ((hret != H_PAGE_REGISTERED) || (!vpage))

				goto out_kill_hwq;

			}



		}

	}
@@ -364,7 +362,8 @@ int ehea_destroy_eq(struct ehea_eq *eq) 


	hcp_epas_dtor(&eq->epas);



	if ((hret = ehea_destroy_eq_res(eq, NORMAL_FREE)) == H_R_STATE) {

	hret = ehea_destroy_eq_res(eq, NORMAL_FREE);

	if (hret == H_R_STATE) {

		ehea_error_data(eq->adapter, eq->fw_handle);

		hret = ehea_destroy_eq_res(eq, FORCE_FREE);

	}
@@ -546,7 +545,8 @@ int ehea_destroy_qp(struct ehea_qp *qp) 


	hcp_epas_dtor(&qp->epas);



	if ((hret = ehea_destroy_qp_res(qp, NORMAL_FREE)) == H_R_STATE) {

	hret = ehea_destroy_qp_res(qp, NORMAL_FREE);

	if (hret == H_R_STATE) {

		ehea_error_data(qp->adapter, qp->fw_handle);

		hret = ehea_destroy_qp_res(qp, FORCE_FREE);

	}

drivers/net/ehea/ehea_qmr.h

+8 −8
Original line number Diff line number Diff line
@@ -41,8 +41,8 @@ 
#define EHEA_SECTSIZE          (1UL << 24)

#define EHEA_PAGES_PER_SECTION (EHEA_SECTSIZE >> EHEA_PAGESHIFT)



#if (1UL << SECTION_SIZE_BITS) < EHEA_SECTSIZE

#error eHEA module can't work if kernel sectionsize < ehea sectionsize

#if ((1UL << SECTION_SIZE_BITS) < EHEA_SECTSIZE)

#error eHEA module cannot work if kernel sectionsize < ehea sectionsize

#endif



/* Some abbreviations used here: