Commit 549fb6e3 authored by Michel von Czettritz's avatar Michel von Czettritz Committed by Greg Kroah-Hartman

staging: unisys: fix checkpatch warnings

This fixes "braces {} are not necessary for single statement blocks" in uislib.
Signed-off-by: default avatarMichel von Czettritz <michel.von.czettritz@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 4c42d979
...@@ -534,9 +534,8 @@ static int pause_device(struct controlvm_message *msg) ...@@ -534,9 +534,8 @@ static int pause_device(struct controlvm_message *msg)
} else { } else {
return CONTROLVM_RESP_ERROR_CHANNEL_TYPE_UNKNOWN; return CONTROLVM_RESP_ERROR_CHANNEL_TYPE_UNKNOWN;
} }
if (!virt_control_chan_func) { if (!virt_control_chan_func)
return CONTROLVM_RESP_ERROR_VIRTPCI_DRIVER_FAILURE; return CONTROLVM_RESP_ERROR_VIRTPCI_DRIVER_FAILURE;
}
if (!virt_control_chan_func(&cmd)) { if (!virt_control_chan_func(&cmd)) {
return return
CONTROLVM_RESP_ERROR_VIRTPCI_DRIVER_CALLBACK_ERROR; CONTROLVM_RESP_ERROR_VIRTPCI_DRIVER_CALLBACK_ERROR;
...@@ -593,9 +592,8 @@ static int resume_device(struct controlvm_message *msg) ...@@ -593,9 +592,8 @@ static int resume_device(struct controlvm_message *msg)
} else { } else {
return CONTROLVM_RESP_ERROR_CHANNEL_TYPE_UNKNOWN; return CONTROLVM_RESP_ERROR_CHANNEL_TYPE_UNKNOWN;
} }
if (!virt_control_chan_func) { if (!virt_control_chan_func)
return CONTROLVM_RESP_ERROR_VIRTPCI_DRIVER_FAILURE; return CONTROLVM_RESP_ERROR_VIRTPCI_DRIVER_FAILURE;
}
if (!virt_control_chan_func(&cmd)) { if (!virt_control_chan_func(&cmd)) {
return return
CONTROLVM_RESP_ERROR_VIRTPCI_DRIVER_CALLBACK_ERROR; CONTROLVM_RESP_ERROR_VIRTPCI_DRIVER_CALLBACK_ERROR;
...@@ -665,13 +663,11 @@ static int destroy_device(struct controlvm_message *msg, char *buf) ...@@ -665,13 +663,11 @@ static int destroy_device(struct controlvm_message *msg, char *buf)
* on which accesses the channel and you will get a "unable to handle * on which accesses the channel and you will get a "unable to handle
* kernel paging request" * kernel paging request"
*/ */
if (dev->polling) { if (dev->polling)
uislib_disable_channel_interrupts(bus_no, dev_no); uislib_disable_channel_interrupts(bus_no, dev_no);
}
/* unmap the channel memory for the device. */ /* unmap the channel memory for the device. */
if (!msg->hdr.flags.test_message) { if (!msg->hdr.flags.test_message)
uislib_iounmap(dev->chanptr); uislib_iounmap(dev->chanptr);
}
kfree(dev); kfree(dev);
bus->device[dev_no] = NULL; bus->device[dev_no] = NULL;
} }
...@@ -928,9 +924,8 @@ uislib_client_inject_pause_vnic(u32 bus_no, u32 dev_no) ...@@ -928,9 +924,8 @@ uislib_client_inject_pause_vnic(u32 bus_no, u32 dev_no)
msg.cmd.device_change_state.dev_no = dev_no; msg.cmd.device_change_state.dev_no = dev_no;
msg.cmd.device_change_state.state = segment_state_standby; msg.cmd.device_change_state.state = segment_state_standby;
rc = pause_device(&msg); rc = pause_device(&msg);
if (rc != CONTROLVM_RESP_SUCCESS) { if (rc != CONTROLVM_RESP_SUCCESS)
return -1; return -1;
}
return 0; return 0;
} }
EXPORT_SYMBOL_GPL(uislib_client_inject_pause_vnic); EXPORT_SYMBOL_GPL(uislib_client_inject_pause_vnic);
...@@ -1195,9 +1190,8 @@ static int process_incoming(void *v) ...@@ -1195,9 +1190,8 @@ static int process_incoming(void *v)
*/ */
if (kthread_should_stop()) if (kthread_should_stop())
break; break;
if (en_smart_wakeup == 0xFF) { if (en_smart_wakeup == 0xFF)
break; break;
}
/* wait for POLLJIFFIES_NORMAL jiffies, or until /* wait for POLLJIFFIES_NORMAL jiffies, or until
* someone wakes up poll_dev_wake_q, * someone wakes up poll_dev_wake_q,
* whichever comes first only do a wait when we have * whichever comes first only do a wait when we have
......
...@@ -63,8 +63,7 @@ uisthread_stop(struct uisthread_info *thrinfo) ...@@ -63,8 +63,7 @@ uisthread_stop(struct uisthread_info *thrinfo)
if (wait_for_completion_timeout(&thrinfo->has_stopped, 60 * HZ)) if (wait_for_completion_timeout(&thrinfo->has_stopped, 60 * HZ))
stopped = 1; stopped = 1;
if (stopped) { if (stopped)
thrinfo->id = 0; thrinfo->id = 0;
}
} }
EXPORT_SYMBOL_GPL(uisthread_stop); EXPORT_SYMBOL_GPL(uisthread_stop);
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment