diff options
author | Mike Marciniszyn <mike.marciniszyn@intel.com> | 2012-07-19 09:04:25 -0400 |
---|---|---|
committer | Roland Dreier <roland@purestorage.com> | 2012-07-19 14:20:04 -0400 |
commit | 7fac33014f54c26bb1b1b4282b27c7988116d639 (patch) | |
tree | 0cefbb8483009cd98b08667e742ea95405da4d03 /drivers/infiniband/hw/qib/qib_driver.c | |
parent | 36a8f01cd24b125aa027c71c1288588edde5322d (diff) |
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: Dean Luick <dean.luick@intel.com>
Signed-off-by: Mike Marciniszyn <mike.marciniszyn@intel.com>
Signed-off-by: Roland Dreier <roland@purestorage.com>
Diffstat (limited to 'drivers/infiniband/hw/qib/qib_driver.c')
-rw-r--r-- | drivers/infiniband/hw/qib/qib_driver.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/drivers/infiniband/hw/qib/qib_driver.c b/drivers/infiniband/hw/qib/qib_driver.c index 8895cfec5019..e41e7f7fc763 100644 --- a/drivers/infiniband/hw/qib/qib_driver.c +++ b/drivers/infiniband/hw/qib/qib_driver.c | |||
@@ -764,8 +764,9 @@ int qib_reset_device(int unit) | |||
764 | qib_devinfo(dd->pcidev, "Reset on unit %u requested\n", unit); | 764 | qib_devinfo(dd->pcidev, "Reset on unit %u requested\n", unit); |
765 | 765 | ||
766 | if (!dd->kregbase || !(dd->flags & QIB_PRESENT)) { | 766 | if (!dd->kregbase || !(dd->flags & QIB_PRESENT)) { |
767 | qib_devinfo(dd->pcidev, "Invalid unit number %u or " | 767 | qib_devinfo(dd->pcidev, |
768 | "not initialized or not present\n", unit); | 768 | "Invalid unit number %u or not initialized or not present\n", |
769 | unit); | ||
769 | ret = -ENXIO; | 770 | ret = -ENXIO; |
770 | goto bail; | 771 | goto bail; |
771 | } | 772 | } |
@@ -802,11 +803,13 @@ int qib_reset_device(int unit) | |||
802 | else | 803 | else |
803 | ret = -EAGAIN; | 804 | ret = -EAGAIN; |
804 | if (ret) | 805 | if (ret) |
805 | qib_dev_err(dd, "Reinitialize unit %u after " | 806 | qib_dev_err(dd, |
806 | "reset failed with %d\n", unit, ret); | 807 | "Reinitialize unit %u after reset failed with %d\n", |
808 | unit, ret); | ||
807 | else | 809 | else |
808 | qib_devinfo(dd->pcidev, "Reinitialized unit %u after " | 810 | qib_devinfo(dd->pcidev, |
809 | "resetting\n", unit); | 811 | "Reinitialized unit %u after resetting\n", |
812 | unit); | ||
810 | 813 | ||
811 | bail: | 814 | bail: |
812 | return ret; | 815 | return ret; |