[linux-yocto] [PATCH 19/57] LSI AXM55xx: Code syntax: Checkconfig updates to Rapidio bug fixes

Charlie Paul cpaul.windriver at gmail.com
Mon Mar 17 21:56:19 PDT 2014


---
 drivers/rapidio/devices/lsi/axxia-rio-sysfs.c |   16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/drivers/rapidio/devices/lsi/axxia-rio-sysfs.c b/drivers/rapidio/devices/lsi/axxia-rio-sysfs.c
index db47761..88c66b6 100644
--- a/drivers/rapidio/devices/lsi/axxia-rio-sysfs.c
+++ b/drivers/rapidio/devices/lsi/axxia-rio-sysfs.c
@@ -29,7 +29,7 @@
 
 #ifdef CONFIG_AXXIA_RIO_STAT
 
-static const char *event_str[] = {
+static const char const *event_str[] = {
 	"TX Port Packet dropped                 ",
 	"TX Port Error threshold exceeded       ",
 	"Tx Port Degraded threshold exceeded    ",
@@ -41,7 +41,7 @@ static const char *event_str[] = {
 	"RIO_EVENT_NUM"
 };
 
-static const char *state_str[] = {
+static const char const *state_str[] = {
 	"TX Port stopped due to retry condition",
 	"TX Port stopped due to transmission err",
 	"RX Port stopped due to retry condition",
@@ -51,7 +51,7 @@ static const char *state_str[] = {
 	"RIO_STATE_NUM"
 };
 
-static const char *irq_str[] = {
+static const char const *irq_str[] = {
 	/* Axxia Error Events - really bad! */
 	"Axxia Master Write timouts                           ",
 	"Axxia Master Read timouts                            ",
@@ -131,7 +131,7 @@ static const char *irq_str[] = {
 	"RIO_IRQ_NUM"
 };
 
-static const char *ib_dme_str[] = {
+static const char const *ib_dme_str[] = {
 	"Inbound Message descriptors push to net stack        ",
 	"Inbound Message descriptors ok pop by net stack      ",
 	"Inbound Message descriptors err pop by net stack     ",
@@ -143,7 +143,7 @@ static const char *ib_dme_str[] = {
 	"RIO_IB_DME_NUM"
 };
 
-static const char *ob_dme_str[] = {
+static const char const *ob_dme_str[] = {
 	"Outbound Message descriptors push by net stack       ",
 	"Outbound Message descriptors net push when ring full ",
 	"Outbound Message descriptors ack to net stack        ",
@@ -711,8 +711,7 @@ retry:
 		stat->desc_done++;
 		for (i = 0; i < sz; i++) {
 			if (buf[i] != (i & 0xff)) {
-				pr_err("--- %s --- unexpected data %hhx "
-					"returned in byte %d\n",
+				pr_err("--- %s --- unexpected data %hhx returned in byte %d\n",
 					__func__, buf[i], i);
 				break;
 			}
@@ -784,8 +783,7 @@ static ssize_t open_ib_dme(struct device *dev,
 								mbox,
 								&bufs[i*bsz]);
 				if (rc) {
-					pr_err("--- %s --- add inbound buffer"
-						" rc %d\n", __func__, rc);
+					pr_err("--- %s --- add inbound buffer rc %d\n", __func__, rc);
 					rio_release_inb_mbox(mport, mbox);
 					goto err;
 				}
-- 
1.7.9.5



More information about the linux-yocto mailing list