Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit da12c1f6 authored by Mike Marciniszyn's avatar Mike Marciniszyn Committed by Roland Dreier
Browse files

IB/qib: Add blank line after declaration 



Upstream checkpatch now requires this.

Reviewed-by: default avatarDennis Dalessandro <dennis.dalessandro@intel.com>
Signed-off-by: default avatarMike Marciniszyn <mike.marciniszyn@intel.com>
Signed-off-by: default avatarRoland Dreier <roland@purestorage.com>
parent a46a2802

drivers/infiniband/hw/qib/qib_diag.c

+5 −0
Original line number Diff line number Diff line
@@ -257,6 +257,7 @@ static u32 __iomem *qib_remap_ioaddr32(struct qib_devdata *dd, u32 offset, 
	if (dd->userbase) {

		/* If user regs mapped, they are after send, so set limit. */

		u32 ulim = (dd->cfgctxts * dd->ureg_align) + dd->uregbase;



		if (!dd->piovl15base)

			snd_lim = dd->uregbase;

		krb32 = (u32 __iomem *)dd->userbase;
@@ -280,6 +281,7 @@ static u32 __iomem *qib_remap_ioaddr32(struct qib_devdata *dd, u32 offset, 
	snd_bottom = dd->pio2k_bufbase;

	if (snd_lim == 0) {

		u32 tot2k = dd->piobcnt2k * ALIGN(dd->piosize2k, dd->palign);



		snd_lim = snd_bottom + tot2k;

	}

	/* If 4k buffers exist, account for them by bumping
@@ -398,6 +400,7 @@ static int qib_write_umem64(struct qib_devdata *dd, u32 regoffs, 
	/* not very efficient, but it works for now */

	while (reg_addr < reg_end) {

		u64 data;



		if (copy_from_user(&data, uaddr, sizeof(data))) {

			ret = -EFAULT;

			goto bail;
@@ -796,6 +799,7 @@ static ssize_t qib_diag_read(struct file *fp, char __user *data, 
		op = diag_get_observer(dd, *off);

		if (op) {

			u32 offset = *off;



			ret = op->hook(dd, op, offset, &data64, 0, use_32);

		}

		/*
@@ -873,6 +877,7 @@ static ssize_t qib_diag_write(struct file *fp, const char __user *data, 
		if (count == 4 || count == 8) {

			u64 data64;

			u32 offset = *off;



			ret = copy_from_user(&data64, data, count);

			if (ret) {

				ret = -EFAULT;

drivers/infiniband/hw/qib/qib_driver.c

+3 −0
Original line number Diff line number Diff line
@@ -349,6 +349,7 @@ static u32 qib_rcv_hdrerr(struct qib_ctxtdata *rcd, struct qib_pportdata *ppd, 
		qp_num = be32_to_cpu(ohdr->bth[1]) & QIB_QPN_MASK;

		if (qp_num != QIB_MULTICAST_QPN) {

			int ruc_res;



			qp = qib_lookup_qpn(ibp, qp_num);

			if (!qp)

				goto drop;
@@ -461,6 +462,7 @@ u32 qib_kreceive(struct qib_ctxtdata *rcd, u32 *llic, u32 *npkts) 
	rhf_addr = (__le32 *) rcd->rcvhdrq + l + dd->rhf_offset;

	if (dd->flags & QIB_NODMA_RTAIL) {

		u32 seq = qib_hdrget_seq(rhf_addr);



		if (seq != rcd->seq_cnt)

			goto bail;

		hdrqtail = 0;
@@ -651,6 +653,7 @@ int qib_set_mtu(struct qib_pportdata *ppd, u16 arg) 
int qib_set_lid(struct qib_pportdata *ppd, u32 lid, u8 lmc)

{

	struct qib_devdata *dd = ppd->dd;



	ppd->lid = lid;

	ppd->lmc = lmc;

drivers/infiniband/hw/qib/qib_eeprom.c

+1 −0
Original line number Diff line number Diff line
@@ -153,6 +153,7 @@ void qib_get_eeprom_info(struct qib_devdata *dd) 


	if (t && dd0->nguid > 1 && t <= dd0->nguid) {

		u8 oguid;



		dd->base_guid = dd0->base_guid;

		bguid = (u8 *) &dd->base_guid;

drivers/infiniband/hw/qib/qib_file_ops.c

+6 −0
Original line number Diff line number Diff line
@@ -1186,6 +1186,7 @@ static void assign_ctxt_affinity(struct file *fp, struct qib_devdata *dd) 
	 */

	if (weight >= qib_cpulist_count) {

		int cpu;



		cpu = find_first_zero_bit(qib_cpulist,

					  qib_cpulist_count);

		if (cpu == qib_cpulist_count)
@@ -1389,6 +1390,7 @@ static int choose_port_ctxt(struct file *fp, struct qib_devdata *dd, u32 port, 
	}

	if (!ppd) {

		u32 pidx = ctxt % dd->num_pports;



		if (usable(dd->pport + pidx))

			ppd = dd->pport + pidx;

		else {
@@ -1436,10 +1438,12 @@ static int get_a_ctxt(struct file *fp, const struct qib_user_info *uinfo, 


	if (alg == QIB_PORT_ALG_ACROSS) {

		unsigned inuse = ~0U;



		/* find device (with ACTIVE ports) with fewest ctxts in use */

		for (ndev = 0; ndev < devmax; ndev++) {

			struct qib_devdata *dd = qib_lookup(ndev);

			unsigned cused = 0, cfree = 0, pusable = 0;



			if (!dd)

				continue;

			if (port && port <= dd->num_pports &&
@@ -1469,6 +1473,7 @@ static int get_a_ctxt(struct file *fp, const struct qib_user_info *uinfo, 
	} else {

		for (ndev = 0; ndev < devmax; ndev++) {

			struct qib_devdata *dd = qib_lookup(ndev);



			if (dd) {

				ret = choose_port_ctxt(fp, dd, port, uinfo);

				if (!ret)
@@ -1554,6 +1559,7 @@ static int find_hca(unsigned int cpu, int *unit) 
	}

	for (ndev = 0; ndev < devmax; ndev++) {

		struct qib_devdata *dd = qib_lookup(ndev);



		if (dd) {

			if (pcibus_to_node(dd->pcidev->bus) < 0) {

				ret = -EINVAL;

drivers/infiniband/hw/qib/qib_fs.c

+1 −0
Original line number Diff line number Diff line
@@ -560,6 +560,7 @@ static struct dentry *qibfs_mount(struct file_system_type *fs_type, int flags, 
			const char *dev_name, void *data)

{

	struct dentry *ret;



	ret = mount_single(fs_type, flags, data, qibfs_fill_super);

	if (!IS_ERR(ret))

		qib_super = ret->d_sb;