Commit d125a6c6 authored by Jubin John's avatar Jubin John Committed by Doug Ledford
Browse files

staging/rdma/hfi1: Fix comparison to NULL 



Convert pointer comparisons to NULL to !pointer
to fix checkpatch check:
CHECK: Comparison to NULL could be written "!pointer"

Reviewed-by: default avatarDennis Dalessandro <dennis.dalessandro@intel.com>
Reviewed-by: default avatarIra Weiny <ira.weiny@intel.com>
Reviewed-by: default avatarMike Marciniszyn <mike.marciniszyn@intel.com>
Signed-off-by: default avatarJubin John <jubin.john@intel.com>
Signed-off-by: default avatarDoug Ledford <dledford@redhat.com>
parent 50e5dcbe

drivers/staging/rdma/hfi1/chip.c

+3 −3
Original line number Diff line number Diff line
@@ -12260,7 +12260,7 @@ u64 hfi1_gpio_mod(struct hfi1_devdata *dd, u32 target, u32 data, u32 dir, 


int hfi1_init_ctxt(struct send_context *sc)

{

	if (sc != NULL) {

	if (sc) {

		struct hfi1_devdata *dd = sc->dd;

		u64 reg;

		u8 set = (sc->type == SC_USER ?
@@ -12371,7 +12371,7 @@ static void clean_up_interrupts(struct hfi1_devdata *dd) 
		struct hfi1_msix_entry *me = dd->msix_entries;



		for (i = 0; i < dd->num_msix_entries; i++, me++) {

			if (me->arg == NULL) /* => no irq, no affinity */

			if (!me->arg) /* => no irq, no affinity */

				continue;

			hfi1_put_irq_affinity(dd, &dd->msix_entries[i]);

			free_irq(me->msix.vector, me->arg);
@@ -12534,7 +12534,7 @@ static int request_msix_irqs(struct hfi1_devdata *dd) 
			continue;

		}

		/* no argument, no interrupt */

		if (arg == NULL)

		if (!arg)

			continue;

		/* make sure the name is terminated */

		me->name[sizeof(me->name) - 1] = 0;

drivers/staging/rdma/hfi1/debugfs.c

+1 −1
Original line number Diff line number Diff line
@@ -746,7 +746,7 @@ void hfi1_dbg_ibdev_init(struct hfi1_ibdev *ibd) 
					    ibd->hfi1_ibdev_dbg,

					    ppd,

					    &port_cntr_ops[i].ops,

					    port_cntr_ops[i].ops.write == NULL ?

					    !port_cntr_ops[i].ops.write ?

					    S_IRUGO : S_IRUGO | S_IWUSR);

		}

}

drivers/staging/rdma/hfi1/driver.c

+3 −3
Original line number Diff line number Diff line
@@ -371,7 +371,7 @@ static void rcv_hdrerr(struct hfi1_ctxtdata *rcd, struct hfi1_pportdata *ppd, 
		if (rhf_use_egr_bfr(packet->rhf))

			ebuf = packet->ebuf;



		if (ebuf == NULL)

		if (!ebuf)

			goto drop; /* this should never happen */



		if (lnh == HFI1_LRH_BTH)
@@ -402,7 +402,7 @@ static void rcv_hdrerr(struct hfi1_ctxtdata *rcd, struct hfi1_pportdata *ppd, 
			lqpn = be32_to_cpu(bth[1]) & RVT_QPN_MASK;

			rcu_read_lock();

			qp = rvt_lookup_qpn(rdi, &ibp->rvp, lqpn);

			if (qp == NULL) {

			if (!qp) {

				rcu_read_unlock();

				goto drop;

			}
@@ -637,7 +637,7 @@ static void __prescan_rxq(struct hfi1_packet *packet) 
		rcu_read_lock();

		qp = rvt_lookup_qpn(rdi, &ibp->rvp, qpn);



		if (qp == NULL) {

		if (!qp) {

			rcu_read_unlock();

			goto next;

		}

drivers/staging/rdma/hfi1/init.c

+2 −2
Original line number Diff line number Diff line
@@ -386,7 +386,7 @@ void set_link_ipg(struct hfi1_pportdata *ppd) 


	cc_state = get_cc_state(ppd);



	if (cc_state == NULL)

	if (!cc_state)

		/*

		 * This should _never_ happen - rcu_read_lock() is held,

		 * and set_link_ipg() should not be called if cc_state
@@ -438,7 +438,7 @@ static enum hrtimer_restart cca_timer_fn(struct hrtimer *t) 


	cc_state = get_cc_state(ppd);



	if (cc_state == NULL) {

	if (!cc_state) {

		rcu_read_unlock();

		return HRTIMER_NORESTART;

	}

drivers/staging/rdma/hfi1/mad.c

+4 −4
Original line number Diff line number Diff line
@@ -3297,7 +3297,7 @@ static int __subn_get_opa_cong_setting(struct opa_smp *smp, u32 am, 


	cc_state = get_cc_state(ppd);



	if (cc_state == NULL) {

	if (!cc_state) {

		rcu_read_unlock();

		return reply((struct ib_mad_hdr *)smp);

	}
@@ -3439,7 +3439,7 @@ static int __subn_get_opa_cc_table(struct opa_smp *smp, u32 am, u8 *data, 


	cc_state = get_cc_state(ppd);



	if (cc_state == NULL) {

	if (!cc_state) {

		rcu_read_unlock();

		return reply((struct ib_mad_hdr *)smp);

	}
@@ -3505,14 +3505,14 @@ static int __subn_set_opa_cc_table(struct opa_smp *smp, u32 am, u8 *data, 
	}



	new_cc_state = kzalloc(sizeof(*new_cc_state), GFP_KERNEL);

	if (new_cc_state == NULL)

	if (!new_cc_state)

		goto getit;



	spin_lock(&ppd->cc_state_lock);



	old_cc_state = get_cc_state(ppd);



	if (old_cc_state == NULL) {

	if (!old_cc_state) {

		spin_unlock(&ppd->cc_state_lock);

		kfree(new_cc_state);

		return reply((struct ib_mad_hdr *)smp);