staging: unisys: fix checkpatch warnings

This fixes "braces {} are not necessary for single statement blocks" in uislib.

Signed-off-by: Michel von Czettritz <michel.von.czettritz@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/unisys/uislib/uislib.c b/drivers/staging/unisys/uislib/uislib.c
index 4318f06f6e7e415af3df97faa1424198e05acde2..d23e0df16b011ffe8e8857891a4004d91f45e56c 100644 (file)
--- a/drivers/staging/unisys/uislib/uislib.c
+++ b/drivers/staging/unisys/uislib/uislib.c
@@ -534,9 +534,8 @@ static int pause_device(struct controlvm_message *msg)
                } else {
                        return CONTROLVM_RESP_ERROR_CHANNEL_TYPE_UNKNOWN;
                }
-               if (!virt_control_chan_func) {
+               if (!virt_control_chan_func)
                        return CONTROLVM_RESP_ERROR_VIRTPCI_DRIVER_FAILURE;
-               }
                if (!virt_control_chan_func(&cmd)) {
                        return
                          CONTROLVM_RESP_ERROR_VIRTPCI_DRIVER_CALLBACK_ERROR;
@@ -593,9 +592,8 @@ static int resume_device(struct controlvm_message *msg)
                } else {
                        return CONTROLVM_RESP_ERROR_CHANNEL_TYPE_UNKNOWN;
                }
-               if (!virt_control_chan_func) {
+               if (!virt_control_chan_func)
                        return CONTROLVM_RESP_ERROR_VIRTPCI_DRIVER_FAILURE;
-               }
                if (!virt_control_chan_func(&cmd)) {
                        return
                          CONTROLVM_RESP_ERROR_VIRTPCI_DRIVER_CALLBACK_ERROR;
@@ -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
  * kernel paging request"
  */
-               if (dev->polling) {
+               if (dev->polling)
                        uislib_disable_channel_interrupts(bus_no, dev_no);
-               }
                /* unmap the channel memory for the device. */
-               if (!msg->hdr.flags.test_message) {
+               if (!msg->hdr.flags.test_message)
                        uislib_iounmap(dev->chanptr);
-               }
                kfree(dev);
                bus->device[dev_no] = NULL;
        }
@@ -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.state = segment_state_standby;
        rc = pause_device(&msg);
-       if (rc != CONTROLVM_RESP_SUCCESS) {
+       if (rc != CONTROLVM_RESP_SUCCESS)
                return -1;
-       }
        return 0;
 }
 EXPORT_SYMBOL_GPL(uislib_client_inject_pause_vnic);
@@ -1195,9 +1190,8 @@ static int process_incoming(void *v)
                */
                if (kthread_should_stop())
                        break;
-               if (en_smart_wakeup == 0xFF) {
+               if (en_smart_wakeup == 0xFF)
                        break;
-               }
                /* wait for POLLJIFFIES_NORMAL jiffies, or until
                * someone wakes up poll_dev_wake_q,
                * whichever comes first only do a wait when we have

diff --git a/drivers/staging/unisys/uislib/uisthread.c b/drivers/staging/unisys/uislib/uisthread.c
index bbe2a23784a5fd379dd7e10c0dee18def7d8e6d3..d3c973b617ee7fe1de8da632779e6ad7d97294bf 100644 (file)
--- a/drivers/staging/unisys/uislib/uisthread.c
+++ b/drivers/staging/unisys/uislib/uisthread.c
@@ -63,8 +63,7 @@ uisthread_stop(struct uisthread_info *thrinfo)
        if (wait_for_completion_timeout(&thrinfo->has_stopped, 60 * HZ))
                stopped = 1;
 
-       if (stopped) {
+       if (stopped)
                thrinfo->id = 0;
-       }
 }
 EXPORT_SYMBOL_GPL(uisthread_stop);