[PATCH 00/30] staging: unisys: cleanup patch series

[PATCH 00/30] staging: unisys: cleanup patch series

[Benjamin Romer]

This set of patches cleans up some more of the code by eliminating unnecessary
goto statements, getting rid of the BOOL define and switching over code that
used it to use int instead, and switching from using pragma(pack) to __packed.

*** BLURB HERE ***

Benjamin Romer (3):
  staging: unisys: remove goto from sig_do_data()
  staging: unisys: remove unnecessary goto in parser_param_start()
  staging: unisys: Remove unnecessary gotos from
    info_debugfs_read_helper

Erik Arfvidson (19):
  staging: unisys: serverdown variable change bool to int virthba
  staging: unisys: change serverchangingstate variable bool to int
  staging: unisys: change bool to int variable found
  staging: unisys: change variable registered from bool to int
  staging: unisys: fix function visorchannel_signalremove from bool to
    int
  staging: unisys: changes function visorchannel_signalinsert from bool
    to int
  staging: unisys: changes sig_read_header function from bool to int
  staging: unisys: changes needs_lock from bool to int
  staging: unisys: changes bool to int in sig related function
  staging: unisys: change periodic_work.[ch] functions from bool to int
  staging: unisys: changes visorchipset.[ch] functions from bool to int
  staging: unisys: change visorchipset/parse.[ch] from bool to int
  staging: unisys: change charqueue.[ch] variables from bool to int
  staging: unisys: remove #define bool in visorchannel.h
  staging: unisys: change memregion_direct.c variables type bool to int.
  staging: unisys: change visorchannel_funcs.c function variable from
    bool to int
  staging: unisys: change visorkmodutils.c variable from bool to int.
  staging: unisys: change uislib.c variables from type bool to int
  staging: unisys: remove #definition from timskmod.h

Jeffrey Brown (8):
  staging: unisys: vbusdeviceinfo pragma
  staging: unisys: vmcallintferace phys_info pragma
  staging: unisys: vmcall_io_controlvm_addr_params pragma
  staging: unisys: vmcall_io_diag_addr_params pragma
  staging: unisys: vmcall_channel_version_mismatch
  staging: unisys: channel.h pragma
  staging: unisys: iochannel.h pragma
  staging: unisys: vbuschannel.h pragma

 .../unisys/common-spar/include/channels/channel.h  |   7 +-
 .../common-spar/include/channels/iochannel.h       |  47 ++++------
 .../common-spar/include/channels/vbuschannel.h     |   7 +-
 .../unisys/common-spar/include/vbusdeviceinfo.h    |   6 +-
 .../unisys/common-spar/include/vmcallinterface.h   |  28 +-----
 drivers/staging/unisys/include/periodic_work.h     |   6 +-
 drivers/staging/unisys/include/timskmod.h          |   5 -
 drivers/staging/unisys/uislib/uislib.c             |  29 +++---
 drivers/staging/unisys/virthba/virthba.c           |  20 ++--
 drivers/staging/unisys/virtpci/virtpci.c           |   8 +-
 drivers/staging/unisys/visorchannel/visorchannel.h |   7 +-
 .../unisys/visorchannel/visorchannel_funcs.c       |  94 +++++++++----------
 drivers/staging/unisys/visorchipset/file.c         |   8 +-
 drivers/staging/unisys/visorchipset/parser.c       |  29 +++---
 drivers/staging/unisys/visorchipset/parser.h       |   6 +-
 drivers/staging/unisys/visorchipset/visorchipset.h |  10 +-
 .../unisys/visorchipset/visorchipset_main.c        | 102 ++++++++++-----------
 drivers/staging/unisys/visorutil/charqueue.c       |   4 +-
 drivers/staging/unisys/visorutil/charqueue.h       |   2 +-
 .../staging/unisys/visorutil/memregion_direct.c    |  30 +++---
 drivers/staging/unisys/visorutil/periodic_work.c   |  52 +++++------
 drivers/staging/unisys/visorutil/visorkmodutils.c  |   2 +-
 22 files changed, 223 insertions(+), 286 deletions(-)

-- 
2.1.0

[PATCH 01/30] staging: unisys: serverdown variable change bool to int virthba

[Benjamin Romer]

From: Erik Arfvidson <erik.arfvidson@unisys.com>

This patch changes serverdown variable to int instead of bool

Signed-off-by: Erik Arfvidson <erik.arfvidson@unisys.com>
Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
---
 drivers/staging/unisys/virthba/virthba.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/staging/unisys/virthba/virthba.c b/drivers/staging/unisys/virthba/virthba.c
index e6ecea5..481fb57 100644
--- a/drivers/staging/unisys/virthba/virthba.c
+++ b/drivers/staging/unisys/virthba/virthba.c
@@ -183,7 +183,7 @@ struct virthba_info {
 	unsigned int nextinsert;	/* Start search for next pending
 					   free slot here */
 	spinlock_t privlock;
-	bool serverdown;
+	int serverdown;
 	bool serverchangingstate;
 	unsigned long long acquire_failed_cnt;
 	unsigned long long interrupts_rcvd;
@@ -566,7 +566,7 @@ virthba_probe(struct virtpci_dev *virtpcidev, const struct pci_device_id *id)
 	init_waitqueue_head(&virthbainfo->rsp_queue);
 	spin_lock_init(&virthbainfo->privlock);
 	memset(&virthbainfo->pending, 0, sizeof(virthbainfo->pending));
-	virthbainfo->serverdown = false;
+	virthbainfo->serverdown = 0;
 	virthbainfo->serverchangingstate = false;
 
 	virthbainfo->intr = virtpcidev->intr;
@@ -1511,7 +1511,7 @@ virthba_serverup(struct virtpci_dev *virtpcidev)
 		LOGERR("uisthread_start rsp ****FAILED\n");
 		return 0;
 	}
-	virthbainfo->serverdown = false;
+	virthbainfo->serverdown = 0;
 	virthbainfo->serverchangingstate = false;
 
 	return 1;
@@ -1577,7 +1577,7 @@ virthba_serverdown_complete(struct work_struct *work)
 
 	DBGINF("virtpcidev bus_no<<%d>>devNo<<%d>>", virtpcidev->bus_no,
 	       virtpcidev->device_no);
-	virthbainfo->serverdown = true;
+	virthbainfo->serverdown = 1;
 	virthbainfo->serverchangingstate = false;
 	/* Return the ServerDown response to Command */
 	visorchipset_device_pause_response(virtpcidev->bus_no,
-- 
2.1.0

[PATCH 02/30] staging: unisys: change serverchangingstate variable bool to int

[Benjamin Romer]

From: Erik Arfvidson <erik.arfvidson@unisys.com>

This patch changes serverchangingstate variable from bool to int

Signed-off-by: Erik Arfvidson <erik.arfvidson@unisys.com>
Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
---
 drivers/staging/unisys/virthba/virthba.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/drivers/staging/unisys/virthba/virthba.c b/drivers/staging/unisys/virthba/virthba.c
index 481fb57..4d4ad8b 100644
--- a/drivers/staging/unisys/virthba/virthba.c
+++ b/drivers/staging/unisys/virthba/virthba.c
@@ -184,7 +184,7 @@ struct virthba_info {
 					   free slot here */
 	spinlock_t privlock;
 	int serverdown;
-	bool serverchangingstate;
+	int serverchangingstate;
 	unsigned long long acquire_failed_cnt;
 	unsigned long long interrupts_rcvd;
 	unsigned long long interrupts_notme;
@@ -567,7 +567,7 @@ virthba_probe(struct virtpci_dev *virtpcidev, const struct pci_device_id *id)
 	spin_lock_init(&virthbainfo->privlock);
 	memset(&virthbainfo->pending, 0, sizeof(virthbainfo->pending));
 	virthbainfo->serverdown = 0;
-	virthbainfo->serverchangingstate = false;
+	virthbainfo->serverchangingstate = 0;
 
 	virthbainfo->intr = virtpcidev->intr;
 	/* save of host within virthba_info */
@@ -1496,7 +1496,7 @@ virthba_serverup(struct virtpci_dev *virtpcidev)
 		return 0;
 	}
 
-	virthbainfo->serverchangingstate = true;
+	virthbainfo->serverchangingstate = 1;
 	/* Must transition channel to ATTACHED state BEFORE we
 	 * can start using the device again
 	 */
@@ -1512,7 +1512,7 @@ virthba_serverup(struct virtpci_dev *virtpcidev)
 		return 0;
 	}
 	virthbainfo->serverdown = 0;
-	virthbainfo->serverchangingstate = false;
+	virthbainfo->serverchangingstate = 0;
 
 	return 1;
 }
@@ -1578,7 +1578,7 @@ virthba_serverdown_complete(struct work_struct *work)
 	DBGINF("virtpcidev bus_no<<%d>>devNo<<%d>>", virtpcidev->bus_no,
 	       virtpcidev->device_no);
 	virthbainfo->serverdown = 1;
-	virthbainfo->serverchangingstate = false;
+	virthbainfo->serverchangingstate = 0;
 	/* Return the ServerDown response to Command */
 	visorchipset_device_pause_response(virtpcidev->bus_no,
 					   virtpcidev->device_no, 0);
@@ -1599,7 +1599,7 @@ virthba_serverdown(struct virtpci_dev *virtpcidev, u32 state)
 	       virtpcidev->device_no);
 
 	if (!virthbainfo->serverdown && !virthbainfo->serverchangingstate) {
-		virthbainfo->serverchangingstate = true;
+		virthbainfo->serverchangingstate = 1;
 		queue_work(virthba_serverdown_workqueue,
 			   &virthbainfo->serverdown_completion);
 	} else if (virthbainfo->serverchangingstate) {
-- 
2.1.0

[PATCH 03/30] staging: unisys: change bool to int variable found

[Benjamin Romer]

From: Erik Arfvidson <erik.arfvidson@unisys.com>

this patch changes variable 'found' from bool to int

Signed-off-by: Erik Arfvidson <erik.arfvidson@unisys.com>
Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
---
 drivers/staging/unisys/virtpci/virtpci.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/staging/unisys/virtpci/virtpci.c b/drivers/staging/unisys/virtpci/virtpci.c
index 8fdfd6f..d2d8151 100644
--- a/drivers/staging/unisys/virtpci/virtpci.c
+++ b/drivers/staging/unisys/virtpci/virtpci.c
@@ -1074,7 +1074,7 @@ static int virtpci_device_serverdown(struct device *parentbus,
 				     unsigned char macaddr[])
 {
 	int pausethisone = 0;
-	bool found = false;
+	int found = 0;
 	struct virtpci_dev *tmpvpcidev, *prevvpcidev;
 	struct virtpci_driver *vpcidriver;
 	unsigned long flags;
@@ -1113,7 +1113,7 @@ static int virtpci_device_serverdown(struct device *parentbus,
 		if (!pausethisone)
 			continue;
 
-		found = true;
+		found = 1;
 		vpcidriver = tmpvpcidev->mydriver;
 		rc = vpcidriver->suspend(tmpvpcidev, 0);
 	}
@@ -1133,7 +1133,7 @@ static int virtpci_device_serverup(struct device *parentbus,
 				   unsigned char macaddr[])
 {
 	int resumethisone = 0;
-	bool found = false;
+	int found = 0;
 	struct virtpci_dev *tmpvpcidev, *prevvpcidev;
 	struct virtpci_driver *vpcidriver;
 	unsigned long flags;
@@ -1171,7 +1171,7 @@ static int virtpci_device_serverup(struct device *parentbus,
 		if (!resumethisone)
 			continue;
 
-		found = true;
+		found = 1;
 		vpcidriver = tmpvpcidev->mydriver;
 		/* This should be done at BUS resume time, but an
 		* existing problem prevents us from ever getting a bus
-- 
2.1.0

[PATCH 04/30] staging: unisys: change variable registered from bool to int

[Benjamin Romer]

From: Erik Arfvidson <erik.arfvidson@unisys.com>

this patch changes variable registered from bool to int

Signed-off-by: Erik Arfvidson <erik.arfvidson@unisys.com>
Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
---
 drivers/staging/unisys/visorchipset/file.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/staging/unisys/visorchipset/file.c b/drivers/staging/unisys/visorchipset/file.c
index e51fd4e..0e1bb93 100644
--- a/drivers/staging/unisys/visorchipset/file.c
+++ b/drivers/staging/unisys/visorchipset/file.c
@@ -31,7 +31,7 @@
 static struct cdev file_cdev;
 static struct visorchannel **file_controlvm_channel;
 static dev_t majordev = -1; /**< indicates major num for device */
-static BOOL registered = FALSE;
+static int registered;
 
 static int visorchipset_open(struct inode *inode, struct file *file);
 static int visorchipset_release(struct inode *inode, struct file *file);
@@ -64,7 +64,7 @@ visorchipset_file_init(dev_t major_dev, struct visorchannel **controlvm_channel)
 			       MYDRVNAME);
 			return -1;
 		}
-		registered = TRUE;
+		registered = 1;
 		INFODRV("New major number %d registered\n", MAJOR(majordev));
 	} else {
 		/* static major device number registration required */
@@ -72,7 +72,7 @@ visorchipset_file_init(dev_t major_dev, struct visorchannel **controlvm_channel)
 			ERRDRV("Unable to register char device %s", MYDRVNAME);
 			return -1;
 		}
-		registered = TRUE;
+		registered = 1;
 		INFODRV("Static major number %d registered\n", MAJOR(majordev));
 	}
 	rc = cdev_add(&file_cdev, MKDEV(MAJOR(majordev), 0), 1);
@@ -96,7 +96,7 @@ visorchipset_file_cleanup(void)
 			unregister_chrdev_region(majordev, 1);
 			majordev = MKDEV(0, 0);
 		}
-		registered = FALSE;
+		registered = 0;
 	}
 }
 
-- 
2.1.0

_______________________________________________
devel mailing list
devel@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel

[PATCH 05/30] staging: unisys: fix function visorchannel_signalremove from bool to int

[Benjamin Romer]

From: Erik Arfvidson <erik.arfvidson@unisys.com>

this patch changes visorchannel_signalremove from bool to int. Also modified
signalremove_inner since the return value was bool and change it to int.

Signed-off-by: Erik Arfvidson <erik.arfvidson@unisys.com>
Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
---
 drivers/staging/unisys/visorchannel/visorchannel.h     |  2 +-
 .../staging/unisys/visorchannel/visorchannel_funcs.c   | 18 +++++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/drivers/staging/unisys/visorchannel/visorchannel.h b/drivers/staging/unisys/visorchannel/visorchannel.h
index 63f1b97..5b4ff15 100644
--- a/drivers/staging/unisys/visorchannel/visorchannel.h
+++ b/drivers/staging/unisys/visorchannel/visorchannel.h
@@ -52,7 +52,7 @@ int visorchannel_write(struct visorchannel *channel, ulong offset,
 		       void *local, ulong nbytes);
 int visorchannel_clear(struct visorchannel *channel, ulong offset,
 		       u8 ch, ulong nbytes);
-BOOL visorchannel_signalremove(struct visorchannel *channel, u32 queue,
+int visorchannel_signalremove(struct visorchannel *channel, u32 queue,
 			       void *msg);
 BOOL visorchannel_signalinsert(struct visorchannel *channel, u32 queue,
 			       void *msg);
diff --git a/drivers/staging/unisys/visorchannel/visorchannel_funcs.c b/drivers/staging/unisys/visorchannel/visorchannel_funcs.c
index 0188ef8..68befd6 100644
--- a/drivers/staging/unisys/visorchannel/visorchannel_funcs.c
+++ b/drivers/staging/unisys/visorchannel/visorchannel_funcs.c
@@ -411,21 +411,21 @@ safe_sig_queue_validate(struct signal_queue_header *psafe_sqh,
 	return 1;
 }				/* end safe_sig_queue_validate */
 
-static BOOL
+static int
 signalremove_inner(struct visorchannel *channel, u32 queue, void *msg)
 {
 	struct signal_queue_header sig_hdr;
 
 	if (!sig_read_header(channel, queue, &sig_hdr)) {
-		return FALSE;
+		return 0;
 	}
 	if (sig_hdr.head == sig_hdr.tail)
-		return FALSE;	/* no signals to remove */
+		return 0;	/* no signals to remove */
 
 	sig_hdr.tail = (sig_hdr.tail + 1) % sig_hdr.max_slots;
 	if (!sig_read_data(channel, queue, &sig_hdr, sig_hdr.tail, msg)) {
 		ERRDRV("sig_read_data failed\n");
-		return FALSE;
+		return 0;
 	}
 	sig_hdr.num_received++;
 
@@ -435,19 +435,19 @@ signalremove_inner(struct visorchannel *channel, u32 queue, void *msg)
 	mb(); /* required for channel synch */
 	if (!SIG_WRITE_FIELD(channel, queue, &sig_hdr, tail)) {
 		ERRDRV("visor_memregion_write of Tail failed\n");
-		return FALSE;
+		return 0;
 	}
 	if (!SIG_WRITE_FIELD(channel, queue, &sig_hdr, num_received)) {
 		ERRDRV("visor_memregion_write of NumSignalsReceived failed\n");
-		return FALSE;
+		return 0;
 	}
-	return TRUE;
+	return 1;
 }
 
-BOOL
+int
 visorchannel_signalremove(struct visorchannel *channel, u32 queue, void *msg)
 {
-	BOOL rc;
+	int rc;
 
 	if (channel->needs_lock) {
 		spin_lock(&channel->remove_lock);
-- 
2.1.0

[PATCH 06/30] staging: unisys: changes function visorchannel_signalinsert from bool to int

[Benjamin Romer]

From: Erik Arfvidson <erik.arfvidson@unisys.com>

This patch changes function from visorchannel_signalinsert from bool to int.
Also, changes to signalinsert_inner had to be change since
visorchannel_signalinsert call that other function which return value was bool
so it was change to int as well.

Signed-off-by: Erik Arfvidson <erik.arfvidson@unisys.com>
Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
---
 drivers/staging/unisys/visorchannel/visorchannel.h     |  2 +-
 .../staging/unisys/visorchannel/visorchannel_funcs.c   | 18 +++++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/drivers/staging/unisys/visorchannel/visorchannel.h b/drivers/staging/unisys/visorchannel/visorchannel.h
index 5b4ff15..e8df58d 100644
--- a/drivers/staging/unisys/visorchannel/visorchannel.h
+++ b/drivers/staging/unisys/visorchannel/visorchannel.h
@@ -54,7 +54,7 @@ int visorchannel_clear(struct visorchannel *channel, ulong offset,
 		       u8 ch, ulong nbytes);
 int visorchannel_signalremove(struct visorchannel *channel, u32 queue,
 			       void *msg);
-BOOL visorchannel_signalinsert(struct visorchannel *channel, u32 queue,
+int visorchannel_signalinsert(struct visorchannel *channel, u32 queue,
 			       void *msg);
 int visorchannel_signalqueue_slots_avail(struct visorchannel *channel,
 					 u32 queue);
diff --git a/drivers/staging/unisys/visorchannel/visorchannel_funcs.c b/drivers/staging/unisys/visorchannel/visorchannel_funcs.c
index 68befd6..0279e1f 100644
--- a/drivers/staging/unisys/visorchannel/visorchannel_funcs.c
+++ b/drivers/staging/unisys/visorchannel/visorchannel_funcs.c
@@ -461,13 +461,13 @@ visorchannel_signalremove(struct visorchannel *channel, u32 queue, void *msg)
 }
 EXPORT_SYMBOL_GPL(visorchannel_signalremove);
 
-static BOOL
+static int
 signalinsert_inner(struct visorchannel *channel, u32 queue, void *msg)
 {
 	struct signal_queue_header sig_hdr;
 
 	if (!sig_read_header(channel, queue, &sig_hdr)) {
-		return FALSE;
+		return 0;
 	}
 
 	sig_hdr.head = ((sig_hdr.head + 1) % sig_hdr.max_slots);
@@ -476,12 +476,12 @@ signalinsert_inner(struct visorchannel *channel, u32 queue, void *msg)
 		if (!SIG_WRITE_FIELD(channel, queue, &sig_hdr, num_overflows))
 			ERRDRV("visor_memregion_write of NumOverflows failed\n");
 
-		return FALSE;
+		return 0;
 	}
 
 	if (!sig_write_data(channel, queue, &sig_hdr, sig_hdr.head, msg)) {
 		ERRDRV("sig_write_data failed\n");
-		return FALSE;
+		return 0;
 	}
 	sig_hdr.num_sent++;
 
@@ -491,20 +491,20 @@ signalinsert_inner(struct visorchannel *channel, u32 queue, void *msg)
 	mb(); /* required for channel synch */
 	if (!SIG_WRITE_FIELD(channel, queue, &sig_hdr, head)) {
 		ERRDRV("visor_memregion_write of Head failed\n");
-		return FALSE;
+		return 0;
 	}
 	if (!SIG_WRITE_FIELD(channel, queue, &sig_hdr, num_sent)) {
 		ERRDRV("visor_memregion_write of NumSignalsSent failed\n");
-		return FALSE;
+		return 0;
 	}
 
-	return TRUE;
+	return 1;
 }
 
-BOOL
+int
 visorchannel_signalinsert(struct visorchannel *channel, u32 queue, void *msg)
 {
-	BOOL rc;
+	int rc;
 
 	if (channel->needs_lock) {
 		spin_lock(&channel->insert_lock);
-- 
2.1.0

[PATCH 07/30] staging: unisys: changes sig_read_header function from bool to int

[Benjamin Romer]

From: Erik Arfvidson <erik.arfvidson@unisys.com>

This patch changes function sig_read_header return value
from bool to int

Signed-off-by: Erik Arfvidson <erik.arfvidson@unisys.com>
Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
---
 drivers/staging/unisys/visorchannel/visorchannel_funcs.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/staging/unisys/visorchannel/visorchannel_funcs.c b/drivers/staging/unisys/visorchannel/visorchannel_funcs.c
index 0279e1f..3c13276 100644
--- a/drivers/staging/unisys/visorchannel/visorchannel_funcs.c
+++ b/drivers/staging/unisys/visorchannel/visorchannel_funcs.c
@@ -318,11 +318,11 @@ EXPORT_SYMBOL_GPL(visorchannel_get_header);
 			       &((sig_hdr)->FIELD),			\
 			       sizeof((sig_hdr)->FIELD)) >= 0)
 
-static BOOL
+static int
 sig_read_header(struct visorchannel *channel, u32 queue,
 		struct signal_queue_header *sig_hdr)
 {
-	BOOL rc = FALSE;
+	int rc = 0;
 
 	if (channel->chan_hdr.ch_space_offset < sizeof(struct channel_header)) {
 		ERRDRV("oChannelSpace too small: (status=%d)\n", rc);
@@ -341,7 +341,7 @@ sig_read_header(struct visorchannel *channel, u32 queue,
 		       rc);
 		goto cleanup;
 	}
-	rc = TRUE;
+	rc = 1;
 cleanup:
 	return rc;
 }
-- 
2.1.0

[PATCH 08/30] staging: unisys: changes needs_lock from bool to int

[Benjamin Romer]

From: Erik Arfvidson <erik.arfvidson@unisys.com>

This patch changes needs_lock from bool to int. As a result this changes
variable needs_lock inside function visorchannel_create_guts.

Signed-off-by: Erik Arfvidson <erik.arfvidson@unisys.com>
Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
---
 drivers/staging/unisys/visorchannel/visorchannel_funcs.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/drivers/staging/unisys/visorchannel/visorchannel_funcs.c b/drivers/staging/unisys/visorchannel/visorchannel_funcs.c
index 3c13276..3ccd7f9 100644
--- a/drivers/staging/unisys/visorchannel/visorchannel_funcs.c
+++ b/drivers/staging/unisys/visorchannel/visorchannel_funcs.c
@@ -33,7 +33,7 @@ struct visorchannel {
 	struct channel_header chan_hdr;
 	uuid_le guid;
 	ulong size;
-	BOOL needs_lock;	/* channel creator knows if more than one
+	int needs_lock;	/* channel creator knows if more than one
 				 * thread will be inserting or removing */
 	spinlock_t insert_lock; /* protect head writes in chan_hdr */
 	spinlock_t remove_lock;	/* protect tail writes in chan_hdr */
@@ -52,7 +52,7 @@ struct visorchannel {
 static struct visorchannel *
 visorchannel_create_guts(HOSTADDRESS physaddr, ulong channel_bytes,
 			 struct visorchannel *parent, ulong off, uuid_le guid,
-			 BOOL needs_lock)
+			 int needs_lock)
 {
 	struct visorchannel *p = NULL;
 	void *rc = NULL;
@@ -118,7 +118,7 @@ struct visorchannel *
 visorchannel_create(HOSTADDRESS physaddr, ulong channel_bytes, uuid_le guid)
 {
 	return visorchannel_create_guts(physaddr, channel_bytes, NULL, 0, guid,
-					FALSE);
+					0);
 }
 EXPORT_SYMBOL_GPL(visorchannel_create);
 
@@ -127,7 +127,7 @@ visorchannel_create_with_lock(HOSTADDRESS physaddr, ulong channel_bytes,
 			      uuid_le guid)
 {
 	return visorchannel_create_guts(physaddr, channel_bytes, NULL, 0, guid,
-					TRUE);
+					1);
 }
 EXPORT_SYMBOL_GPL(visorchannel_create_with_lock);
 
@@ -137,7 +137,7 @@ visorchannel_create_overlapped(ulong channel_bytes,
 			       uuid_le guid)
 {
 	return visorchannel_create_guts(0, channel_bytes, parent, off, guid,
-					FALSE);
+					0);
 }
 EXPORT_SYMBOL_GPL(visorchannel_create_overlapped);
 
@@ -147,7 +147,7 @@ visorchannel_create_overlapped_with_lock(ulong channel_bytes,
 					 uuid_le guid)
 {
 	return visorchannel_create_guts(0, channel_bytes, parent, off, guid,
-					TRUE);
+					1);
 }
 EXPORT_SYMBOL_GPL(visorchannel_create_overlapped_with_lock);
 
-- 
2.1.0

_______________________________________________
devel mailing list
devel@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel

[PATCH 09/30] staging: unisys: changes bool to int in sig related function

[Benjamin Romer]

From: Erik Arfvidson <erik.arfvidson@unisys.com>

This patch changes the return value from bool to int to the following
sig related function: sig_read_data, sig_write_data, and sig_do_data

Signed-off-by: Erik Arfvidson <erik.arfvidson@unisys.com>
Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
---
 drivers/staging/unisys/visorchannel/visorchannel_funcs.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/drivers/staging/unisys/visorchannel/visorchannel_funcs.c b/drivers/staging/unisys/visorchannel/visorchannel_funcs.c
index 3ccd7f9..ed50e52 100644
--- a/drivers/staging/unisys/visorchannel/visorchannel_funcs.c
+++ b/drivers/staging/unisys/visorchannel/visorchannel_funcs.c
@@ -346,12 +346,12 @@ cleanup:
 	return rc;
 }
 
-static BOOL
+static int
 sig_do_data(struct visorchannel *channel, u32 queue,
 	    struct signal_queue_header *sig_hdr, u32 slot, void *data,
-	    BOOL is_write)
+	    int is_write)
 {
-	BOOL rc = FALSE;
+	int rc = 0;
 	int signal_data_offset = SIG_DATA_OFFSET(&channel->chan_hdr, queue,
 						 sig_hdr, slot);
 	if (is_write) {
@@ -370,23 +370,23 @@ sig_do_data(struct visorchannel *channel, u32 queue,
 			goto cleanup;
 		}
 	}
-	rc = TRUE;
+	rc = 1;
 cleanup:
 	return rc;
 }
 
-static inline BOOL
+static inline int
 sig_read_data(struct visorchannel *channel, u32 queue,
 	      struct signal_queue_header *sig_hdr, u32 slot, void *data)
 {
-	return sig_do_data(channel, queue, sig_hdr, slot, data, FALSE);
+	return sig_do_data(channel, queue, sig_hdr, slot, data, 0);
 }
 
-static inline BOOL
+static inline int
 sig_write_data(struct visorchannel *channel, u32 queue,
 	       struct signal_queue_header *sig_hdr, u32 slot, void *data)
 {
-	return sig_do_data(channel, queue, sig_hdr, slot, data, TRUE);
+	return sig_do_data(channel, queue, sig_hdr, slot, data, 1);
 }
 
 static inline unsigned char
-- 
2.1.0

[PATCH 10/30] staging: unisys: change periodic_work.[ch] functions from bool to int

[Benjamin Romer]

From: Erik Arfvidson <erik.arfvidson@unisys.com>

This patch changes the following functions from bool to int:
visor_periodic_work_nextperiod
visor_periodic_work_destroy
visor_periodic_work_stop
visor_periodic_work_start
Also change struct periodic_work variables from bool to int

Signed-off-by: Erik Arfvidson <erik.arfvidson@unisys.com>
Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
---
 drivers/staging/unisys/include/periodic_work.h   |  6 +--
 drivers/staging/unisys/visorutil/periodic_work.c | 52 ++++++++++++------------
 2 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/drivers/staging/unisys/include/periodic_work.h b/drivers/staging/unisys/include/periodic_work.h
index 26ec10b..63008c6 100644
--- a/drivers/staging/unisys/include/periodic_work.h
+++ b/drivers/staging/unisys/include/periodic_work.h
@@ -31,8 +31,8 @@ struct periodic_work *visor_periodic_work_create(ulong jiffy_interval,
 					void *workfuncarg,
 					const char *devnam);
 void visor_periodic_work_destroy(struct periodic_work *pw);
-BOOL visor_periodic_work_nextperiod(struct periodic_work *pw);
-BOOL visor_periodic_work_start(struct periodic_work *pw);
-BOOL visor_periodic_work_stop(struct periodic_work *pw);
+int visor_periodic_work_nextperiod(struct periodic_work *pw);
+int visor_periodic_work_start(struct periodic_work *pw);
+int visor_periodic_work_stop(struct periodic_work *pw);
 
 #endif
diff --git a/drivers/staging/unisys/visorutil/periodic_work.c b/drivers/staging/unisys/visorutil/periodic_work.c
index 0908bf9..cde3b37 100644
--- a/drivers/staging/unisys/visorutil/periodic_work.c
+++ b/drivers/staging/unisys/visorutil/periodic_work.c
@@ -30,8 +30,8 @@ struct periodic_work {
 	struct delayed_work work;
 	void (*workfunc)(void *);
 	void *workfuncarg;
-	BOOL is_scheduled;
-	BOOL want_to_stop;
+	int is_scheduled;
+	int want_to_stop;
 	ulong jiffy_interval;
 	struct workqueue_struct *workqueue;
 	const char *devnam;
@@ -75,68 +75,68 @@ EXPORT_SYMBOL_GPL(visor_periodic_work_destroy);
 
 /** Call this from your periodic work worker function to schedule the next
  *  call.
- *  If this function returns FALSE, there was a failure and the
+ *  If this function returns 0, there was a failure and the
  *  periodic work is no longer scheduled
  */
-BOOL visor_periodic_work_nextperiod(struct periodic_work *pw)
+int visor_periodic_work_nextperiod(struct periodic_work *pw)
 {
-	BOOL rc = FALSE;
+	int rc = 0;
 
 	write_lock(&pw->lock);
 	if (pw->want_to_stop) {
-		pw->is_scheduled = FALSE;
-		pw->want_to_stop = FALSE;
-		rc = TRUE;  /* yes, TRUE; see visor_periodic_work_stop() */
+		pw->is_scheduled = 0;
+		pw->want_to_stop = 0;
+		rc = 1;  /* yes, TRUE; see visor_periodic_work_stop() */
 		goto unlock;
 	} else if (queue_delayed_work(pw->workqueue, &pw->work,
 				      pw->jiffy_interval) < 0) {
 		ERRDEV(pw->devnam, "queue_delayed_work failed!");
-		pw->is_scheduled = FALSE;
-		rc = FALSE;
+		pw->is_scheduled = 0;
+		rc = 0;
 		goto unlock;
 	}
-	rc = TRUE;
+	rc = 1;
 unlock:
 	write_unlock(&pw->lock);
 	return rc;
 }
 EXPORT_SYMBOL_GPL(visor_periodic_work_nextperiod);
 
-/** This function returns TRUE iff new periodic work was actually started.
- *  If this function returns FALSE, then no work was started
+/** This function returns 1 if new periodic work was actually started.
+ *  If this function returns 0, then no work was started
  *  (either because it was already started, or because of a failure).
  */
-BOOL visor_periodic_work_start(struct periodic_work *pw)
+int visor_periodic_work_start(struct periodic_work *pw)
 {
-	BOOL rc = FALSE;
+	int rc = 0;
 
 	write_lock(&pw->lock);
 	if (pw->is_scheduled) {
-		rc = FALSE;
+		rc = 0;
 		goto unlock;
 	}
 	if (pw->want_to_stop) {
 		ERRDEV(pw->devnam,
 		       "dev_start_periodic_work failed!");
-		rc = FALSE;
+		rc = 0;
 		goto unlock;
 	}
 	INIT_DELAYED_WORK(&pw->work, &periodic_work_func);
 	if (queue_delayed_work(pw->workqueue, &pw->work,
 			       pw->jiffy_interval) < 0) {
 		ERRDEV(pw->devnam, "%s queue_delayed_work failed!", __func__);
-		rc = FALSE;
+		rc = 0;
 		goto unlock;
 	}
-	pw->is_scheduled = TRUE;
-	rc = TRUE;
+	pw->is_scheduled = 1;
+	rc = 1;
 unlock:
 	write_unlock(&pw->lock);
 	return rc;
 }
 EXPORT_SYMBOL_GPL(visor_periodic_work_start);
 
-/** This function returns TRUE iff your call actually stopped the periodic
+/** This function returns 1 iff your call actually stopped the periodic
  *  work.
  *
  *  -- PAY ATTENTION... this is important --
@@ -170,20 +170,20 @@ EXPORT_SYMBOL_GPL(visor_periodic_work_start);
  *     this deadlock, you will get hung up in an infinite loop saying
  *     "waiting for delayed work...".
  */
-BOOL visor_periodic_work_stop(struct periodic_work *pw)
+int visor_periodic_work_stop(struct periodic_work *pw)
 {
-	BOOL stopped_something = FALSE;
+	int stopped_something = 0;
 
 	write_lock(&pw->lock);
 	stopped_something = pw->is_scheduled && (!pw->want_to_stop);
 	while (pw->is_scheduled) {
-		pw->want_to_stop = TRUE;
+		pw->want_to_stop = 1;
 		if (cancel_delayed_work(&pw->work)) {
 			/* We get here if the delayed work was pending as
 			 * delayed work, but was NOT run.
 			 */
 			ASSERT(pw->is_scheduled);
-			pw->is_scheduled = FALSE;
+			pw->is_scheduled = 0;
 		} else {
 			/* If we get here, either the delayed work:
 			 * - was run, OR,
@@ -208,7 +208,7 @@ BOOL visor_periodic_work_stop(struct periodic_work *pw)
 			SLEEPJIFFIES(10);
 			write_lock(&pw->lock);
 		} else {
-			pw->want_to_stop = FALSE;
+			pw->want_to_stop = 0;
 		}
 	}
 	write_unlock(&pw->lock);
-- 
2.1.0

_______________________________________________
devel mailing list
devel@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel

[PATCH 11/30] staging: unisys: changes visorchipset.[ch] functions from bool to int

[Benjamin Romer]

From: Erik Arfvidson <erik.arfvidson@unisys.com>

This patch changes the following functions in visorchipset.[ch]
from bool to int:
visorchipset_cache_alloc
visorchipset_get_bus_info
visorchipset_get_device_info
visorchipset_set_bus_context

Signed-off-by: Erik Arfvidson <erik.arfvidson@unisys.com>
Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
---
 drivers/staging/unisys/visorchipset/visorchipset.h |  10 +-
 .../unisys/visorchipset/visorchipset_main.c        | 102 ++++++++++-----------
 2 files changed, 56 insertions(+), 56 deletions(-)

diff --git a/drivers/staging/unisys/visorchipset/visorchipset.h b/drivers/staging/unisys/visorchipset/visorchipset.h
index 98f3ba4..15a20a0 100644
--- a/drivers/staging/unisys/visorchipset/visorchipset.h
+++ b/drivers/staging/unisys/visorchipset/visorchipset.h
@@ -218,19 +218,19 @@ typedef void (*SPARREPORTEVENT_COMPLETE_FUNC) (struct controlvm_message *msg,
 void visorchipset_device_pause_response(ulong bus_no, ulong dev_no,
 					int response);
 
-BOOL visorchipset_get_bus_info(ulong bus_no,
+int visorchipset_get_bus_info(ulong bus_no,
 			       struct visorchipset_bus_info *bus_info);
-BOOL visorchipset_get_device_info(ulong bus_no, ulong dev_no,
+int visorchipset_get_device_info(ulong bus_no, ulong dev_no,
 				  struct visorchipset_device_info *dev_info);
-BOOL visorchipset_set_bus_context(ulong bus_no, void *context);
-BOOL visorchipset_set_device_context(ulong bus_no, ulong dev_no, void *context);
+int visorchipset_set_bus_context(ulong bus_no, void *context);
+int visorchipset_set_device_context(ulong bus_no, ulong dev_no, void *context);
 int visorchipset_chipset_ready(void);
 int visorchipset_chipset_selftest(void);
 int visorchipset_chipset_notready(void);
 void visorchipset_save_message(struct controlvm_message *msg,
 			       enum crash_obj_type type);
 void *visorchipset_cache_alloc(struct kmem_cache *pool,
-			       BOOL ok_to_block, char *fn, int ln);
+			       int ok_to_block, char *fn, int ln);
 void visorchipset_cache_free(struct kmem_cache *pool, void *p,
 			     char *fn, int ln);
 
diff --git a/drivers/staging/unisys/visorchipset/visorchipset_main.c b/drivers/staging/unisys/visorchipset/visorchipset_main.c
index f606ee9..da20e98 100644
--- a/drivers/staging/unisys/visorchipset/visorchipset_main.c
+++ b/drivers/staging/unisys/visorchipset/visorchipset_main.c
@@ -119,7 +119,7 @@ typedef struct {
 	struct controlvm_message_header Dumpcapture_header;
 	struct controlvm_message_header Gettextdump_header;
 	struct controlvm_message_header Dumpcomplete_header;
-	BOOL Gettextdump_outstanding;
+	int Gettextdump_outstanding;
 	u32 crc32;
 	ulong length;
 	atomic_t buffers_in_use;
@@ -136,7 +136,7 @@ static LIVEDUMP_INFO LiveDump_info;
  * process it again the next time controlvm_periodic_work() runs.
  */
 static struct controlvm_message ControlVm_Pending_Msg;
-static BOOL ControlVm_Pending_Msg_Valid = FALSE;
+static int ControlVm_Pending_Msg_Valid;
 
 /* Pool of struct putfile_buffer_entry, for keeping track of pending (incoming)
  * TRANSMIT_FILE PutFile payloads.
@@ -827,7 +827,7 @@ static void
 bus_responder(enum controlvm_id cmdId, ulong busNo, int response)
 {
 	struct visorchipset_bus_info *p = NULL;
-	BOOL need_clear = FALSE;
+	int need_clear = 0;
 
 	p = findbus(&BusInfoList, busNo);
 	if (!p) {
@@ -843,7 +843,7 @@ bus_responder(enum controlvm_id cmdId, ulong busNo, int response)
 		if (cmdId == CONTROLVM_BUS_CREATE)
 			p->state.created = 1;
 		if (cmdId == CONTROLVM_BUS_DESTROY)
-			need_clear = TRUE;
+			need_clear = 1;
 	}
 
 	if (p->pending_msg_hdr.id == CONTROLVM_INVALID) {
@@ -904,7 +904,7 @@ device_responder(enum controlvm_id cmdId, ulong busNo, ulong devNo,
 		 int response)
 {
 	struct visorchipset_device_info *p = NULL;
-	BOOL need_clear = FALSE;
+	int need_clear = 0;
 
 	p = finddevice(&DevInfoList, busNo, devNo);
 	if (!p) {
@@ -915,7 +915,7 @@ device_responder(enum controlvm_id cmdId, ulong busNo, ulong devNo,
 		if (cmdId == CONTROLVM_DEVICE_CREATE)
 			p->state.created = 1;
 		if (cmdId == CONTROLVM_DEVICE_DESTROY)
-			need_clear = TRUE;
+			need_clear = 1;
 	}
 
 	if (p->pending_msg_hdr.id == CONTROLVM_INVALID) {
@@ -935,9 +935,9 @@ device_responder(enum controlvm_id cmdId, ulong busNo, ulong devNo,
 static void
 bus_epilog(u32 busNo,
 	   u32 cmd, struct controlvm_message_header *msgHdr,
-	   int response, BOOL needResponse)
+	   int response, int needResponse)
 {
-	BOOL notified = FALSE;
+	int notified = 0;
 
 	struct visorchipset_bus_info *pBusInfo = findbus(&BusInfoList, busNo);
 
@@ -967,23 +967,23 @@ bus_epilog(u32 busNo,
 			* devices */
 			if (BusDev_Server_Notifiers.bus_create) {
 				(*BusDev_Server_Notifiers.bus_create) (busNo);
-				notified = TRUE;
+				notified = 1;
 			}
 			if ((!pBusInfo->flags.server) /*client */ &&
 			    BusDev_Client_Notifiers.bus_create) {
 				(*BusDev_Client_Notifiers.bus_create) (busNo);
-				notified = TRUE;
+				notified = 1;
 			}
 			break;
 		case CONTROLVM_BUS_DESTROY:
 			if (BusDev_Server_Notifiers.bus_destroy) {
 				(*BusDev_Server_Notifiers.bus_destroy) (busNo);
-				notified = TRUE;
+				notified = 1;
 			}
 			if ((!pBusInfo->flags.server) /*client */ &&
 			    BusDev_Client_Notifiers.bus_destroy) {
 				(*BusDev_Client_Notifiers.bus_destroy) (busNo);
-				notified = TRUE;
+				notified = 1;
 			}
 			break;
 		}
@@ -1002,10 +1002,10 @@ bus_epilog(u32 busNo,
 static void
 device_epilog(u32 busNo, u32 devNo, struct spar_segment_state state, u32 cmd,
 	      struct controlvm_message_header *msgHdr, int response,
-	      BOOL needResponse, BOOL for_visorbus)
+	      int needResponse, int for_visorbus)
 {
 	struct visorchipset_busdev_notifiers *notifiers = NULL;
-	BOOL notified = FALSE;
+	int notified = 0;
 
 	struct visorchipset_device_info *pDevInfo =
 		finddevice(&DevInfoList, busNo, devNo);
@@ -1034,7 +1034,7 @@ device_epilog(u32 busNo, u32 devNo, struct spar_segment_state state, u32 cmd,
 		case CONTROLVM_DEVICE_CREATE:
 			if (notifiers->device_create) {
 				(*notifiers->device_create) (busNo, devNo);
-				notified = TRUE;
+				notified = 1;
 			}
 			break;
 		case CONTROLVM_DEVICE_CHANGESTATE:
@@ -1045,7 +1045,7 @@ device_epilog(u32 busNo, u32 devNo, struct spar_segment_state state, u32 cmd,
 				if (notifiers->device_resume) {
 					(*notifiers->device_resume) (busNo,
 								     devNo);
-					notified = TRUE;
+					notified = 1;
 				}
 			}
 			/* ServerNotReady / ServerLost / SegmentStateStandby */
@@ -1058,7 +1058,7 @@ device_epilog(u32 busNo, u32 devNo, struct spar_segment_state state, u32 cmd,
 				if (notifiers->device_pause) {
 					(*notifiers->device_pause) (busNo,
 								    devNo);
-					notified = TRUE;
+					notified = 1;
 				}
 			} else if (state.alive == segment_state_paused.alive &&
 				   state.operating ==
@@ -1082,7 +1082,7 @@ device_epilog(u32 busNo, u32 devNo, struct spar_segment_state state, u32 cmd,
 		case CONTROLVM_DEVICE_DESTROY:
 			if (notifiers->device_destroy) {
 				(*notifiers->device_destroy) (busNo, devNo);
-				notified = TRUE;
+				notified = 1;
 			}
 			break;
 		}
@@ -1379,7 +1379,7 @@ Away:
 /* When provided with the physical address of the controlvm channel
  * (phys_addr), the offset to the payload area we need to manage
  * (offset), and the size of this payload area (bytes), fills in the
- * CONTROLVM_PAYLOAD_INFO struct.  Returns TRUE for success or FALSE
+ * CONTROLVM_PAYLOAD_INFO struct.  Returns 1 for success or 0
  * for failure.
  */
 static int
@@ -1544,7 +1544,7 @@ chipset_notready(struct controlvm_message_header *msgHdr)
 /* This is your "one-stop" shop for grabbing the next message from the
  * CONTROLVM_QUEUE_EVENT queue in the controlvm channel.
  */
-static BOOL
+static int
 read_controlvm_event(struct controlvm_message *msg)
 {
 	if (visorchannel_signalremove(ControlVm_channel,
@@ -1553,11 +1553,11 @@ read_controlvm_event(struct controlvm_message *msg)
 		if (msg->hdr.flags.test_message == 1) {
 			LOGERR("ignoring bad CONTROLVM_QUEUE_EVENT msg with controlvm_msg_id=0x%x because Flags.testMessage is nonsensical (=1)",
 			       msg->hdr.id);
-			return FALSE;
+			return 0;
 		}
-		return TRUE;
+		return 1;
 	}
-	return FALSE;
+	return 0;
 }
 
 /*
@@ -1774,30 +1774,30 @@ parahotplug_process_message(struct controlvm_message *inmsg)
 
 /* Process a controlvm message.
  * Return result:
- *    FALSE - this function will return FALSE only in the case where the
+ *    0 - this function will return 0 only in the case where the
  *            controlvm message was NOT processed, but processing must be
  *            retried before reading the next controlvm message; a
  *            scenario where this can occur is when we need to throttle
  *            the allocation of memory in which to copy out controlvm
  *            payload data
- *    TRUE  - processing of the controlvm message completed,
+ *    1  - processing of the controlvm message completed,
  *            either successfully or with an error.
  */
-static BOOL
+static int
 handle_command(struct controlvm_message inmsg, HOSTADDRESS channel_addr)
 {
 	struct controlvm_message_packet *cmd = &inmsg.cmd;
 	u64 parametersAddr = 0;
 	u32 parametersBytes = 0;
 	PARSER_CONTEXT *parser_ctx = NULL;
-	BOOL isLocalAddr = FALSE;
+	int isLocalAddr = 0;
 	struct controlvm_message ackmsg;
 
 	/* create parsing context if necessary */
 	isLocalAddr = (inmsg.hdr.flags.test_message == 1);
 	if (channel_addr == 0) {
 		LOGERR("HUH? channel_addr is 0!");
-		return TRUE;
+		return 1;
 	}
 	parametersAddr = channel_addr + inmsg.hdr.payload_vm_offset;
 	parametersBytes = inmsg.hdr.payload_bytes;
@@ -1807,7 +1807,7 @@ handle_command(struct controlvm_message inmsg, HOSTADDRESS channel_addr)
 	 * makes a difference in how we compute the virtual address.
 	 */
 	if (parametersAddr != 0 && parametersBytes != 0) {
-		BOOL retry = FALSE;
+		int retry = 0;
 
 		parser_ctx =
 		    parser_init_byteStream(parametersAddr, parametersBytes,
@@ -1815,7 +1815,7 @@ handle_command(struct controlvm_message inmsg, HOSTADDRESS channel_addr)
 		if (!parser_ctx) {
 			if (retry) {
 				LOGWRN("throttling to copy payload");
-				return FALSE;
+				return 0;
 			}
 			LOGWRN("parsing failed");
 			LOGWRN("inmsg.hdr.Id=0x%lx", (ulong) inmsg.hdr.id);
@@ -1919,7 +1919,7 @@ handle_command(struct controlvm_message inmsg, HOSTADDRESS channel_addr)
 		parser_done(parser_ctx);
 		parser_ctx = NULL;
 	}
-	return TRUE;
+	return 1;
 }
 
 static HOSTADDRESS controlvm_get_channel_address(void)
@@ -1940,8 +1940,8 @@ static void
 controlvm_periodic_work(struct work_struct *work)
 {
 	struct controlvm_message inmsg;
-	BOOL gotACommand = FALSE;
-	BOOL handle_command_failed = FALSE;
+	int gotACommand = 0;
+	int handle_command_failed = 0;
 	static u64 Poll_Count;
 
 	/* make sure visorbus server is registered for controlvm callbacks */
@@ -1990,13 +1990,13 @@ controlvm_periodic_work(struct work_struct *work)
 			* rather than reading a new one
 			*/
 			inmsg = ControlVm_Pending_Msg;
-			ControlVm_Pending_Msg_Valid = FALSE;
-			gotACommand = TRUE;
+			ControlVm_Pending_Msg_Valid = 0;
+			gotACommand = 1;
 		} else
 			gotACommand = read_controlvm_event(&inmsg);
 	}
 
-	handle_command_failed = FALSE;
+	handle_command_failed = 0;
 	while (gotACommand && (!handle_command_failed)) {
 		Most_recent_message_jiffies = jiffies;
 		if (handle_command(inmsg,
@@ -2010,9 +2010,9 @@ controlvm_periodic_work(struct work_struct *work)
 			* controlvm msg so we will attempt to
 			* reprocess it on our next loop
 			*/
-			handle_command_failed = TRUE;
+			handle_command_failed = 1;
 			ControlVm_Pending_Msg = inmsg;
-			ControlVm_Pending_Msg_Valid = TRUE;
+			ControlVm_Pending_Msg_Valid = 1;
 		}
 	}
 
@@ -2198,35 +2198,35 @@ device_resume_response(ulong busNo, ulong devNo, int response)
 				     segment_state_running);
 }
 
-BOOL
+int
 visorchipset_get_bus_info(ulong bus_no, struct visorchipset_bus_info *bus_info)
 {
 	void *p = findbus(&BusInfoList, bus_no);
 
 	if (!p) {
 		LOGERR("(%lu) failed", bus_no);
-		return FALSE;
+		return 0;
 	}
 	memcpy(bus_info, p, sizeof(struct visorchipset_bus_info));
-	return TRUE;
+	return 1;
 }
 EXPORT_SYMBOL_GPL(visorchipset_get_bus_info);
 
-BOOL
+int
 visorchipset_set_bus_context(ulong bus_no, void *context)
 {
 	struct visorchipset_bus_info *p = findbus(&BusInfoList, bus_no);
 
 	if (!p) {
 		LOGERR("(%lu) failed", bus_no);
-		return FALSE;
+		return 0;
 	}
 	p->bus_driver_context = context;
-	return TRUE;
+	return 1;
 }
 EXPORT_SYMBOL_GPL(visorchipset_set_bus_context);
 
-BOOL
+int
 visorchipset_get_device_info(ulong bus_no, ulong dev_no,
 			     struct visorchipset_device_info *dev_info)
 {
@@ -2234,14 +2234,14 @@ visorchipset_get_device_info(ulong bus_no, ulong dev_no,
 
 	if (!p) {
 		LOGERR("(%lu,%lu) failed", bus_no, dev_no);
-		return FALSE;
+		return 0;
 	}
 	memcpy(dev_info, p, sizeof(struct visorchipset_device_info));
-	return TRUE;
+	return 1;
 }
 EXPORT_SYMBOL_GPL(visorchipset_get_device_info);
 
-BOOL
+int
 visorchipset_set_device_context(ulong bus_no, ulong dev_no, void *context)
 {
 	struct visorchipset_device_info *p =
@@ -2249,17 +2249,17 @@ visorchipset_set_device_context(ulong bus_no, ulong dev_no, void *context)
 
 	if (!p) {
 		LOGERR("(%lu,%lu) failed", bus_no, dev_no);
-		return FALSE;
+		return 0;
 	}
 	p->bus_driver_context = context;
-	return TRUE;
+	return 1;
 }
 EXPORT_SYMBOL_GPL(visorchipset_set_device_context);
 
 /* Generic wrapper function for allocating memory from a kmem_cache pool.
  */
 void *
-visorchipset_cache_alloc(struct kmem_cache *pool, BOOL ok_to_block,
+visorchipset_cache_alloc(struct kmem_cache *pool, int ok_to_block,
 			 char *fn, int ln)
 {
 	gfp_t gfp;
-- 
2.1.0

[PATCH 12/30] staging: unisys: change visorchipset/parse.[ch] from bool to int

[Benjamin Romer]

From: Erik Arfvidson <erik.arfvidson@unisys.com>

this patch changes visorchipset variables from bool to int.

Signed-off-by: Erik Arfvidson <erik.arfvidson@unisys.com>
Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
---
 drivers/staging/unisys/visorchipset/parser.c | 24 ++++++++++++------------
 drivers/staging/unisys/visorchipset/parser.h |  6 +++---
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/drivers/staging/unisys/visorchipset/parser.c b/drivers/staging/unisys/visorchipset/parser.c
index 9edbd3b..2f997af 100644
--- a/drivers/staging/unisys/visorchipset/parser.c
+++ b/drivers/staging/unisys/visorchipset/parser.c
@@ -36,13 +36,13 @@ struct PARSER_CONTEXT_Tag {
 	ulong param_bytes;
 	u8 *curr;
 	ulong bytes_remaining;
-	BOOL byte_stream;
+	int byte_stream;
 	char data[0];
 };
 
 static PARSER_CONTEXT *
-parser_init_guts(u64 addr, u32 bytes, BOOL isLocal,
-		 BOOL hasStandardPayloadHeader, BOOL *tryAgain)
+parser_init_guts(u64 addr, u32 bytes, int isLocal,
+		 int hasStandardPayloadHeader, int *tryAgain)
 {
 	int allocbytes = sizeof(PARSER_CONTEXT) + bytes;
 	PARSER_CONTEXT *rc = NULL;
@@ -51,7 +51,7 @@ parser_init_guts(u64 addr, u32 bytes, BOOL isLocal,
 	struct spar_controlvm_parameters_header *phdr = NULL;
 
 	if (tryAgain)
-		*tryAgain = FALSE;
+		*tryAgain = 0;
 	if (!hasStandardPayloadHeader)
 		/* alloc and 0 extra byte to ensure payload is
 		 * '\0'-terminated
@@ -63,7 +63,7 @@ parser_init_guts(u64 addr, u32 bytes, BOOL isLocal,
 		       __func__, __FILE__, __LINE__, allocbytes,
 		       MAX_CONTROLVM_PAYLOAD_BYTES);
 		if (tryAgain)
-			*tryAgain = TRUE;
+			*tryAgain = 1;
 		rc = NULL;
 		goto Away;
 	}
@@ -72,7 +72,7 @@ parser_init_guts(u64 addr, u32 bytes, BOOL isLocal,
 		ERRDRV("%s (%s:%d) - failed to allocate %d bytes",
 		       __func__, __FILE__, __LINE__, allocbytes);
 		if (tryAgain)
-			*tryAgain = TRUE;
+			*tryAgain = 1;
 		rc = NULL;
 		goto Away;
 	}
@@ -81,7 +81,7 @@ parser_init_guts(u64 addr, u32 bytes, BOOL isLocal,
 	ctx->param_bytes = bytes;
 	ctx->curr = NULL;
 	ctx->bytes_remaining = 0;
-	ctx->byte_stream = FALSE;
+	ctx->byte_stream = 0;
 	if (isLocal) {
 		void *p;
 
@@ -106,7 +106,7 @@ parser_init_guts(u64 addr, u32 bytes, BOOL isLocal,
 		}
 	}
 	if (!hasStandardPayloadHeader) {
-		ctx->byte_stream = TRUE;
+		ctx->byte_stream = 1;
 		rc = ctx;
 		goto Away;
 	}
@@ -155,9 +155,9 @@ Away:
 }
 
 PARSER_CONTEXT *
-parser_init(u64 addr, u32 bytes, BOOL isLocal, BOOL *tryAgain)
+parser_init(u64 addr, u32 bytes, int isLocal, int *tryAgain)
 {
-	return parser_init_guts(addr, bytes, isLocal, TRUE, tryAgain);
+	return parser_init_guts(addr, bytes, isLocal, 1, tryAgain);
 }
 
 /* Call this instead of parser_init() if the payload area consists of just
@@ -166,9 +166,9 @@ parser_init(u64 addr, u32 bytes, BOOL isLocal, BOOL *tryAgain)
  * parser_byteStream_get() to obtain the data.
  */
 PARSER_CONTEXT *
-parser_init_byteStream(u64 addr, u32 bytes, BOOL isLocal, BOOL *tryAgain)
+parser_init_byteStream(u64 addr, u32 bytes, int isLocal, int *tryAgain)
 {
-	return parser_init_guts(addr, bytes, isLocal, FALSE, tryAgain);
+	return parser_init_guts(addr, bytes, isLocal, 0, tryAgain);
 }
 
 /* Obtain '\0'-terminated copy of string in payload area.
diff --git a/drivers/staging/unisys/visorchipset/parser.h b/drivers/staging/unisys/visorchipset/parser.h
index 9fbe3b5..fceb1ef 100644
--- a/drivers/staging/unisys/visorchipset/parser.h
+++ b/drivers/staging/unisys/visorchipset/parser.h
@@ -33,9 +33,9 @@ typedef enum {
 
 typedef struct PARSER_CONTEXT_Tag PARSER_CONTEXT;
 
-PARSER_CONTEXT *parser_init(u64 addr, u32 bytes, BOOL isLocal, BOOL *tryAgain);
-PARSER_CONTEXT *parser_init_byteStream(u64 addr, u32 bytes, BOOL isLocal,
-				       BOOL *tryAgain);
+PARSER_CONTEXT *parser_init(u64 addr, u32 bytes, int isLocal, int *tryAgain);
+PARSER_CONTEXT *parser_init_byteStream(u64 addr, u32 bytes, int isLocal,
+				       int *tryAgain);
 void parser_param_start(PARSER_CONTEXT *ctx, PARSER_WHICH_STRING which_string);
 void *parser_param_get(PARSER_CONTEXT *ctx, char *nam, int namesize);
 void *parser_string_get(PARSER_CONTEXT *ctx);
-- 
2.1.0

[PATCH 13/30] staging: unisys: change charqueue.[ch] variables from bool to int

[Benjamin Romer]

From: Erik Arfvidson <erik.arfvidson@unisys.com>

This patch changes charqueue.[ch] functions and variables from bool
to int including their return values.

Signed-off-by: Erik Arfvidson <erik.arfvidson@unisys.com>
Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
---
 drivers/staging/unisys/visorutil/charqueue.c | 4 ++--
 drivers/staging/unisys/visorutil/charqueue.h | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/staging/unisys/visorutil/charqueue.c b/drivers/staging/unisys/visorutil/charqueue.c
index ac7acb7..0d1eb0d 100644
--- a/drivers/staging/unisys/visorutil/charqueue.c
+++ b/drivers/staging/unisys/visorutil/charqueue.c
@@ -66,9 +66,9 @@ void visor_charqueue_enqueue(struct charqueue *charqueue, unsigned char c)
 }
 EXPORT_SYMBOL_GPL(visor_charqueue_enqueue);
 
-BOOL visor_charqueue_is_empty(struct charqueue *charqueue)
+int visor_charqueue_is_empty(struct charqueue *charqueue)
 {
-	BOOL b;
+	int b;
 
 	spin_lock(&charqueue->lock);
 	b = IS_EMPTY(charqueue);
diff --git a/drivers/staging/unisys/visorutil/charqueue.h b/drivers/staging/unisys/visorutil/charqueue.h
index 56c1f79..358e8cb 100644
--- a/drivers/staging/unisys/visorutil/charqueue.h
+++ b/drivers/staging/unisys/visorutil/charqueue.h
@@ -31,7 +31,7 @@ void visor_charqueue_enqueue(struct charqueue *charqueue, unsigned char c);
 int charqueue_dequeue(struct charqueue *charqueue);
 int visor_charqueue_dequeue_n(struct charqueue *charqueue, unsigned char *buf,
 			      int n);
-BOOL visor_charqueue_is_empty(struct charqueue *charqueue);
+int visor_charqueue_is_empty(struct charqueue *charqueue);
 void visor_charqueue_destroy(struct charqueue *charqueue);
 
 #endif
-- 
2.1.0

_______________________________________________
devel mailing list
devel@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel

[PATCH 14/30] staging: unisys: remove #define bool in visorchannel.h

[Benjamin Romer]

From: Erik Arfvidson <erik.arfvidson@unisys.com>

This patche removes pound define from visorchannel.h.

Signed-off-by: Erik Arfvidson <erik.arfvidson@unisys.com>
Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
---
 drivers/staging/unisys/visorchannel/visorchannel.h | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/drivers/staging/unisys/visorchannel/visorchannel.h b/drivers/staging/unisys/visorchannel/visorchannel.h
index e8df58d..d4f1651 100644
--- a/drivers/staging/unisys/visorchannel/visorchannel.h
+++ b/drivers/staging/unisys/visorchannel/visorchannel.h
@@ -25,9 +25,6 @@
 #ifndef HOSTADDRESS
 #define HOSTADDRESS u64
 #endif
-#ifndef BOOL
-#define BOOL int
-#endif
 
 /* Note that for visorchannel_create() and visorchannel_create_overlapped(),
  * <channel_bytes> and <guid> arguments may be 0 if we are a channel CLIENT.
-- 
2.1.0

_______________________________________________
devel mailing list
devel@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel

[PATCH 15/30] staging: unisys: change memregion_direct.c variables type bool to int.

[Benjamin Romer]

From: Erik Arfvidson <erik.arfvidson@unisys.com>

This patch changes all variable types bool to int in memregion_direct.c

Signed-off-by: Erik Arfvidson <erik.arfvidson@unisys.com>
Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
---
 .../staging/unisys/visorutil/memregion_direct.c    | 30 +++++++++++-----------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/drivers/staging/unisys/visorutil/memregion_direct.c b/drivers/staging/unisys/visorutil/memregion_direct.c
index 33522cc..6487b0e 100644
--- a/drivers/staging/unisys/visorutil/memregion_direct.c
+++ b/drivers/staging/unisys/visorutil/memregion_direct.c
@@ -30,11 +30,11 @@ struct memregion {
 	HOSTADDRESS physaddr;
 	ulong nbytes;
 	void __iomem *mapped;
-	BOOL requested;
-	BOOL overlapped;
+	int requested;
+	int overlapped;
 };
 
-static BOOL mapit(struct memregion *memregion);
+static int mapit(struct memregion *memregion);
 static void unmapit(struct memregion *memregion);
 
 struct memregion *
@@ -49,7 +49,7 @@ visor_memregion_create(HOSTADDRESS physaddr, ulong nbytes)
 	}
 	memregion->physaddr = physaddr;
 	memregion->nbytes = nbytes;
-	memregion->overlapped = FALSE;
+	memregion->overlapped = 0;
 	if (!mapit(memregion)) {
 		rc = NULL;
 		goto cleanup;
@@ -93,31 +93,31 @@ visor_memregion_create_overlapped(struct memregion *parent, ulong offset,
 	memregion->physaddr = parent->physaddr + offset;
 	memregion->nbytes = nbytes;
 	memregion->mapped = ((u8 __iomem *)(parent->mapped)) + offset;
-	memregion->requested = FALSE;
-	memregion->overlapped = TRUE;
+	memregion->requested = 0;
+	memregion->overlapped = 1;
 	return memregion;
 }
 EXPORT_SYMBOL_GPL(visor_memregion_create_overlapped);
 
-static BOOL
+static int
 mapit(struct memregion *memregion)
 {
 	ulong physaddr = (ulong)(memregion->physaddr);
 	ulong nbytes = memregion->nbytes;
 
-	memregion->requested = FALSE;
+	memregion->requested = 0;
 	if (!request_mem_region(physaddr, nbytes, MYDRVNAME))
 		ERRDRV("cannot reserve channel memory @0x%lx for 0x%lx-- no big deal",
 		       physaddr, nbytes);
 	else
-		memregion->requested = TRUE;
+		memregion->requested = 1;
 	memregion->mapped = ioremap_cache(physaddr, nbytes);
 	if (memregion->mapped == NULL) {
 		ERRDRV("cannot ioremap_cache channel memory @0x%lx for 0x%lx",
 		       physaddr, nbytes);
-		return FALSE;
+		return 0;
 	}
-	return TRUE;
+	return 1;
 }
 
 static void
@@ -130,7 +130,7 @@ unmapit(struct memregion *memregion)
 	if (memregion->requested) {
 		release_mem_region((ulong)(memregion->physaddr),
 				   memregion->nbytes);
-		memregion->requested = FALSE;
+		memregion->requested = 0;
 	}
 }
 
@@ -176,7 +176,7 @@ visor_memregion_resize(struct memregion *memregion, ulong newsize)
 EXPORT_SYMBOL_GPL(visor_memregion_resize);
 
 static int
-memregion_readwrite(BOOL is_write,
+memregion_readwrite(int is_write,
 		    struct memregion *memregion, ulong offset,
 		    void *local, ulong nbytes)
 {
@@ -196,7 +196,7 @@ int
 visor_memregion_read(struct memregion *memregion, ulong offset, void *dest,
 		     ulong nbytes)
 {
-	return memregion_readwrite(FALSE, memregion, offset, dest, nbytes);
+	return memregion_readwrite(0, memregion, offset, dest, nbytes);
 }
 EXPORT_SYMBOL_GPL(visor_memregion_read);
 
@@ -204,7 +204,7 @@ int
 visor_memregion_write(struct memregion *memregion, ulong offset, void *src,
 		      ulong nbytes)
 {
-	return memregion_readwrite(TRUE, memregion, offset, src, nbytes);
+	return memregion_readwrite(1, memregion, offset, src, nbytes);
 }
 EXPORT_SYMBOL_GPL(visor_memregion_write);
 
-- 
2.1.0

_______________________________________________
devel mailing list
devel@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel

[PATCH 16/30] staging: unisys: change visorchannel_funcs.c function variable from bool to int

[Benjamin Romer]

From: Erik Arfvidson <erik.arfvidson@unisys.com>

This patch changes visorchanne_funcs.c function variable from bool to int.

Signed-off-by: Erik Arfvidson <erik.arfvidson@unisys.com>
Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
---
 drivers/staging/unisys/visorchannel/visorchannel_funcs.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/staging/unisys/visorchannel/visorchannel_funcs.c b/drivers/staging/unisys/visorchannel/visorchannel_funcs.c
index ed50e52..8def9c2 100644
--- a/drivers/staging/unisys/visorchannel/visorchannel_funcs.c
+++ b/drivers/staging/unisys/visorchannel/visorchannel_funcs.c
@@ -681,7 +681,7 @@ visorchannel_dump_section(struct visorchannel *chan, char *s,
 	tbuf = buf;
 	while (len > 0) {
 		i = (len < 16) ? len : 16;
-		hex_dump_to_buffer(tbuf, i, 16, 1, fmtbuf, fmtbufsize, TRUE);
+		hex_dump_to_buffer(tbuf, i, 16, 1, fmtbuf, fmtbufsize, 1);
 		seq_printf(seq, "%s\n", fmtbuf);
 		tbuf += 16;
 		len -= 16;
-- 
2.1.0

[PATCH 17/30] staging: unisys: change visorkmodutils.c variable from bool to int.

[Benjamin Romer]

From: Erik Arfvidson <erik.arfvidson@unisys.com>

this patch changes the value of variable  unisys_spar_plataform from
bool to int.

Signed-off-by: Erik Arfvidson <erik.arfvidson@unisys.com>
Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
---
 drivers/staging/unisys/visorutil/visorkmodutils.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/staging/unisys/visorutil/visorkmodutils.c b/drivers/staging/unisys/visorutil/visorkmodutils.c
index 556e264..f3f1839 100644
--- a/drivers/staging/unisys/visorutil/visorkmodutils.c
+++ b/drivers/staging/unisys/visorutil/visorkmodutils.c
@@ -54,7 +54,7 @@ static __init uint32_t visorutil_spar_detect(void)
 static __init int visorutil_mod_init(void)
 {
 	if (visorutil_spar_detect()) {
-		unisys_spar_platform = TRUE;
+		unisys_spar_platform = 1;
 		return 0;
 	} else {
 		return -ENODEV;
-- 
2.1.0

_______________________________________________
devel mailing list
devel@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel

[PATCH 18/30] staging: unisys: change uislib.c variables from type bool to int

[Benjamin Romer]

From: Erik Arfvidson <erik.arfvidson@unisys.com>

this patch changes uislib.c variables from type bool to int

Signed-off-by: Erik Arfvidson <erik.arfvidson@unisys.com>
Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
---
 drivers/staging/unisys/uislib/uislib.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/drivers/staging/unisys/uislib/uislib.c b/drivers/staging/unisys/uislib/uislib.c
index a9eedde..a5d25c8 100644
--- a/drivers/staging/unisys/uislib/uislib.c
+++ b/drivers/staging/unisys/uislib/uislib.c
@@ -78,7 +78,7 @@ static u64 phys_data_chan;
 static int platform_no;
 
 static struct uisthread_info incoming_ti;
-static BOOL incoming_started = FALSE;
+static int incoming_started;
 static LIST_HEAD(poll_dev_chan);
 static unsigned long long tot_moved_to_tail_cnt;
 static unsigned long long tot_wait_cnt;
@@ -1339,18 +1339,18 @@ static int process_incoming(void *v)
 	complete_and_exit(&incoming_ti.has_stopped, 0);
 }
 
-static BOOL
+static int
 initialize_incoming_thread(void)
 {
 	if (incoming_started)
-		return TRUE;
+		return 1;
 	if (!uisthread_start(&incoming_ti,
 			     &process_incoming, NULL, "dev_incoming")) {
 		LOGERR("uisthread_start initialize_incoming_thread ****FAILED");
-		return FALSE;
+		return 0;
 	}
-	incoming_started = TRUE;
-	return TRUE;
+	incoming_started = 1;
+	return 1;
 }
 
 /*  Add a new device/channel to the list being processed by
@@ -1376,7 +1376,7 @@ uislib_enable_channel_interrupts(u32 bus_no, u32 dev_no,
 	initialize_incoming_thread();
 	dev->interrupt = interrupt;
 	dev->interrupt_context = interrupt_context;
-	dev->polling = TRUE;
+	dev->polling = 1;
 	list_add_tail(&dev->list_polling_device_channels,
 		      &poll_dev_chan);
 	up(&poll_dev_lock);
@@ -1399,7 +1399,7 @@ uislib_disable_channel_interrupts(u32 bus_no, u32 dev_no)
 	}
 	down(&poll_dev_lock);
 	list_del(&dev->list_polling_device_channels);
-	dev->polling = FALSE;
+	dev->polling = 0;
 	dev->interrupt = NULL;
 	up(&poll_dev_lock);
 }
-- 
2.1.0

_______________________________________________
devel mailing list
devel@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel

[PATCH 19/30] staging: unisys: remove #definition from timskmod.h

[Benjamin Romer]

From: Erik Arfvidson <erik.arfvidson@unisys.com>

this patch removes #definitions from timksmod.h

Signed-off-by: Erik Arfvidson <erik.arfvidson@unisys.com>
Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
---
 drivers/staging/unisys/include/timskmod.h                |  5 -----
 drivers/staging/unisys/visorchannel/visorchannel_funcs.c | 15 +++++----------
 2 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/drivers/staging/unisys/include/timskmod.h b/drivers/staging/unisys/include/timskmod.h
index 4019a0d..bd36ef8 100644
--- a/drivers/staging/unisys/include/timskmod.h
+++ b/drivers/staging/unisys/include/timskmod.h
@@ -53,11 +53,6 @@
 #include <linux/mm.h>
 
 /* #define DEBUG */
-#ifndef BOOL
-#define BOOL    int
-#endif
-#define FALSE   0
-#define TRUE    1
 #if !defined SUCCESS
 #define SUCCESS 0
 #endif
diff --git a/drivers/staging/unisys/visorchannel/visorchannel_funcs.c b/drivers/staging/unisys/visorchannel/visorchannel_funcs.c
index 8def9c2..4f25d9b 100644
--- a/drivers/staging/unisys/visorchannel/visorchannel_funcs.c
+++ b/drivers/staging/unisys/visorchannel/visorchannel_funcs.c
@@ -322,11 +322,9 @@ static int
 sig_read_header(struct visorchannel *channel, u32 queue,
 		struct signal_queue_header *sig_hdr)
 {
-	int rc = 0;
-
 	if (channel->chan_hdr.ch_space_offset < sizeof(struct channel_header)) {
-		ERRDRV("oChannelSpace too small: (status=%d)\n", rc);
-		goto cleanup;
+		ERRDRV("oChannelSpace too small\n");
+		return 0;
 	}
 
 	/* Read the appropriate SIGNAL_QUEUE_HEADER into local memory. */
@@ -337,13 +335,10 @@ sig_read_header(struct visorchannel *channel, u32 queue,
 				 sizeof(struct signal_queue_header)) < 0) {
 		ERRDRV("queue=%d SIG_QUEUE_OFFSET=%d",
 		       queue, (int)SIG_QUEUE_OFFSET(&channel->chan_hdr, queue));
-		ERRDRV("visor_memregion_read of signal queue failed: (status=%d)\n",
-		       rc);
-		goto cleanup;
+		ERRDRV("visor_memregion_read of signal queue failed\n");
+		return 0;
 	}
-	rc = 1;
-cleanup:
-	return rc;
+	return 1;
 }
 
 static int
-- 
2.1.0

_______________________________________________
devel mailing list
devel@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel

[PATCH 20/30] staging: unisys: remove goto from sig_do_data()

[Benjamin Romer]

The gotos in this function are unnecessary, so just return.

Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
---
 drivers/staging/unisys/visorchannel/visorchannel_funcs.c | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/drivers/staging/unisys/visorchannel/visorchannel_funcs.c b/drivers/staging/unisys/visorchannel/visorchannel_funcs.c
index 4f25d9b..73dd54b 100644
--- a/drivers/staging/unisys/visorchannel/visorchannel_funcs.c
+++ b/drivers/staging/unisys/visorchannel/visorchannel_funcs.c
@@ -346,28 +346,23 @@ sig_do_data(struct visorchannel *channel, u32 queue,
 	    struct signal_queue_header *sig_hdr, u32 slot, void *data,
 	    int is_write)
 {
-	int rc = 0;
 	int signal_data_offset = SIG_DATA_OFFSET(&channel->chan_hdr, queue,
 						 sig_hdr, slot);
 	if (is_write) {
 		if (visor_memregion_write(channel->memregion,
 					  signal_data_offset,
 					  data, sig_hdr->signal_size) < 0) {
-			ERRDRV("visor_memregion_write of signal data failed: (status=%d)\n",
-			       rc);
-			goto cleanup;
+			ERRDRV("visor_memregion_write of signal data failed");
+			return 0;
 		}
 	} else {
 		if (visor_memregion_read(channel->memregion, signal_data_offset,
 					 data, sig_hdr->signal_size) < 0) {
-			ERRDRV("visor_memregion_read of signal data failed: (status=%d)\n",
-			       rc);
-			goto cleanup;
+			ERRDRV("visor_memregion_read of signal data failed");
+			return 0;
 		}
 	}
-	rc = 1;
-cleanup:
-	return rc;
+	return 0;
 }
 
 static inline int
-- 
2.1.0

_______________________________________________
devel mailing list
devel@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel

[PATCH 21/30] staging: unisys: remove unnecessary goto in parser_param_start()

[Benjamin Romer]

The goto isn't necessary here so replace it with a simple return
statement.

Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
---
 drivers/staging/unisys/visorchipset/parser.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/drivers/staging/unisys/visorchipset/parser.c b/drivers/staging/unisys/visorchipset/parser.c
index 2f997af..3678d39 100644
--- a/drivers/staging/unisys/visorchipset/parser.c
+++ b/drivers/staging/unisys/visorchipset/parser.c
@@ -217,7 +217,7 @@ parser_param_start(PARSER_CONTEXT *ctx, PARSER_WHICH_STRING which_string)
 	if (ctx == NULL) {
 		ERRDRV("%s (%s:%d) - no context",
 		       __func__, __FILE__, __LINE__);
-		goto Away;
+		return;
 	}
 	phdr = (struct spar_controlvm_parameters_header *)(ctx->data);
 	switch (which_string) {
@@ -241,9 +241,6 @@ parser_param_start(PARSER_CONTEXT *ctx, PARSER_WHICH_STRING which_string)
 		ERRDRV("%s - bad which_string %d", __func__, which_string);
 		break;
 	}
-
-Away:
-	return;
 }
 
 void
-- 
2.1.0

_______________________________________________
devel mailing list
devel@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel

[PATCH 22/30] staging: unisys: Remove unnecessary gotos from info_debugfs_read_helper

[Benjamin Romer]

Get rid of all the useless gotos in info_debugfs_read_helper() and just
return the correct values straight away.

Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
---
 drivers/staging/unisys/uislib/uislib.c | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/drivers/staging/unisys/uislib/uislib.c b/drivers/staging/unisys/uislib/uislib.c
index a5d25c8..f0abb92 100644
--- a/drivers/staging/unisys/uislib/uislib.c
+++ b/drivers/staging/unisys/uislib/uislib.c
@@ -1103,7 +1103,7 @@ info_debugfs_read_helper(char **buff, int *buff_len)
 	struct bus_info *bus;
 
 	if (PLINE("\nBuses:\n") < 0)
-		goto err_done;
+		return -1;
 
 	read_lock(&bus_list_lock);
 	for (bus = bus_list; bus; bus = bus->next) {
@@ -1134,23 +1134,22 @@ info_debugfs_read_helper(char **buff, int *buff_len)
 
 	if (PLINE("UisUtils_Registered_Services: %d\n",
 		  atomic_read(&uisutils_registered_services)) < 0)
-		goto err_done;
+		return -1;
 	if (PLINE("cycles_before_wait %llu wait_cycles:%llu\n",
 		  cycles_before_wait, wait_cycles) < 0)
-			goto err_done;
+			return -1;
 	if (PLINE("tot_wakeup_cnt %llu:tot_wait_cnt %llu:tot_schedule_cnt %llu\n",
 		  tot_wakeup_cnt, tot_wait_cnt, tot_schedule_cnt) < 0)
-			goto err_done;
+			return -1;
 	if (PLINE("en_smart_wakeup %d\n", en_smart_wakeup) < 0)
-			goto err_done;
+			return -1;
 	if (PLINE("tot_moved_to_tail_cnt %llu\n", tot_moved_to_tail_cnt) < 0)
-			goto err_done;
+			return -1;
 
 	return tot;
 
 err_done_unlock:
 	read_unlock(&bus_list_lock);
-err_done:
 	return -1;
 }
 
-- 
2.1.0

_______________________________________________
devel mailing list
devel@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel

[PATCH 23/30] staging: unisys: vbusdeviceinfo pragma

[Benjamin Romer]

From: Jeffrey Brown <Jeffrey.Brown@unisys.com>

Replaced pragma code in vbusdeviceinfo.h with __packed for the
struct ultra_vbus_deviceinfo

Signed-off-by: Jeffrey Brown <Jeffrey.Brown@unisys.com>
Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
---
 drivers/staging/unisys/common-spar/include/vbusdeviceinfo.h | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/drivers/staging/unisys/common-spar/include/vbusdeviceinfo.h b/drivers/staging/unisys/common-spar/include/vbusdeviceinfo.h
index 9b6d3e6..9a51f5f 100644
--- a/drivers/staging/unisys/common-spar/include/vbusdeviceinfo.h
+++ b/drivers/staging/unisys/common-spar/include/vbusdeviceinfo.h
@@ -18,8 +18,6 @@
 
 #include <linux/types.h>
 
-#pragma pack(push, 1)		/* both GCC and VC now allow this pragma */
-
 /* An array of this struct is present in the channel area for each vbus.
  * (See vbuschannel.h.)
  * It is filled in by the client side to provide info about the device
@@ -31,9 +29,7 @@ struct ultra_vbus_deviceinfo {
 	u8 infostrs[96];	/* sequence of tab-delimited id strings: */
 	/* <DRIVER_REV> <DRIVER_VERTAG> <DRIVER_COMPILETIME> */
 	u8 reserved[128];	/* pad size to 256 bytes */
-};
-
-#pragma pack(pop)
+} __packed;
 
 /* Reads chars from the buffer at <src> for <srcmax> bytes, and writes to
  * the buffer at <p>, which is <remain> bytes long, ensuring never to
-- 
2.1.0

_______________________________________________
devel mailing list
devel@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel

[PATCH 24/30] staging: unisys: vmcallintferace phys_info pragma

[Benjamin Romer]

From: Jeffrey Brown <Jeffrey.Brown@unisys.com>

Changed pragma code surrounding the struct phys_info with a
__packed statement

Signed-off-by: Jeffrey Brown <Jeffrey.Brown@unisys.com>
Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
---
 drivers/staging/unisys/common-spar/include/vmcallinterface.h | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/drivers/staging/unisys/common-spar/include/vmcallinterface.h b/drivers/staging/unisys/common-spar/include/vmcallinterface.h
index 7833371..3a2af50 100644
--- a/drivers/staging/unisys/common-spar/include/vmcallinterface.h
+++ b/drivers/staging/unisys/common-spar/include/vmcallinterface.h
@@ -96,17 +96,12 @@ do {									\
 
 /* Structures for IO VMCALLs */
 
-/* ///////////// BEGIN PRAGMA PACK PUSH 1 ///////////////////////// */
 /* ///////////// ONLY STRUCT TYPE SHOULD BE BELOW */
-#pragma pack(push, 1)
 struct phys_info {
 	u64 pi_pfn;
 	u16 pi_off;
 	u16 pi_len;
-};
-
-#pragma pack(pop)
-/* ///////////// END PRAGMA PACK PUSH 1 /////////////////////////// */
+} __packed;
 
 /* ///////////// BEGIN PRAGMA PACK PUSH 1 ///////////////////////// */
 /* ///////////// ONLY STRUCT TYPE SHOULD BE BELOW */
-- 
2.1.0

_______________________________________________
devel mailing list
devel@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel

[PATCH 25/30] staging: unisys: vmcall_io_controlvm_addr_params pragma

[Benjamin Romer]

From: Jeffrey Brown <Jeffrey.Brown@unisys.com>

Replaced pragma code for the struct vmcall_io_controlvm_addr_params
with __packed

Signed-off-by: Jeffrey Brown <Jeffrey.Brown@unisys.com>
Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
---
 drivers/staging/unisys/common-spar/include/vmcallinterface.h | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/drivers/staging/unisys/common-spar/include/vmcallinterface.h b/drivers/staging/unisys/common-spar/include/vmcallinterface.h
index 3a2af50..f076336 100644
--- a/drivers/staging/unisys/common-spar/include/vmcallinterface.h
+++ b/drivers/staging/unisys/common-spar/include/vmcallinterface.h
@@ -103,9 +103,7 @@ struct phys_info {
 	u16 pi_len;
 } __packed;
 
-/* ///////////// BEGIN PRAGMA PACK PUSH 1 ///////////////////////// */
 /* ///////////// ONLY STRUCT TYPE SHOULD BE BELOW */
-#pragma pack(push, 1)
 /* Parameters to VMCALL_IO_CONTROLVM_ADDR interface */
 struct vmcall_io_controlvm_addr_params {
 	    /* The Guest-relative physical address of the ControlVm channel.
@@ -115,10 +113,7 @@ struct vmcall_io_controlvm_addr_params {
 	    * in with the appropriate address. */
 	u32 channel_bytes;	/* contents provided by this VMCALL (OUT) */
 	u8 unused[4];		/* Unused Bytes in the 64-Bit Aligned Struct */
-};
-
-#pragma pack(pop)
-/* ///////////// END PRAGMA PACK PUSH 1 /////////////////////////// */
+} __packed;
 
 /* ///////////// BEGIN PRAGMA PACK PUSH 1 ///////////////////////// */
 /* ///////////// ONLY STRUCT TYPE SHOULD BE BELOW */
-- 
2.1.0

_______________________________________________
devel mailing list
devel@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel

[PATCH 26/30] staging: unisys: vmcall_io_diag_addr_params pragma

[Benjamin Romer]

From: Jeffrey Brown <Jeffrey.Brown@unisys.com>

Removed pragma code in vmacallinterface.h for the struct
vmcall_io_diag_addr_params, and put __packed in place of it

Signed-off-by: Jeffrey Brown <Jeffrey.Brown@unisys.com>
Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
---
 drivers/staging/unisys/common-spar/include/vmcallinterface.h | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/drivers/staging/unisys/common-spar/include/vmcallinterface.h b/drivers/staging/unisys/common-spar/include/vmcallinterface.h
index f076336..8373f80 100644
--- a/drivers/staging/unisys/common-spar/include/vmcallinterface.h
+++ b/drivers/staging/unisys/common-spar/include/vmcallinterface.h
@@ -115,18 +115,13 @@ struct vmcall_io_controlvm_addr_params {
 	u8 unused[4];		/* Unused Bytes in the 64-Bit Aligned Struct */
 } __packed;
 
-/* ///////////// BEGIN PRAGMA PACK PUSH 1 ///////////////////////// */
 /* ///////////// ONLY STRUCT TYPE SHOULD BE BELOW */
-#pragma pack(push, 1)
 /* Parameters to VMCALL_IO_DIAG_ADDR interface */
 struct vmcall_io_diag_addr_params {
 	    /* The Guest-relative physical address of the diagnostic channel.
 	    * This VMCall fills this in with the appropriate address. */
 	u64 address;	/* contents provided by this VMCALL (OUT) */
-};
-
-#pragma pack(pop)
-/* ///////////// END PRAGMA PACK PUSH 1 /////////////////////////// */
+} __packed;
 
 /* ///////////// BEGIN PRAGMA PACK PUSH 1 ///////////////////////// */
 /* ///////////// ONLY STRUCT TYPE SHOULD BE BELOW */
-- 
2.1.0

[PATCH 27/30] staging: unisys: vmcall_channel_version_mismatch

[Benjamin Romer]

From: Jeffrey Brown <Jeffrey.Brown@unisys.com>

Replaced "pragma pack(push, 1)" and "pragma pack(pop)" with
__packed

Signed-off-by: Jeffrey Brown <Jeffrey.Brown@unisys.com>
Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
---
 drivers/staging/unisys/common-spar/include/vmcallinterface.h | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/drivers/staging/unisys/common-spar/include/vmcallinterface.h b/drivers/staging/unisys/common-spar/include/vmcallinterface.h
index 8373f80..a6d9619 100644
--- a/drivers/staging/unisys/common-spar/include/vmcallinterface.h
+++ b/drivers/staging/unisys/common-spar/include/vmcallinterface.h
@@ -123,19 +123,14 @@ struct vmcall_io_diag_addr_params {
 	u64 address;	/* contents provided by this VMCALL (OUT) */
 } __packed;
 
-/* ///////////// BEGIN PRAGMA PACK PUSH 1 ///////////////////////// */
 /* ///////////// ONLY STRUCT TYPE SHOULD BE BELOW */
-#pragma pack(push, 1)
 /* Parameters to VMCALL_IO_VISORSERIAL_ADDR interface */
 struct vmcall_io_visorserial_addr_params {
 	    /* The Guest-relative physical address of the serial console
 	    * channel.  This VMCall fills this in with the appropriate
 	    * address. */
 	u64 address;	/* contents provided by this VMCALL (OUT) */
-};
-
-#pragma pack(pop)
-/* ///////////// END PRAGMA PACK PUSH 1 /////////////////////////// */
+} __packed;
 
 /* Parameters to VMCALL_CHANNEL_MISMATCH interface */
 struct vmcall_channel_version_mismatch_params {
-- 
2.1.0

_______________________________________________
devel mailing list
devel@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel

[PATCH 28/30] staging: unisys: channel.h pragma

[Benjamin Romer]

From: Jeffrey Brown <Jeffrey.Brown@unisys.com>

Replaced pragma code surrounding the structs signal_queue_header
and channel_header with __packed for both of them

Signed-off-by: Jeffrey Brown <Jeffrey.Brown@unisys.com>
Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
---
 drivers/staging/unisys/common-spar/include/channels/channel.h | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/drivers/staging/unisys/common-spar/include/channels/channel.h b/drivers/staging/unisys/common-spar/include/channels/channel.h
index 6fb6e5b..d3b01cb 100644
--- a/drivers/staging/unisys/common-spar/include/channels/channel.h
+++ b/drivers/staging/unisys/common-spar/include/channels/channel.h
@@ -187,7 +187,6 @@ ULTRA_CHANNELCLI_STRING(u32 v)
 #define ULTRA_IO_DRIVER_DISABLES_INTS (0x1ULL << 5)
 #define ULTRA_IO_DRIVER_SUPPORTS_ENHANCED_RCVBUF_CHECKING (0x1ULL << 6)
 
-#pragma pack(push, 1)		/* both GCC and VC now allow this pragma */
 /* Common Channel Header */
 struct channel_header {
 	u64 signature;		/* Signature */
@@ -227,7 +226,7 @@ struct channel_header {
 	u8 filler[1];		/* Pad out to 128 byte cacheline */
 	/* Please add all new single-byte values below here */
 	u8 recover_channel;
-};
+} __packed;
 
 #define ULTRA_CHANNEL_ENABLE_INTS (0x1ULL << 0)
 
@@ -265,9 +264,7 @@ struct signal_queue_header {
 				 * to denote trouble with client's
 				 * fields */
 	u8 filler[12];		/* Pad out to 64 byte cacheline */
-};
-
-#pragma pack(pop)
+} __packed;
 
 #define spar_signal_init(chan, QHDRFLD, QDATAFLD, QDATATYPE, ver, typ)	\
 	do {								\
-- 
2.1.0

_______________________________________________
devel mailing list
devel@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel

[PATCH 29/30] staging: unisys: iochannel.h pragma

[Benjamin Romer]

From: Jeffrey Brown <Jeffrey.Brown@unisys.com>

Replaced pragma code surrounding multiple structs at once with
__packed statements for each struct

Signed-off-by: Jeffrey Brown <Jeffrey.Brown@unisys.com>
Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
---
 .../common-spar/include/channels/iochannel.h       | 47 +++++++++-------------
 1 file changed, 18 insertions(+), 29 deletions(-)

diff --git a/drivers/staging/unisys/common-spar/include/channels/iochannel.h b/drivers/staging/unisys/common-spar/include/channels/iochannel.h
index eb7efe4..719422b 100644
--- a/drivers/staging/unisys/common-spar/include/channels/iochannel.h
+++ b/drivers/staging/unisys/common-spar/include/channels/iochannel.h
@@ -223,18 +223,10 @@ enum vdisk_mgmt_types {
 * NUMSIGNALS to prevent queue full deadlocks */
 #define MAX_NET_RCV_BUFS (MIN_NUMSIGNALS / 2)
 
-/*
- * structs with pragma pack  */
-
-/* ///////////// BEGIN PRAGMA PACK PUSH 1 ///////////////////////// */
-/* ///////////// ONLY STRUCT TYPE SHOULD BE BELOW */
-
-#pragma pack(push, 1)
-
 struct guest_phys_info {
 	u64 address;
 	u64 length;
-};
+} __packed;
 
 #define GPI_ENTRIES_PER_PAGE (PAGE_SIZE / sizeof(struct guest_phys_info))
 
@@ -242,12 +234,12 @@ struct uisscsi_dest {
 	u32 channel;		/* channel == bus number */
 	u32 id;			/* id == target number */
 	u32 lun;		/* lun == logical unit number */
-};
+} __packed;
 
 struct vhba_wwnn {
 	u32 wwnn1;
 	u32 wwnn2;
-};
+} __packed;
 
 /* WARNING: Values stired in this structure must contain maximum counts (not
  * maximum values). */
@@ -264,7 +256,7 @@ struct vhba_config_max {	/* 20 bytes */
 				 * bus */
 	/* max io size is often determined by the resource of the hba. e.g */
 	/* max scatter gather list length * page size / sector size */
-};
+} __packed;
 
 struct uiscmdrsp_scsi {
 	void *scsicmd;		/* the handle to the cmd that was received -
@@ -307,7 +299,7 @@ struct uiscmdrsp_scsi {
 	/* scsi.addlstat is 0 */
 	/* scsi.linuxstat is SAM_STAT_GOOD */
 	/* That is, there is NO error. */
-};
+} __packed;
 
 /*
 * Defines to support sending correct inquiry result when no disk is
@@ -425,7 +417,7 @@ struct sense_data {
 	u8 additional_sense_code_qualifier;
 	u8 fru_code;
 	u8 sense_key_specific[3];
-};
+} __packed;
 
 /* some SCSI ADSENSE codes */
 #ifndef SCSI_ADSENSE_LUN_NOT_READY
@@ -484,13 +476,13 @@ struct net_pkt_xmt {
 	     * guest memory to get to the header. uisnic needs ethhdr to
 	     * determine how to route the packet.
 	     */
-};
+} __packed;
 
 struct net_pkt_xmtdone {
 	u32 xmt_done_result;	/* result of NET_XMIT */
 #define XMIT_SUCCESS 0
 #define XMIT_FAILED 1
-};
+} __packed;
 
 /* RCVPOST_BUF_SIZe must be at most page_size(4096) - cache_line_size (64) The
 * reason is because dev_skb_alloc which is used to generate RCV_POST skbs in
@@ -511,7 +503,7 @@ struct net_pkt_rcvpost {
 	    u64 unique_num;		/* This is used to make sure that
 					 * receive posts are returned to  */
 	    /* the Adapter which sent them origonally. */
-};
+} __packed;
 
 struct net_pkt_rcv {
 	/* the number of receive buffers that can be chained  */
@@ -525,17 +517,17 @@ struct net_pkt_rcv {
 	/* NOTE: first rcvbuf in the chain will also be provided in net.buf. */
 	u64 unique_num;
 	u32 rcvs_dropped_delta;
-};
+} __packed;
 
 struct net_pkt_enbdis {
 	void *context;
 	u16 enable;		/* 1 = enable, 0 = disable */
-};
+} __packed;
 
 struct net_pkt_macaddr {
 	void *context;
 	u8 macaddr[MAX_MACADDR_LEN];	/* 6 bytes */
-};
+} __packed;
 
 /* cmd rsp packet used for VNIC network traffic  */
 struct uiscmdrsp_net {
@@ -552,7 +544,7 @@ struct uiscmdrsp_net {
 		/* and NET_CONNECT_STATUS */
 		struct net_pkt_macaddr macaddr;
 	};
-};
+} __packed;
 
 struct uiscmdrsp_scsitaskmgmt {
 	enum task_mgmt_types tasktype;
@@ -587,7 +579,7 @@ struct uiscmdrsp_scsitaskmgmt {
 	    /* result of taskmgmt command - set by IOPart - values are: */
 #define TASK_MGMT_FAILED  0
 #define TASK_MGMT_SUCCESS 1
-};
+} __packed;
 
 /* The following is used by uissd to send disk add/remove notifications to
  * Guest */
@@ -597,7 +589,7 @@ struct uiscmdrsp_disknotify {
 	void *v_hba;		/* Pointer to vhba_info for channel info to
 				 * route msg */
 	u32 channel, id, lun;	/* SCSI Path of Disk to added or removed */
-};
+} __packed;
 
 /* The following is used by virthba/vSCSI to send the Acquire/Release commands
 * to the IOVM.  */
@@ -634,7 +626,7 @@ struct uiscmdrsp_vdiskmgmt {
 	    /* result of taskmgmt command - set by IOPart - values are: */
 #define VDISK_MGMT_FAILED  0
 #define VDISK_MGMT_SUCCESS 1
-};
+} __packed;
 
 /* keeping cmd & rsp info in one structure for now cmd rsp packet for scsi */
 struct uiscmdrsp {
@@ -658,7 +650,7 @@ struct uiscmdrsp {
 	struct uiscmdrsp *next;	/* General Purpose Queue Link */
 	struct uiscmdrsp *activeQ_next;	/* Used to track active commands */
 	struct uiscmdrsp *activeQ_prev;	/* Used to track active commands  */
-};
+} __packed;
 
 /* This is just the header of the IO channel.  It is assumed that directly after
 * this header there is a large region of memory which contains the command and
@@ -683,10 +675,7 @@ struct spar_io_channel_protocol {
 #define MAX_CLIENTSTRING_LEN 1024
 	 u8 client_string[MAX_CLIENTSTRING_LEN];/* NULL terminated - so holds
 						 * max - 1 bytes */
-};
-
-#pragma pack(pop)
-/* ///////////// END PRAGMA PACK PUSH 1 /////////////////////////// */
+} __packed;
 
 /* define offsets to members of struct uiscmdrsp */
 #define OFFSET_CMDTYPE offsetof(struct uiscmdrsp, cmdtype)
-- 
2.1.0

_______________________________________________
devel mailing list
devel@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel

[PATCH 30/30] staging: unisys: vbuschannel.h pragma

[Benjamin Romer]

From: Jeffrey Brown <Jeffrey.Brown@unisys.com>

Replaced pragma statements that was surrounding the structs
spar_vbus_headerinfo and spar_vbus_channel_protocol with __packed

Signed-off-by: Jeffrey Brown <Jeffrey.Brown@unisys.com>
Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
---
 drivers/staging/unisys/common-spar/include/channels/vbuschannel.h | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/drivers/staging/unisys/common-spar/include/channels/vbuschannel.h b/drivers/staging/unisys/common-spar/include/channels/vbuschannel.h
index 2c42ce1..959f074 100644
--- a/drivers/staging/unisys/common-spar/include/channels/vbuschannel.h
+++ b/drivers/staging/unisys/common-spar/include/channels/vbuschannel.h
@@ -57,7 +57,6 @@ static const uuid_le spar_vbus_channel_protocol_uuid =
 				   sizeof(struct ultra_vbus_channel_protocol),\
 				   actual_bytes))
 
-#pragma pack(push, 1)		/* both GCC and VC now allow this pragma */
 struct spar_vbus_headerinfo {
 	u32 struct_bytes;	/* size of this struct in bytes */
 	u32 device_info_struct_bytes;	/* sizeof(ULTRA_VBUS_DEVICEINFO) */
@@ -70,7 +69,7 @@ struct spar_vbus_headerinfo {
 	u32 dev_info_offset;	/* byte offset from beginning of this struct */
 	/* to the DevInfo array (below) */
 	u8 reserved[104];
-};
+} __packed;
 
 struct spar_vbus_channel_protocol {
 	struct channel_header channel_header;	/* initialized by server */
@@ -82,13 +81,11 @@ struct spar_vbus_channel_protocol {
 	/* describes client bus device and driver */
 	struct ultra_vbus_deviceinfo dev_info[0];
 	/* describes client device and driver for each device on the bus */
-};
+} __packed;
 
 #define VBUS_CH_SIZE_EXACT(MAXDEVICES) \
 	(sizeof(ULTRA_VBUS_CHANNEL_PROTOCOL) + ((MAXDEVICES) * \
 						sizeof(ULTRA_VBUS_DEVICEINFO)))
 #define VBUS_CH_SIZE(MAXDEVICES) COVER(VBUS_CH_SIZE_EXACT(MAXDEVICES), 4096)
 
-#pragma pack(pop)
-
 #endif
-- 
2.1.0

_______________________________________________
devel mailing list
devel@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel

Re: [PATCH 01/30] staging: unisys: serverdown variable change bool to int virthba

[Dan Carpenter]

On Tue, Feb 10, 2015 at 12:58:35PM -0500, Benjamin Romer wrote:
> From: Erik Arfvidson <erik.arfvidson@unisys.com>
> 
> This patch changes serverdown variable to int instead of bool
> 

Why?  It looks like bool is more appropriate?

regards,
dan carpenter

Re: [PATCH 02/30] staging: unisys: change serverchangingstate variable bool to int

[Dan Carpenter]

On Tue, Feb 10, 2015 at 12:58:36PM -0500, Benjamin Romer wrote:
> From: Erik Arfvidson <erik.arfvidson@unisys.com>
> 
> This patch changes serverchangingstate variable from bool to int


serverchangingstate is a terriblevariablename.

regards,
dan carpenter

Re: [PATCH 01/30] staging: unisys: serverdown variable change bool to int virthba

[Romer, Benjamin M]

On Wed, 2015-02-11 at 11:36 +0300, Dan Carpenter wrote:
> On Tue, Feb 10, 2015 at 12:58:35PM -0500, Benjamin Romer wrote:
> > From: Erik Arfvidson <erik.arfvidson@unisys.com>
> > 
> > This patch changes serverdown variable to int instead of bool
> > 
> 
> Why?  It looks like bool is more appropriate?

Hi Dan,

We had received some comments on our code that said that our BOOL
typedef wasn't acceptable, and that we really ought to be returning 0
for success and error values in failure cases. By switching these to int
we're taking a first step towards that.

-- 
Ben Romer | Software Engineer |
Virtual Systems Development 

Unisys Corporation |  2476
Swedesford Rd |  Malvern, PA 19355
|  610-648-7140

Re: [PATCH 01/30] staging: unisys: serverdown variable change bool to int virthba

[Dan Carpenter]

On Wed, Feb 11, 2015 at 08:32:52AM -0600, Romer, Benjamin M wrote:
> On Wed, 2015-02-11 at 11:36 +0300, Dan Carpenter wrote:
> > On Tue, Feb 10, 2015 at 12:58:35PM -0500, Benjamin Romer wrote:
> > > From: Erik Arfvidson <erik.arfvidson@unisys.com>
> > > 
> > > This patch changes serverdown variable to int instead of bool
> > > 
> > 
> > Why?  It looks like bool is more appropriate?
> 
> Hi Dan,
> 
> We had received some comments on our code that said that our BOOL
> typedef wasn't acceptable,

Because we already have the "bool" type.

> and that we really ought to be returning 0
> for success and error values in failure cases. By switching these to int
> we're taking a first step towards that.

True, but I'm not sure if these patches help us do that generally, and
especially here we're changed a struct member and not a return type...

regards,
dan carpenter

_______________________________________________
devel mailing list
devel@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel

Re: [PATCH 01/30] staging: unisys: serverdown variable change bool to int virthba

[gregkh]

On Wed, Feb 11, 2015 at 05:41:13PM +0300, Dan Carpenter wrote:
> On Wed, Feb 11, 2015 at 08:32:52AM -0600, Romer, Benjamin M wrote:
> > On Wed, 2015-02-11 at 11:36 +0300, Dan Carpenter wrote:
> > > On Tue, Feb 10, 2015 at 12:58:35PM -0500, Benjamin Romer wrote:
> > > > From: Erik Arfvidson <erik.arfvidson@unisys.com>
> > > > 
> > > > This patch changes serverdown variable to int instead of bool
> > > > 
> > > 
> > > Why?  It looks like bool is more appropriate?
> > 
> > Hi Dan,
> > 
> > We had received some comments on our code that said that our BOOL
> > typedef wasn't acceptable,
> 
> Because we already have the "bool" type.

I agree with Dan here.  This is a bool type, so use it, only use int for
returning error values in functions, not for variables that really are
boolean values.

Can you respin this series with that change?

thanks,

greg k-h
_______________________________________________
devel mailing list
devel@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel

Re: [PATCH 02/30] staging: unisys: change serverchangingstate variable bool to int

[Greg KH]

On Tue, Feb 10, 2015 at 12:58:36PM -0500, Benjamin Romer wrote:
> From: Erik Arfvidson <erik.arfvidson@unisys.com>
> 
> This patch changes serverchangingstate variable from bool to int
> 
> Signed-off-by: Erik Arfvidson <erik.arfvidson@unisys.com>
> Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
> ---
>  drivers/staging/unisys/virthba/virthba.c | 12 ++++++------
>  1 file changed, 6 insertions(+), 6 deletions(-)
> 
> diff --git a/drivers/staging/unisys/virthba/virthba.c b/drivers/staging/unisys/virthba/virthba.c
> index 481fb57..4d4ad8b 100644
> --- a/drivers/staging/unisys/virthba/virthba.c
> +++ b/drivers/staging/unisys/virthba/virthba.c
> @@ -184,7 +184,7 @@ struct virthba_info {
>  					   free slot here */
>  	spinlock_t privlock;
>  	int serverdown;
> -	bool serverchangingstate;
> +	int serverchangingstate;


This too shouldn't need to be changed.

thanks,

greg k-h
_______________________________________________
devel mailing list
devel@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel

Re: [PATCH 03/30] staging: unisys: change bool to int variable found

[Greg KH]

On Tue, Feb 10, 2015 at 12:58:37PM -0500, Benjamin Romer wrote:
> From: Erik Arfvidson <erik.arfvidson@unisys.com>
> 
> this patch changes variable 'found' from bool to int
> 
> Signed-off-by: Erik Arfvidson <erik.arfvidson@unisys.com>
> Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
> ---
>  drivers/staging/unisys/virtpci/virtpci.c | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/staging/unisys/virtpci/virtpci.c b/drivers/staging/unisys/virtpci/virtpci.c
> index 8fdfd6f..d2d8151 100644
> --- a/drivers/staging/unisys/virtpci/virtpci.c
> +++ b/drivers/staging/unisys/virtpci/virtpci.c
> @@ -1074,7 +1074,7 @@ static int virtpci_device_serverdown(struct device *parentbus,
>  				     unsigned char macaddr[])
>  {
>  	int pausethisone = 0;
> -	bool found = false;
> +	int found = 0;

Same here, not needed.

thanks,

greg k-h
_______________________________________________
devel mailing list
devel@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel

Re: [PATCH 04/30] staging: unisys: change variable registered from bool to int

[Greg KH]

On Tue, Feb 10, 2015 at 12:58:38PM -0500, Benjamin Romer wrote:
> From: Erik Arfvidson <erik.arfvidson@unisys.com>
> 
> this patch changes variable registered from bool to int
> 
> Signed-off-by: Erik Arfvidson <erik.arfvidson@unisys.com>
> Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
> ---
>  drivers/staging/unisys/visorchipset/file.c | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/staging/unisys/visorchipset/file.c b/drivers/staging/unisys/visorchipset/file.c
> index e51fd4e..0e1bb93 100644
> --- a/drivers/staging/unisys/visorchipset/file.c
> +++ b/drivers/staging/unisys/visorchipset/file.c
> @@ -31,7 +31,7 @@
>  static struct cdev file_cdev;
>  static struct visorchannel **file_controlvm_channel;
>  static dev_t majordev = -1; /**< indicates major num for device */
> -static BOOL registered = FALSE;
> +static int registered;

Same here, just make this 'bool' and use true and false.

thanks,

greg k-h
_______________________________________________
devel mailing list
devel@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel

Re: [PATCH 05/30] staging: unisys: fix function visorchannel_signalremove from bool to int

[Greg KH]

On Tue, Feb 10, 2015 at 12:58:39PM -0500, Benjamin Romer wrote:
> From: Erik Arfvidson <erik.arfvidson@unisys.com>
> 
> this patch changes visorchannel_signalremove from bool to int. Also modified
> signalremove_inner since the return value was bool and change it to int.
> 
> Signed-off-by: Erik Arfvidson <erik.arfvidson@unisys.com>
> Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
> ---
>  drivers/staging/unisys/visorchannel/visorchannel.h     |  2 +-
>  .../staging/unisys/visorchannel/visorchannel_funcs.c   | 18 +++++++++---------
>  2 files changed, 10 insertions(+), 10 deletions(-)
> 
> diff --git a/drivers/staging/unisys/visorchannel/visorchannel.h b/drivers/staging/unisys/visorchannel/visorchannel.h
> index 63f1b97..5b4ff15 100644
> --- a/drivers/staging/unisys/visorchannel/visorchannel.h
> +++ b/drivers/staging/unisys/visorchannel/visorchannel.h
> @@ -52,7 +52,7 @@ int visorchannel_write(struct visorchannel *channel, ulong offset,
>  		       void *local, ulong nbytes);
>  int visorchannel_clear(struct visorchannel *channel, ulong offset,
>  		       u8 ch, ulong nbytes);
> -BOOL visorchannel_signalremove(struct visorchannel *channel, u32 queue,
> +int visorchannel_signalremove(struct visorchannel *channel, u32 queue,
>  			       void *msg);
>  BOOL visorchannel_signalinsert(struct visorchannel *channel, u32 queue,
>  			       void *msg);
> diff --git a/drivers/staging/unisys/visorchannel/visorchannel_funcs.c b/drivers/staging/unisys/visorchannel/visorchannel_funcs.c
> index 0188ef8..68befd6 100644
> --- a/drivers/staging/unisys/visorchannel/visorchannel_funcs.c
> +++ b/drivers/staging/unisys/visorchannel/visorchannel_funcs.c
> @@ -411,21 +411,21 @@ safe_sig_queue_validate(struct signal_queue_header *psafe_sqh,
>  	return 1;
>  }				/* end safe_sig_queue_validate */
>  
> -static BOOL
> +static int
>  signalremove_inner(struct visorchannel *channel, u32 queue, void *msg)

You also need to change the logic of the function that calls this,
right?

>  {
>  	struct signal_queue_header sig_hdr;
>  
>  	if (!sig_read_header(channel, queue, &sig_hdr)) {
> -		return FALSE;
> +		return 0;
>  	}
>  	if (sig_hdr.head == sig_hdr.tail)
> -		return FALSE;	/* no signals to remove */
> +		return 0;	/* no signals to remove */

"traditionally" 0 means "all went just fine, which is not what you are
meaning here.

So if you are going to move away from bool as a return type, do it
correctly, and fix up the callers as well.

I'll stop reviewing this series now.

thanks,

greg k-h
_______________________________________________
devel mailing list
devel@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel