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

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

IB/qib: Fix checkpatch warnings 



Signed-off-by: default avatarMike Marciniszyn <mike.marciniszyn@intel.com>
Signed-off-by: default avatarRoland Dreier <roland@purestorage.com>
parent 041af0bb

drivers/infiniband/hw/qib/qib.h

+5 −2
Original line number Diff line number Diff line
@@ -1460,11 +1460,14 @@ const char *qib_get_unit_name(int unit); 
 * Flush write combining store buffers (if present) and perform a write

 * barrier.

 */

static inline void qib_flush_wc(void)

{

#if defined(CONFIG_X86_64)

#define qib_flush_wc() asm volatile("sfence" : : : "memory")

	asm volatile("sfence" : : : "memory");

#else

#define qib_flush_wc() wmb() /* no reorder around wc flush */

	wmb(); /* no reorder around wc flush */

#endif

}



/* global module parameter variables */

extern unsigned qib_ibmtu;

drivers/infiniband/hw/qib/qib_common.h

+2 −2
Original line number Diff line number Diff line
@@ -257,7 +257,7 @@ struct qib_base_info { 


	/* shared memory page for send buffer disarm status */

	__u64 spi_sendbuf_status;

} __attribute__ ((aligned(8)));

} __aligned(8);



/*

 * This version number is given to the driver by the user code during
@@ -361,7 +361,7 @@ struct qib_user_info { 
	 */

	__u64 spu_base_info;



} __attribute__ ((aligned(8)));

} __aligned(8);



/* User commands. */

drivers/infiniband/hw/qib/qib_debugfs.c

+0 −1
Original line number Diff line number Diff line
@@ -255,7 +255,6 @@ void qib_dbg_ibdev_init(struct qib_ibdev *ibd) 
	DEBUGFS_FILE_CREATE(opcode_stats);

	DEBUGFS_FILE_CREATE(ctx_stats);

	DEBUGFS_FILE_CREATE(qp_stats);

	return;

}



void qib_dbg_ibdev_exit(struct qib_ibdev *ibd)

drivers/infiniband/hw/qib/qib_eeprom.c

+3 −3
Original line number Diff line number Diff line
@@ -259,9 +259,9 @@ void qib_get_eeprom_info(struct qib_devdata *dd) 
		if (len > sizeof(ifp->if_serial))

			len = sizeof(ifp->if_serial);

		memcpy(snp, ifp->if_serial, len);

	} else

		memcpy(dd->serial, ifp->if_serial,

		       sizeof(ifp->if_serial));

	} else {

		memcpy(dd->serial, ifp->if_serial, sizeof(ifp->if_serial));

	}

	if (!strstr(ifp->if_comment, "Tested successfully"))

		qib_dev_err(dd,

			"Board SN %s did not pass functional test: %s\n",

drivers/infiniband/hw/qib/qib_file_ops.c

+7 −9
Original line number Diff line number Diff line
@@ -351,9 +351,10 @@ static int qib_tid_update(struct qib_ctxtdata *rcd, struct file *fp, 
		 * unless perhaps the user has mpin'ed the pages

		 * themselves.

		 */

		qib_devinfo(dd->pcidev,

			 "Failed to lock addr %p, %u pages: "

			 "errno %d\n", (void *) vaddr, cnt, -ret);

		qib_devinfo(

			dd->pcidev,

			"Failed to lock addr %p, %u pages: errno %d\n",

			(void *) vaddr, cnt, -ret);

		goto done;

	}

	for (i = 0; i < cnt; i++, vaddr += PAGE_SIZE) {
@@ -951,8 +952,8 @@ static int mmap_kvaddr(struct vm_area_struct *vma, u64 pgaddr, 
		/* rcvegrbufs are read-only on the slave */

		if (vma->vm_flags & VM_WRITE) {

			qib_devinfo(dd->pcidev,

				 "Can't map eager buffers as "

				 "writable (flags=%lx)\n", vma->vm_flags);

				 "Can't map eager buffers as writable (flags=%lx)\n",

				 vma->vm_flags);

			ret = -EPERM;

			goto bail;

		}
@@ -1247,10 +1248,7 @@ static int init_subctxts(struct qib_devdata *dd, 
	if (!qib_compatible_subctxts(uinfo->spu_userversion >> 16,

		uinfo->spu_userversion & 0xffff)) {

		qib_devinfo(dd->pcidev,

			 "Mismatched user version (%d.%d) and driver "

			 "version (%d.%d) while context sharing. Ensure "

			 "that driver and library are from the same "

			 "release.\n",

			 "Mismatched user version (%d.%d) and driver version (%d.%d) while context sharing. Ensure that driver and library are from the same release.\n",

			 (int) (uinfo->spu_userversion >> 16),

			 (int) (uinfo->spu_userversion & 0xffff),

			 QIB_USER_SWMAJOR, QIB_USER_SWMINOR);