staging: rdma: Fix braces around if/else (63417188) · Commits · e / devices / android_kernel_teracube_2e

drivers/staging/rdma/ipath/ipath_driver.c

+8 −11

Original line number	Diff line number	Diff line
		@@ -490,8 +490,7 @@ static int ipath_init_one(struct pci_dev pdev, const struct pci_device_id ent)
		"Unable to set DMA mask for unit %u: %d\n",
		dd->ipath_unit, ret);
		goto bail_regions;
		}
		else {
		} else {
		ipath_dbg("No 64bit DMA mask, used 32 bit mask\n");
		ret = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(32));
		if (ret)
		@@ -501,8 +500,7 @@ static int ipath_init_one(struct pci_dev pdev, const struct pci_device_id ent)
		dd->ipath_unit, ret);

		}
		}
		else {
		} else {
		ret = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(64));
		if (ret)
		dev_info(&pdev->dev,
		@@ -1229,11 +1227,10 @@ void ipath_kreceive(struct ipath_portdata *pd)
		ipath_cdbg(PKT, "typ %x, opcode %x (eager, "
		"qp=%x), len %x; ignored\n",
		etype, opcode, qp, tlen);
		}
		else if (etype == RCVHQ_RCV_TYPE_EXPECTED)
		} else if (etype == RCVHQ_RCV_TYPE_EXPECTED) {
		ipath_dbg("Bug: Expected TID, opcode %x; ignored\n",
		be32_to_cpu(hdr->bth[0]) >> 24);
		else {
		} else {
		/*
		* error packet, type of error unknown.
		* Probably type 3, but we don't know, so don't
		@@ -1270,8 +1267,9 @@ void ipath_kreceive(struct ipath_portdata *pd)
		pd->port_seq_cnt = 1;
		if (seq != pd->port_seq_cnt)
		last = 1;
		} else if (l == hdrqtail)
		} else if (l == hdrqtail) {
		last = 1;
		}
		/*
		* update head regs on last packet, and every 16 packets.
		* Reduce bus traffic, while still trying to prevent
		@@ -1821,15 +1819,14 @@ int ipath_create_rcvhdrq(struct ipath_devdata *dd,
		(unsigned long) pd->port_rcvhdrq_phys,
		(unsigned long) pd->port_rcvhdrq_size,
		pd->port_port);
		}
		else
		} else {
		ipath_cdbg(VERBOSE, "reuse port %d rcvhdrq @%p %llx phys; "
		"hdrtailaddr@%p %llx physical\n",
		pd->port_port, pd->port_rcvhdrq,
		(unsigned long long) pd->port_rcvhdrq_phys,
		pd->port_rcvhdrtail_kvaddr, (unsigned long long)
		pd->port_rcvhdrqtailaddr_phys);

		}
		/* clear for security and sanity on each use */
		memset(pd->port_rcvhdrq, 0, pd->port_rcvhdrq_size);
		if (pd->port_rcvhdrtail_kvaddr)

drivers/staging/rdma/ipath/ipath_file_ops.c

+6 −6

Original line number	Diff line number	Diff line
		@@ -825,14 +825,14 @@ static void ipath_clean_part_key(struct ipath_portdata *pd,
		ipath_stats.sps_pkeys[j] =
		dd->ipath_pkeys[j] = 0;
		pchanged++;
		}
		else ipath_cdbg(
		VERBOSE, "p%u key %x matches #%d, "
		} else {
		ipath_cdbg(VERBOSE, "p%u key %x matches #%d, "
		"but ref still %d\n", pd->port_port,
		pd->port_pkeys[i], j,
		atomic_read(&dd->ipath_pkeyrefs[j]));
		break;
		}
		}
		pd->port_pkeys[i] = 0;
		}
		if (pchanged) {

drivers/staging/rdma/ipath/ipath_iba6110.c

+3 −4

Original line number	Diff line number	Diff line
		@@ -666,9 +666,9 @@ static void ipath_ht_handle_hwerrors(struct ipath_devdata dd, char msg,
		* other reset is possible.
		*/
		dd->ipath_flags &= ~IPATH_INITTED;
		}
		else
		} else {
		msg = 0; / recovered from all of them */
		}
		if (*msg)
		ipath_dev_err(dd, "%s hardware error\n", msg);
		if (isfatal && !ipath_diag_inuse && dd->ipath_freezemsg)
		@@ -1134,8 +1134,7 @@ static void ipath_setup_ht_setextled(struct ipath_devdata *dd,
		extctl &= ~INFINIPATH_EXTC_LEDGBLERR_OFF;
		if (lst == INFINIPATH_IBCS_L_STATE_ACTIVE)
		extctl \|= INFINIPATH_EXTC_LEDGBLOK_ON;
		}
		else {
		} else {
		extctl = dd->ipath_extctrl &
		~(INFINIPATH_EXTC_LED1PRIPORT_ON \|
		INFINIPATH_EXTC_LED2PRIPORT_ON);

drivers/staging/rdma/ipath/ipath_init_chip.c

+5 −5

Original line number	Diff line number	Diff line
		@@ -324,10 +324,10 @@ static int init_chip_first(struct ipath_devdata *dd)
		dd->ipath_pio2kbase, dd->ipath_piobcnt4k,
		dd->ipath_piosize4k, dd->ipath_pio4kbase,
		dd->ipath_4kalign);
		}
		else ipath_dbg("%u 2k piobufs @ %p\n",
		} else {
		ipath_dbg("%u 2k piobufs @ %p\n",
		dd->ipath_piobcnt2k, dd->ipath_pio2kbase);

		}
		done:
		return ret;
		}
		@@ -903,9 +903,9 @@ int ipath_init_chip(struct ipath_devdata *dd, int reinit)
		ipath_dev_err(dd, "failed to allocate kernel port's "
		"rcvhdrq and/or egr bufs\n");
		goto done;
		}
		else
		} else {
		enable_chip(dd, reinit);
		}

		/* after enable_chip, so pioavailshadow setup */
		ipath_chg_pioavailkernel(dd, 0, piobufs, 1);

drivers/staging/rdma/ipath/ipath_intr.c

+3 −4

Original line number	Diff line number	Diff line
		@@ -514,15 +514,14 @@ static unsigned handle_frequent_errors(struct ipath_devdata *dd,
		*noprint = 1;
		if (!supp_msgs++)
		nextmsg_time = nc + HZ * 3;
		}
		else if (supp_msgs) {
		} else if (supp_msgs) {
		handle_supp_msgs(dd, supp_msgs, msg, msgsz);
		supp_msgs = 0;
		nmsgs = 0;
		}
		}
		else if (!nmsgs++ \|\| time_after(nc, nextmsg_time))
		} else if (!nmsgs++ \|\| time_after(nc, nextmsg_time)) {
		nextmsg_time = nc + HZ / 2;
		}

		return supp_msgs;
		}