From: Erik Arfvidson <erik.arfvidson@xxxxxxxxxx> This patch changes serverchangingstate variable from bool to int Signed-off-by: Erik Arfvidson <erik.arfvidson@xxxxxxxxxx> Signed-off-by: Benjamin Romer <benjamin.romer@xxxxxxxxxx> --- 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 _______________________________________________ devel mailing list devel@xxxxxxxxxxxxxxxxxxxxxx http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel