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

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

IB/qib: checkpatch fixes 



Elminate some simple_strto* usage.

checkpatch also noted pr_ conversations, which have been done as
recommended.  The pr_fmt() define is used to shorten line length.

Other multi-line string warnings are also elmininated.

Reviewed-by: default avatarDean Luick <dean.luick@intel.com>
Signed-off-by: default avatarMike Marciniszyn <mike.marciniszyn@intel.com>
Signed-off-by: default avatarRoland Dreier <roland@purestorage.com>
parent 36a8f01c

drivers/infiniband/hw/qib/qib_diag.c

+8 −5
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2010 QLogic Corporation. All rights reserved.

 * Copyright (c) 2006, 2007, 2008, 2009 QLogic Corporation. All rights reserved.

 * Copyright (c) 2012 Intel Corporation. All rights reserved.

 * Copyright (c) 2006 - 2012 QLogic Corporation. All rights reserved.

 * Copyright (c) 2003, 2004, 2005, 2006 PathScale, Inc. All rights reserved.

 *

 * This software is available to you under a choice of one of two
@@ -53,6 +53,9 @@ 
#include "qib.h"

#include "qib_common.h"



#undef pr_fmt

#define pr_fmt(fmt) QIB_DRV_NAME ": " fmt



/*

 * Each client that opens the diag device must read then write

 * offset 0, to prevent lossage from random cat or od. diag_state
@@ -598,8 +601,8 @@ static ssize_t qib_diagpkt_write(struct file *fp, 
	}

	tmpbuf = vmalloc(plen);

	if (!tmpbuf) {

		qib_devinfo(dd->pcidev, "Unable to allocate tmp buffer, "

			 "failing\n");

		qib_devinfo(dd->pcidev,

			"Unable to allocate tmp buffer, failing\n");

		ret = -ENOMEM;

		goto bail;

	}
@@ -693,7 +696,7 @@ int qib_register_observer(struct qib_devdata *dd, 
	ret = -ENOMEM;

	olp = vmalloc(sizeof *olp);

	if (!olp) {

		printk(KERN_ERR QIB_DRV_NAME ": vmalloc for observer failed\n");

		pr_err("vmalloc for observer failed\n");

		goto bail;

	}

	if (olp) {

drivers/infiniband/hw/qib/qib_driver.c

+9 −6
Original line number Diff line number Diff line
@@ -764,8 +764,9 @@ int qib_reset_device(int unit) 
	qib_devinfo(dd->pcidev, "Reset on unit %u requested\n", unit);



	if (!dd->kregbase || !(dd->flags & QIB_PRESENT)) {

		qib_devinfo(dd->pcidev, "Invalid unit number %u or "

			    "not initialized or not present\n", unit);

		qib_devinfo(dd->pcidev,

			"Invalid unit number %u or not initialized or not present\n",

			unit);

		ret = -ENXIO;

		goto bail;

	}
@@ -802,11 +803,13 @@ int qib_reset_device(int unit) 
	else

		ret = -EAGAIN;

	if (ret)

		qib_dev_err(dd, "Reinitialize unit %u after "

			    "reset failed with %d\n", unit, ret);

		qib_dev_err(dd,

			"Reinitialize unit %u after reset failed with %d\n",

			unit, ret);

	else

		qib_devinfo(dd->pcidev, "Reinitialized unit %u after "

			    "resetting\n", unit);

		qib_devinfo(dd->pcidev,

			"Reinitialized unit %u after resetting\n",

			unit);



bail:

	return ret;

drivers/infiniband/hw/qib/qib_eeprom.c

+23 −18
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2006, 2007, 2008, 2009 QLogic Corporation. All rights reserved.

 * Copyright (c) 2012 Intel Corporation. All rights reserved.

 * Copyright (c) 2006 - 2012 QLogic Corporation. All rights reserved.

 * Copyright (c) 2003, 2004, 2005, 2006 PathScale, Inc. All rights reserved.

 *

 * This software is available to you under a choice of one of two
@@ -160,9 +161,8 @@ void qib_get_eeprom_info(struct qib_devdata *dd) 
		if (oguid > bguid[7]) {

			if (bguid[6] == 0xff) {

				if (bguid[5] == 0xff) {

					qib_dev_err(dd, "Can't set %s GUID"

						    " from base, wraps to"

						    " OUI!\n",

					qib_dev_err(dd,

						"Can't set %s GUID from base, wraps to OUI!\n",

						qib_get_unit_name(t));

					dd->base_guid = 0;

					goto bail;
@@ -182,8 +182,9 @@ void qib_get_eeprom_info(struct qib_devdata *dd) 
	len = sizeof(struct qib_flash);

	buf = vmalloc(len);

	if (!buf) {

		qib_dev_err(dd, "Couldn't allocate memory to read %u "

			    "bytes from eeprom for GUID\n", len);

		qib_dev_err(dd,

			"Couldn't allocate memory to read %u bytes from eeprom for GUID\n",

			len);

		goto bail;

	}
@@ -201,13 +202,15 @@ void qib_get_eeprom_info(struct qib_devdata *dd) 


	csum = flash_csum(ifp, 0);

	if (csum != ifp->if_csum) {

		qib_devinfo(dd->pcidev, "Bad I2C flash checksum: "

			 "0x%x, not 0x%x\n", csum, ifp->if_csum);

		qib_devinfo(dd->pcidev,

			"Bad I2C flash checksum: 0x%x, not 0x%x\n",

			csum, ifp->if_csum);

		goto done;

	}

	if (*(__be64 *) ifp->if_guid == cpu_to_be64(0) ||

	    *(__be64 *) ifp->if_guid == ~cpu_to_be64(0)) {

		qib_dev_err(dd, "Invalid GUID %llx from flash; ignoring\n",

		qib_dev_err(dd,

			"Invalid GUID %llx from flash; ignoring\n",

			*(unsigned long long *) ifp->if_guid);

		/* don't allow GUID if all 0 or all 1's */

		goto done;
@@ -215,8 +218,8 @@ void qib_get_eeprom_info(struct qib_devdata *dd) 


	/* complain, but allow it */

	if (*(u64 *) ifp->if_guid == 0x100007511000000ULL)

		qib_devinfo(dd->pcidev, "Warning, GUID %llx is "

			 "default, probably not correct!\n",

		qib_devinfo(dd->pcidev,

			"Warning, GUID %llx is default, probably not correct!\n",

			*(unsigned long long *) ifp->if_guid);



	bguid = ifp->if_guid;
@@ -260,8 +263,9 @@ void qib_get_eeprom_info(struct qib_devdata *dd) 
		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", dd->serial, ifp->if_comment);

		qib_dev_err(dd,

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

			dd->serial, ifp->if_comment);



	memcpy(&dd->eep_st_errs, &ifp->if_errcntp, QIB_EEP_LOG_CNT);

	/*
@@ -323,8 +327,9 @@ int qib_update_eeprom_log(struct qib_devdata *dd) 
	buf = vmalloc(len);

	ret = 1;

	if (!buf) {

		qib_dev_err(dd, "Couldn't allocate memory to read %u "

			    "bytes from eeprom for logging\n", len);

		qib_dev_err(dd,

			"Couldn't allocate memory to read %u bytes from eeprom for logging\n",

			len);

		goto bail;

	}

drivers/infiniband/hw/qib/qib_file_ops.c

+32 −31
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2006, 2007, 2008, 2009, 2010 QLogic Corporation.

 * All rights reserved.

 * Copyright (c) 2012 Intel Corporation. All rights reserved.

 * Copyright (c) 2006 - 2012 QLogic Corporation. All rights reserved.

 * Copyright (c) 2003, 2004, 2005, 2006 PathScale, Inc. All rights reserved.

 *

 * This software is available to you under a choice of one of two
@@ -49,6 +49,9 @@ 
#include "qib_common.h"

#include "qib_user_sdma.h"



#undef pr_fmt

#define pr_fmt(fmt) QIB_DRV_NAME ": " fmt



static int qib_open(struct inode *, struct file *);

static int qib_close(struct inode *, struct file *);

static ssize_t qib_write(struct file *, const char __user *, size_t, loff_t *);
@@ -315,8 +318,9 @@ static int qib_tid_update(struct qib_ctxtdata *rcd, struct file *fp, 
	}

	if (cnt > tidcnt) {

		/* make sure it all fits in tid_pg_list */

		qib_devinfo(dd->pcidev, "Process tried to allocate %u "

			 "TIDs, only trying max (%u)\n", cnt, tidcnt);

		qib_devinfo(dd->pcidev,

			"Process tried to allocate %u TIDs, only trying max (%u)\n",

			cnt, tidcnt);

		cnt = tidcnt;

	}

	pagep = (struct page **) rcd->tid_pg_list;
@@ -750,9 +754,9 @@ static int qib_mmap_mem(struct vm_area_struct *vma, struct qib_ctxtdata *rcd, 
	ret = remap_pfn_range(vma, vma->vm_start, pfn,

			      len, vma->vm_page_prot);

	if (ret)

		qib_devinfo(dd->pcidev, "%s ctxt%u mmap of %lx, %x "

			 "bytes failed: %d\n", what, rcd->ctxt,

			 pfn, len, ret);

		qib_devinfo(dd->pcidev,

			"%s ctxt%u mmap of %lx, %x bytes failed: %d\n",

			what, rcd->ctxt, pfn, len, ret);

bail:

	return ret;

}
@@ -771,8 +775,9 @@ static int mmap_ureg(struct vm_area_struct *vma, struct qib_devdata *dd, 
	 */

	sz = dd->flags & QIB_HAS_HDRSUPP ? 2 * PAGE_SIZE : PAGE_SIZE;

	if ((vma->vm_end - vma->vm_start) > sz) {

		qib_devinfo(dd->pcidev, "FAIL mmap userreg: reqlen "

			 "%lx > PAGE\n", vma->vm_end - vma->vm_start);

		qib_devinfo(dd->pcidev,

			"FAIL mmap userreg: reqlen %lx > PAGE\n",

			vma->vm_end - vma->vm_start);

		ret = -EFAULT;

	} else {

		phys = dd->physaddr + ureg;
@@ -802,8 +807,8 @@ static int mmap_piobufs(struct vm_area_struct *vma, 
	 * for it.

	 */

	if ((vma->vm_end - vma->vm_start) > (piocnt * dd->palign)) {

		qib_devinfo(dd->pcidev, "FAIL mmap piobufs: "

			 "reqlen %lx > PAGE\n",

		qib_devinfo(dd->pcidev,

			"FAIL mmap piobufs: reqlen %lx > PAGE\n",

			 vma->vm_end - vma->vm_start);

		ret = -EINVAL;

		goto bail;
@@ -847,8 +852,8 @@ static int mmap_rcvegrbufs(struct vm_area_struct *vma, 
	size = rcd->rcvegrbuf_size;

	total_size = rcd->rcvegrbuf_chunks * size;

	if ((vma->vm_end - vma->vm_start) > total_size) {

		qib_devinfo(dd->pcidev, "FAIL on egr bufs: "

			 "reqlen %lx > actual %lx\n",

		qib_devinfo(dd->pcidev,

			"FAIL on egr bufs: reqlen %lx > actual %lx\n",

			 vma->vm_end - vma->vm_start,

			 (unsigned long) total_size);

		ret = -EINVAL;
@@ -856,8 +861,9 @@ static int mmap_rcvegrbufs(struct vm_area_struct *vma, 
	}



	if (vma->vm_flags & VM_WRITE) {

		qib_devinfo(dd->pcidev, "Can't map eager buffers as "

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

		qib_devinfo(dd->pcidev,

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

			vma->vm_flags);

		ret = -EPERM;

		goto bail;

	}
@@ -1270,8 +1276,8 @@ static int setup_ctxt(struct qib_pportdata *ppd, int ctxt, 
			       GFP_KERNEL);



	if (!rcd || !ptmp) {

		qib_dev_err(dd, "Unable to allocate ctxtdata "

			    "memory, failing open\n");

		qib_dev_err(dd,

			"Unable to allocate ctxtdata memory, failing open\n");

		ret = -ENOMEM;

		goto bailerr;

	}
@@ -1560,8 +1566,8 @@ static int qib_assign_ctxt(struct file *fp, const struct qib_user_info *uinfo) 
		} else if (weight == 1 &&

			test_bit(cpumask_first(tsk_cpus_allowed(current)),

				 qib_cpulist))

			qib_devinfo(dd->pcidev, "%s PID %u affinity "

				    "set to cpu %d; already allocated\n",

			qib_devinfo(dd->pcidev,

				"%s PID %u affinity set to cpu %d; already allocated\n",

				current->comm, current->pid,

				cpumask_first(tsk_cpus_allowed(current)));

	}
@@ -2185,8 +2191,7 @@ int qib_cdev_init(int minor, const char *name, 


	cdev = cdev_alloc();

	if (!cdev) {

		printk(KERN_ERR QIB_DRV_NAME

		       ": Could not allocate cdev for minor %d, %s\n",

		pr_err("Could not allocate cdev for minor %d, %s\n",

		       minor, name);

		ret = -ENOMEM;

		goto done;
@@ -2198,8 +2203,7 @@ int qib_cdev_init(int minor, const char *name, 


	ret = cdev_add(cdev, dev, 1);

	if (ret < 0) {

		printk(KERN_ERR QIB_DRV_NAME

		       ": Could not add cdev for minor %d, %s (err %d)\n",

		pr_err("Could not add cdev for minor %d, %s (err %d)\n",

		       minor, name, -ret);

		goto err_cdev;

	}
@@ -2209,8 +2213,7 @@ int qib_cdev_init(int minor, const char *name, 
		goto done;

	ret = PTR_ERR(device);

	device = NULL;

	printk(KERN_ERR QIB_DRV_NAME ": Could not create "

	       "device for minor %d, %s (err %d)\n",

	pr_err("Could not create device for minor %d, %s (err %d)\n",

	       minor, name, -ret);

err_cdev:

	cdev_del(cdev);
@@ -2245,16 +2248,14 @@ int __init qib_dev_init(void) 


	ret = alloc_chrdev_region(&qib_dev, 0, QIB_NMINORS, QIB_DRV_NAME);

	if (ret < 0) {

		printk(KERN_ERR QIB_DRV_NAME ": Could not allocate "

		       "chrdev region (err %d)\n", -ret);

		pr_err("Could not allocate chrdev region (err %d)\n", -ret);

		goto done;

	}



	qib_class = class_create(THIS_MODULE, "ipath");

	if (IS_ERR(qib_class)) {

		ret = PTR_ERR(qib_class);

		printk(KERN_ERR QIB_DRV_NAME ": Could not create "

		       "device class (err %d)\n", -ret);

		pr_err("Could not create device class (err %d)\n", -ret);

		unregister_chrdev_region(qib_dev, QIB_NMINORS);

	}

drivers/infiniband/hw/qib/qib_fs.c

+11 −10
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2006, 2007, 2008, 2009 QLogic Corporation. All rights reserved.

 * Copyright (c) 2012 Intel Corporation. All rights reserved.

 * Copyright (c) 2006 - 2012 QLogic Corporation. All rights reserved.

 * Copyright (c) 2006 PathScale, Inc. All rights reserved.

 *

 * This software is available to you under a choice of one of two
@@ -382,7 +383,7 @@ static int add_cntr_files(struct super_block *sb, struct qib_devdata *dd) 
	ret = create_file(unit, S_IFDIR|S_IRUGO|S_IXUGO, sb->s_root, &dir,

			  &simple_dir_operations, dd);

	if (ret) {

		printk(KERN_ERR "create_file(%s) failed: %d\n", unit, ret);

		pr_err("create_file(%s) failed: %d\n", unit, ret);

		goto bail;

	}
@@ -390,21 +391,21 @@ static int add_cntr_files(struct super_block *sb, struct qib_devdata *dd) 
	ret = create_file("counters", S_IFREG|S_IRUGO, dir, &tmp,

			  &cntr_ops[0], dd);

	if (ret) {

		printk(KERN_ERR "create_file(%s/counters) failed: %d\n",

		pr_err("create_file(%s/counters) failed: %d\n",

		       unit, ret);

		goto bail;

	}

	ret = create_file("counter_names", S_IFREG|S_IRUGO, dir, &tmp,

			  &cntr_ops[1], dd);

	if (ret) {

		printk(KERN_ERR "create_file(%s/counter_names) failed: %d\n",

		pr_err("create_file(%s/counter_names) failed: %d\n",

		       unit, ret);

		goto bail;

	}

	ret = create_file("portcounter_names", S_IFREG|S_IRUGO, dir, &tmp,

			  &portcntr_ops[0], dd);

	if (ret) {

		printk(KERN_ERR "create_file(%s/%s) failed: %d\n",

		pr_err("create_file(%s/%s) failed: %d\n",

		       unit, "portcounter_names", ret);

		goto bail;

	}
@@ -416,7 +417,7 @@ static int add_cntr_files(struct super_block *sb, struct qib_devdata *dd) 
		ret = create_file(fname, S_IFREG|S_IRUGO, dir, &tmp,

				  &portcntr_ops[i], dd);

		if (ret) {

			printk(KERN_ERR "create_file(%s/%s) failed: %d\n",

			pr_err("create_file(%s/%s) failed: %d\n",

				unit, fname, ret);

			goto bail;

		}
@@ -426,7 +427,7 @@ static int add_cntr_files(struct super_block *sb, struct qib_devdata *dd) 
		ret = create_file(fname, S_IFREG|S_IRUGO, dir, &tmp,

				  &qsfp_ops[i - 1], dd);

		if (ret) {

			printk(KERN_ERR "create_file(%s/%s) failed: %d\n",

			pr_err("create_file(%s/%s) failed: %d\n",

				unit, fname, ret);

			goto bail;

		}
@@ -435,7 +436,7 @@ static int add_cntr_files(struct super_block *sb, struct qib_devdata *dd) 
	ret = create_file("flash", S_IFREG|S_IWUSR|S_IRUGO, dir, &tmp,

			  &flash_ops, dd);

	if (ret)

		printk(KERN_ERR "create_file(%s/flash) failed: %d\n",

		pr_err("create_file(%s/flash) failed: %d\n",

			unit, ret);

bail:

	return ret;
@@ -486,7 +487,7 @@ static int remove_device_files(struct super_block *sb, 


	if (IS_ERR(dir)) {

		ret = PTR_ERR(dir);

		printk(KERN_ERR "Lookup of %s failed\n", unit);

		pr_err("Lookup of %s failed\n", unit);

		goto bail;

	}
@@ -532,7 +533,7 @@ static int qibfs_fill_super(struct super_block *sb, void *data, int silent) 


	ret = simple_fill_super(sb, QIBFS_MAGIC, files);

	if (ret) {

		printk(KERN_ERR "simple_fill_super failed: %d\n", ret);

		pr_err("simple_fill_super failed: %d\n", ret);

		goto bail;

	}