staging: unisys: fix spacing in parahotplug_request_create
[firefly-linux-kernel-4.4.55.git] / drivers / staging / unisys / visorchipset / visorchipset_main.c
index 4e74799ade89949115d89dd02cf5da6a7ac15402..105683198af6e5c154d1762777cc23272988cae0 100644 (file)
@@ -791,7 +791,7 @@ bus_responder(enum controlvm_id cmd_id, ulong bus_no, int response)
 
        if (p->pending_msg_hdr.id == CONTROLVM_INVALID)
                return;         /* no controlvm response needed */
-       if (p->pending_msg_hdr.id != (u32) cmd_id)
+       if (p->pending_msg_hdr.id != (u32)cmd_id)
                return;
        controlvm_respond(&p->pending_msg_hdr, response);
        p->pending_msg_hdr.id = CONTROLVM_INVALID;
@@ -850,7 +850,7 @@ device_responder(enum controlvm_id cmd_id, ulong bus_no, ulong dev_no,
        if (p->pending_msg_hdr.id == CONTROLVM_INVALID)
                return;         /* no controlvm response needed */
 
-       if (p->pending_msg_hdr.id != (u32) cmd_id)
+       if (p->pending_msg_hdr.id != (u32)cmd_id)
                return;
 
        controlvm_respond(&p->pending_msg_hdr, response);
@@ -875,8 +875,9 @@ bus_epilog(u32 bus_no,
        if (need_response) {
                memcpy(&bus_info->pending_msg_hdr, msg_hdr,
                       sizeof(struct controlvm_message_header));
-       } else
+       } else {
                bus_info->pending_msg_hdr.id = CONTROLVM_INVALID;
+       }
 
        down(&notifier_lock);
        if (response == CONTROLVM_RESP_SUCCESS) {
@@ -951,8 +952,9 @@ device_epilog(u32 bus_no, u32 dev_no, struct spar_segment_state state, u32 cmd,
        if (need_response) {
                memcpy(&dev_info->pending_msg_hdr, msg_hdr,
                       sizeof(struct controlvm_message_header));
-       } else
+       } else {
                dev_info->pending_msg_hdr.id = CONTROLVM_INVALID;
+       }
 
        down(&notifier_lock);
        if (response >= 0) {
@@ -1026,50 +1028,49 @@ static void
 bus_create(struct controlvm_message *inmsg)
 {
        struct controlvm_message_packet *cmd = &inmsg->cmd;
-       ulong busNo = cmd->create_bus.bus_no;
+       ulong bus_no = cmd->create_bus.bus_no;
        int rc = CONTROLVM_RESP_SUCCESS;
-       struct visorchipset_bus_info *pBusInfo = NULL;
-
+       struct visorchipset_bus_info *bus_info = NULL;
 
-       pBusInfo = findbus(&bus_info_list, busNo);
-       if (pBusInfo && (pBusInfo->state.created == 1)) {
-               POSTCODE_LINUX_3(BUS_CREATE_FAILURE_PC, busNo,
+       bus_info = findbus(&bus_info_list, bus_no);
+       if (bus_info && (bus_info->state.created == 1)) {
+               POSTCODE_LINUX_3(BUS_CREATE_FAILURE_PC, bus_no,
                                 POSTCODE_SEVERITY_ERR);
                rc = -CONTROLVM_RESP_ERROR_ALREADY_DONE;
-               goto Away;
+               goto cleanup;
        }
-       pBusInfo = kzalloc(sizeof(struct visorchipset_bus_info), GFP_KERNEL);
-       if (!pBusInfo) {
-               POSTCODE_LINUX_3(BUS_CREATE_FAILURE_PC, busNo,
+       bus_info = kzalloc(sizeof(*bus_info), GFP_KERNEL);
+       if (!bus_info) {
+               POSTCODE_LINUX_3(BUS_CREATE_FAILURE_PC, bus_no,
                                 POSTCODE_SEVERITY_ERR);
                rc = -CONTROLVM_RESP_ERROR_KMALLOC_FAILED;
-               goto Away;
+               goto cleanup;
        }
 
-       INIT_LIST_HEAD(&pBusInfo->entry);
-       pBusInfo->bus_no = busNo;
-       pBusInfo->dev_no = cmd->create_bus.dev_count;
+       INIT_LIST_HEAD(&bus_info->entry);
+       bus_info->bus_no = bus_no;
+       bus_info->dev_no = cmd->create_bus.dev_count;
 
-       POSTCODE_LINUX_3(BUS_CREATE_ENTRY_PC, busNo, POSTCODE_SEVERITY_INFO);
+       POSTCODE_LINUX_3(BUS_CREATE_ENTRY_PC, bus_no, POSTCODE_SEVERITY_INFO);
 
        if (inmsg->hdr.flags.test_message == 1)
-               pBusInfo->chan_info.addr_type = ADDRTYPE_LOCALTEST;
+               bus_info->chan_info.addr_type = ADDRTYPE_LOCALTEST;
        else
-               pBusInfo->chan_info.addr_type = ADDRTYPE_LOCALPHYSICAL;
+               bus_info->chan_info.addr_type = ADDRTYPE_LOCALPHYSICAL;
 
-       pBusInfo->flags.server = inmsg->hdr.flags.server;
-       pBusInfo->chan_info.channel_addr = cmd->create_bus.channel_addr;
-       pBusInfo->chan_info.n_channel_bytes = cmd->create_bus.channel_bytes;
-       pBusInfo->chan_info.channel_type_uuid =
+       bus_info->flags.server = inmsg->hdr.flags.server;
+       bus_info->chan_info.channel_addr = cmd->create_bus.channel_addr;
+       bus_info->chan_info.n_channel_bytes = cmd->create_bus.channel_bytes;
+       bus_info->chan_info.channel_type_uuid =
                        cmd->create_bus.bus_data_type_uuid;
-       pBusInfo->chan_info.channel_inst_uuid = cmd->create_bus.bus_inst_uuid;
+       bus_info->chan_info.channel_inst_uuid = cmd->create_bus.bus_inst_uuid;
 
-       list_add(&pBusInfo->entry, &bus_info_list);
+       list_add(&bus_info->entry, &bus_info_list);
 
-       POSTCODE_LINUX_3(BUS_CREATE_EXIT_PC, busNo, POSTCODE_SEVERITY_INFO);
+       POSTCODE_LINUX_3(BUS_CREATE_EXIT_PC, bus_no, POSTCODE_SEVERITY_INFO);
 
-Away:
-       bus_epilog(busNo, CONTROLVM_BUS_CREATE, &inmsg->hdr,
+cleanup:
+       bus_epilog(bus_no, CONTROLVM_BUS_CREATE, &inmsg->hdr,
                   rc, inmsg->hdr.flags.response_expected == 1);
 }
 
@@ -1077,22 +1078,17 @@ static void
 bus_destroy(struct controlvm_message *inmsg)
 {
        struct controlvm_message_packet *cmd = &inmsg->cmd;
-       ulong busNo = cmd->destroy_bus.bus_no;
-       struct visorchipset_bus_info *pBusInfo;
+       ulong bus_no = cmd->destroy_bus.bus_no;
+       struct visorchipset_bus_info *bus_info;
        int rc = CONTROLVM_RESP_SUCCESS;
 
-       pBusInfo = findbus(&bus_info_list, busNo);
-       if (!pBusInfo) {
+       bus_info = findbus(&bus_info_list, bus_no);
+       if (!bus_info)
                rc = -CONTROLVM_RESP_ERROR_BUS_INVALID;
-               goto Away;
-       }
-       if (pBusInfo->state.created == 0) {
+       else if (bus_info->state.created == 0)
                rc = -CONTROLVM_RESP_ERROR_ALREADY_DONE;
-               goto Away;
-       }
 
-Away:
-       bus_epilog(busNo, CONTROLVM_BUS_DESTROY, &inmsg->hdr,
+       bus_epilog(bus_no, CONTROLVM_BUS_DESTROY, &inmsg->hdr,
                   rc, inmsg->hdr.flags.response_expected == 1);
 }
 
@@ -1101,44 +1097,39 @@ bus_configure(struct controlvm_message *inmsg,
              struct parser_context *parser_ctx)
 {
        struct controlvm_message_packet *cmd = &inmsg->cmd;
-       ulong busNo = cmd->configure_bus.bus_no;
-       struct visorchipset_bus_info *pBusInfo = NULL;
+       ulong bus_no = cmd->configure_bus.bus_no;
+       struct visorchipset_bus_info *bus_info = NULL;
        int rc = CONTROLVM_RESP_SUCCESS;
        char s[99];
 
-       busNo = cmd->configure_bus.bus_no;
-       POSTCODE_LINUX_3(BUS_CONFIGURE_ENTRY_PC, busNo, POSTCODE_SEVERITY_INFO);
+       bus_no = cmd->configure_bus.bus_no;
+       POSTCODE_LINUX_3(BUS_CONFIGURE_ENTRY_PC, bus_no,
+                        POSTCODE_SEVERITY_INFO);
 
-       pBusInfo = findbus(&bus_info_list, busNo);
-       if (!pBusInfo) {
-               POSTCODE_LINUX_3(BUS_CONFIGURE_FAILURE_PC, busNo,
+       bus_info = findbus(&bus_info_list, bus_no);
+       if (!bus_info) {
+               POSTCODE_LINUX_3(BUS_CONFIGURE_FAILURE_PC, bus_no,
                                 POSTCODE_SEVERITY_ERR);
                rc = -CONTROLVM_RESP_ERROR_BUS_INVALID;
-               goto Away;
-       }
-       if (pBusInfo->state.created == 0) {
-               POSTCODE_LINUX_3(BUS_CONFIGURE_FAILURE_PC, busNo,
+       } else if (bus_info->state.created == 0) {
+               POSTCODE_LINUX_3(BUS_CONFIGURE_FAILURE_PC, bus_no,
                                 POSTCODE_SEVERITY_ERR);
                rc = -CONTROLVM_RESP_ERROR_BUS_INVALID;
-               goto Away;
-       }
-       /* TBD - add this check to other commands also... */
-       if (pBusInfo->pending_msg_hdr.id != CONTROLVM_INVALID) {
-               POSTCODE_LINUX_3(BUS_CONFIGURE_FAILURE_PC, busNo,
+       } else if (bus_info->pending_msg_hdr.id != CONTROLVM_INVALID) {
+               POSTCODE_LINUX_3(BUS_CONFIGURE_FAILURE_PC, bus_no,
                                 POSTCODE_SEVERITY_ERR);
                rc = -CONTROLVM_RESP_ERROR_MESSAGE_ID_INVALID_FOR_CLIENT;
-               goto Away;
-       }
-
-       pBusInfo->partition_handle = cmd->configure_bus.guest_handle;
-       pBusInfo->partition_uuid = parser_id_get(parser_ctx);
-       parser_param_start(parser_ctx, PARSERSTRING_NAME);
-       pBusInfo->name = parser_string_get(parser_ctx);
+       } else {
+               bus_info->partition_handle = cmd->configure_bus.guest_handle;
+               bus_info->partition_uuid = parser_id_get(parser_ctx);
+               parser_param_start(parser_ctx, PARSERSTRING_NAME);
+               bus_info->name = parser_string_get(parser_ctx);
 
-       visorchannel_uuid_id(&pBusInfo->partition_uuid, s);
-       POSTCODE_LINUX_3(BUS_CONFIGURE_EXIT_PC, busNo, POSTCODE_SEVERITY_INFO);
-Away:
-       bus_epilog(busNo, CONTROLVM_BUS_CONFIGURE, &inmsg->hdr,
+               visorchannel_uuid_id(&bus_info->partition_uuid, s);
+               POSTCODE_LINUX_3(BUS_CONFIGURE_EXIT_PC, bus_no,
+                                POSTCODE_SEVERITY_INFO);
+       }
+       bus_epilog(bus_no, CONTROLVM_BUS_CONFIGURE, &inmsg->hdr,
                   rc, inmsg->hdr.flags.response_expected == 1);
 }
 
@@ -1146,128 +1137,121 @@ static void
 my_device_create(struct controlvm_message *inmsg)
 {
        struct controlvm_message_packet *cmd = &inmsg->cmd;
-       ulong busNo = cmd->create_device.bus_no;
-       ulong devNo = cmd->create_device.dev_no;
-       struct visorchipset_device_info *pDevInfo = NULL;
-       struct visorchipset_bus_info *pBusInfo = NULL;
+       ulong bus_no = cmd->create_device.bus_no;
+       ulong dev_no = cmd->create_device.dev_no;
+       struct visorchipset_device_info *dev_info = NULL;
+       struct visorchipset_bus_info *bus_info = NULL;
        int rc = CONTROLVM_RESP_SUCCESS;
 
-       pDevInfo = finddevice(&dev_info_list, busNo, devNo);
-       if (pDevInfo && (pDevInfo->state.created == 1)) {
-               POSTCODE_LINUX_4(DEVICE_CREATE_FAILURE_PC, devNo, busNo,
+       dev_info = finddevice(&dev_info_list, bus_no, dev_no);
+       if (dev_info && (dev_info->state.created == 1)) {
+               POSTCODE_LINUX_4(DEVICE_CREATE_FAILURE_PC, dev_no, bus_no,
                                 POSTCODE_SEVERITY_ERR);
                rc = -CONTROLVM_RESP_ERROR_ALREADY_DONE;
-               goto Away;
+               goto cleanup;
        }
-       pBusInfo = findbus(&bus_info_list, busNo);
-       if (!pBusInfo) {
-               POSTCODE_LINUX_4(DEVICE_CREATE_FAILURE_PC, devNo, busNo,
+       bus_info = findbus(&bus_info_list, bus_no);
+       if (!bus_info) {
+               POSTCODE_LINUX_4(DEVICE_CREATE_FAILURE_PC, dev_no, bus_no,
                                 POSTCODE_SEVERITY_ERR);
                rc = -CONTROLVM_RESP_ERROR_BUS_INVALID;
-               goto Away;
+               goto cleanup;
        }
-       if (pBusInfo->state.created == 0) {
-               POSTCODE_LINUX_4(DEVICE_CREATE_FAILURE_PC, devNo, busNo,
+       if (bus_info->state.created == 0) {
+               POSTCODE_LINUX_4(DEVICE_CREATE_FAILURE_PC, dev_no, bus_no,
                                 POSTCODE_SEVERITY_ERR);
                rc = -CONTROLVM_RESP_ERROR_BUS_INVALID;
-               goto Away;
+               goto cleanup;
        }
-       pDevInfo = kzalloc(sizeof(struct visorchipset_device_info), GFP_KERNEL);
-       if (!pDevInfo) {
-               POSTCODE_LINUX_4(DEVICE_CREATE_FAILURE_PC, devNo, busNo,
+       dev_info = kzalloc(sizeof(*dev_info), GFP_KERNEL);
+       if (!dev_info) {
+               POSTCODE_LINUX_4(DEVICE_CREATE_FAILURE_PC, dev_no, bus_no,
                                 POSTCODE_SEVERITY_ERR);
                rc = -CONTROLVM_RESP_ERROR_KMALLOC_FAILED;
-               goto Away;
+               goto cleanup;
        }
 
-       INIT_LIST_HEAD(&pDevInfo->entry);
-       pDevInfo->bus_no = busNo;
-       pDevInfo->dev_no = devNo;
-       pDevInfo->dev_inst_uuid = cmd->create_device.dev_inst_uuid;
-       POSTCODE_LINUX_4(DEVICE_CREATE_ENTRY_PC, devNo, busNo,
+       INIT_LIST_HEAD(&dev_info->entry);
+       dev_info->bus_no = bus_no;
+       dev_info->dev_no = dev_no;
+       dev_info->dev_inst_uuid = cmd->create_device.dev_inst_uuid;
+       POSTCODE_LINUX_4(DEVICE_CREATE_ENTRY_PC, dev_no, bus_no,
                         POSTCODE_SEVERITY_INFO);
 
        if (inmsg->hdr.flags.test_message == 1)
-               pDevInfo->chan_info.addr_type = ADDRTYPE_LOCALTEST;
+               dev_info->chan_info.addr_type = ADDRTYPE_LOCALTEST;
        else
-               pDevInfo->chan_info.addr_type = ADDRTYPE_LOCALPHYSICAL;
-       pDevInfo->chan_info.channel_addr = cmd->create_device.channel_addr;
-       pDevInfo->chan_info.n_channel_bytes = cmd->create_device.channel_bytes;
-       pDevInfo->chan_info.channel_type_uuid =
+               dev_info->chan_info.addr_type = ADDRTYPE_LOCALPHYSICAL;
+       dev_info->chan_info.channel_addr = cmd->create_device.channel_addr;
+       dev_info->chan_info.n_channel_bytes = cmd->create_device.channel_bytes;
+       dev_info->chan_info.channel_type_uuid =
                        cmd->create_device.data_type_uuid;
-       pDevInfo->chan_info.intr = cmd->create_device.intr;
-       list_add(&pDevInfo->entry, &dev_info_list);
-       POSTCODE_LINUX_4(DEVICE_CREATE_EXIT_PC, devNo, busNo,
+       dev_info->chan_info.intr = cmd->create_device.intr;
+       list_add(&dev_info->entry, &dev_info_list);
+       POSTCODE_LINUX_4(DEVICE_CREATE_EXIT_PC, dev_no, bus_no,
                         POSTCODE_SEVERITY_INFO);
-Away:
+cleanup:
        /* get the bus and devNo for DiagPool channel */
-       if (pDevInfo &&
-           is_diagpool_channel(pDevInfo->chan_info.channel_type_uuid)) {
-               g_diagpool_bus_no = busNo;
-               g_diagpool_dev_no = devNo;
+       if (dev_info &&
+           is_diagpool_channel(dev_info->chan_info.channel_type_uuid)) {
+               g_diagpool_bus_no = bus_no;
+               g_diagpool_dev_no = dev_no;
        }
-       device_epilog(busNo, devNo, segment_state_running,
+       device_epilog(bus_no, dev_no, segment_state_running,
                      CONTROLVM_DEVICE_CREATE, &inmsg->hdr, rc,
                      inmsg->hdr.flags.response_expected == 1,
-                     FOR_VISORBUS(pDevInfo->chan_info.channel_type_uuid));
+                     FOR_VISORBUS(dev_info->chan_info.channel_type_uuid));
 }
 
 static void
 my_device_changestate(struct controlvm_message *inmsg)
 {
        struct controlvm_message_packet *cmd = &inmsg->cmd;
-       ulong busNo = cmd->device_change_state.bus_no;
-       ulong devNo = cmd->device_change_state.dev_no;
+       ulong bus_no = cmd->device_change_state.bus_no;
+       ulong dev_no = cmd->device_change_state.dev_no;
        struct spar_segment_state state = cmd->device_change_state.state;
-       struct visorchipset_device_info *pDevInfo = NULL;
+       struct visorchipset_device_info *dev_info = NULL;
        int rc = CONTROLVM_RESP_SUCCESS;
 
-       pDevInfo = finddevice(&dev_info_list, busNo, devNo);
-       if (!pDevInfo) {
-               POSTCODE_LINUX_4(DEVICE_CHANGESTATE_FAILURE_PC, devNo, busNo,
+       dev_info = finddevice(&dev_info_list, bus_no, dev_no);
+       if (!dev_info) {
+               POSTCODE_LINUX_4(DEVICE_CHANGESTATE_FAILURE_PC, dev_no, bus_no,
                                 POSTCODE_SEVERITY_ERR);
                rc = -CONTROLVM_RESP_ERROR_DEVICE_INVALID;
-               goto Away;
-       }
-       if (pDevInfo->state.created == 0) {
-               POSTCODE_LINUX_4(DEVICE_CHANGESTATE_FAILURE_PC, devNo, busNo,
+       } else if (dev_info->state.created == 0) {
+               POSTCODE_LINUX_4(DEVICE_CHANGESTATE_FAILURE_PC, dev_no, bus_no,
                                 POSTCODE_SEVERITY_ERR);
                rc = -CONTROLVM_RESP_ERROR_DEVICE_INVALID;
        }
-Away:
-       if ((rc >= CONTROLVM_RESP_SUCCESS) && pDevInfo)
-               device_epilog(busNo, devNo, state, CONTROLVM_DEVICE_CHANGESTATE,
-                             &inmsg->hdr, rc,
+       if ((rc >= CONTROLVM_RESP_SUCCESS) && dev_info)
+               device_epilog(bus_no, dev_no, state,
+                             CONTROLVM_DEVICE_CHANGESTATE, &inmsg->hdr, rc,
                              inmsg->hdr.flags.response_expected == 1,
                              FOR_VISORBUS(
-                                       pDevInfo->chan_info.channel_type_uuid));
+                                       dev_info->chan_info.channel_type_uuid));
 }
 
 static void
 my_device_destroy(struct controlvm_message *inmsg)
 {
        struct controlvm_message_packet *cmd = &inmsg->cmd;
-       ulong busNo = cmd->destroy_device.bus_no;
-       ulong devNo = cmd->destroy_device.dev_no;
-       struct visorchipset_device_info *pDevInfo = NULL;
+       ulong bus_no = cmd->destroy_device.bus_no;
+       ulong dev_no = cmd->destroy_device.dev_no;
+       struct visorchipset_device_info *dev_info = NULL;
        int rc = CONTROLVM_RESP_SUCCESS;
 
-       pDevInfo = finddevice(&dev_info_list, busNo, devNo);
-       if (!pDevInfo) {
+       dev_info = finddevice(&dev_info_list, bus_no, dev_no);
+       if (!dev_info)
                rc = -CONTROLVM_RESP_ERROR_DEVICE_INVALID;
-               goto Away;
-       }
-       if (pDevInfo->state.created == 0) {
+       else if (dev_info->state.created == 0)
                rc = -CONTROLVM_RESP_ERROR_ALREADY_DONE;
-       }
 
-Away:
-       if ((rc >= CONTROLVM_RESP_SUCCESS) && pDevInfo)
-               device_epilog(busNo, devNo, segment_state_running,
+       if ((rc >= CONTROLVM_RESP_SUCCESS) && dev_info)
+               device_epilog(bus_no, dev_no, segment_state_running,
                              CONTROLVM_DEVICE_DESTROY, &inmsg->hdr, rc,
                              inmsg->hdr.flags.response_expected == 1,
                              FOR_VISORBUS(
-                                       pDevInfo->chan_info.channel_type_uuid));
+                                       dev_info->chan_info.channel_type_uuid));
 }
 
 /* When provided with the physical address of the controlvm channel
@@ -1285,26 +1269,26 @@ initialize_controlvm_payload_info(HOSTADDRESS phys_addr, u64 offset, u32 bytes,
 
        if (!info) {
                rc = -CONTROLVM_RESP_ERROR_PAYLOAD_INVALID;
-               goto Away;
+               goto cleanup;
        }
        memset(info, 0, sizeof(struct controlvm_payload_info));
        if ((offset == 0) || (bytes == 0)) {
                rc = -CONTROLVM_RESP_ERROR_PAYLOAD_INVALID;
-               goto Away;
+               goto cleanup;
        }
        payload = ioremap_cache(phys_addr + offset, bytes);
        if (!payload) {
                rc = -CONTROLVM_RESP_ERROR_IOREMAP_FAILED;
-               goto Away;
+               goto cleanup;
        }
 
        info->offset = offset;
        info->bytes = bytes;
        info->ptr = payload;
 
-Away:
+cleanup:
        if (rc < 0) {
-               if (payload != NULL) {
+               if (payload) {
                        iounmap(payload);
                        payload = NULL;
                }
@@ -1315,7 +1299,7 @@ Away:
 static void
 destroy_controlvm_payload_info(struct controlvm_payload_info *info)
 {
-       if (info->ptr != NULL) {
+       if (info->ptr) {
                iounmap(info->ptr);
                info->ptr = NULL;
        }
@@ -1326,13 +1310,13 @@ static void
 initialize_controlvm_payload(void)
 {
        HOSTADDRESS phys_addr = visorchannel_get_physaddr(controlvm_channel);
-       u64 payloadOffset = 0;
-       u32 payloadBytes = 0;
+       u64 payload_offset = 0;
+       u32 payload_bytes = 0;
 
        if (visorchannel_read(controlvm_channel,
                              offsetof(struct spar_controlvm_channel_protocol,
                                       request_payload_offset),
-                             &payloadOffset, sizeof(payloadOffset)) < 0) {
+                             &payload_offset, sizeof(payload_offset)) < 0) {
                POSTCODE_LINUX_2(CONTROLVM_INIT_FAILURE_PC,
                                 POSTCODE_SEVERITY_ERR);
                return;
@@ -1340,13 +1324,13 @@ initialize_controlvm_payload(void)
        if (visorchannel_read(controlvm_channel,
                              offsetof(struct spar_controlvm_channel_protocol,
                                       request_payload_bytes),
-                             &payloadBytes, sizeof(payloadBytes)) < 0) {
+                             &payload_bytes, sizeof(payload_bytes)) < 0) {
                POSTCODE_LINUX_2(CONTROLVM_INIT_FAILURE_PC,
                                 POSTCODE_SEVERITY_ERR);
                return;
        }
        initialize_controlvm_payload_info(phys_addr,
-                                         payloadOffset, payloadBytes,
+                                         payload_offset, payload_bytes,
                                          &controlvm_payload_info);
 }
 
@@ -1486,7 +1470,7 @@ parahotplug_request_create(struct controlvm_message *msg)
 {
        struct parahotplug_request *req;
 
-       req = kmalloc(sizeof(*req), GFP_KERNEL|__GFP_NORETRY);
+       req = kmalloc(sizeof(*req), GFP_KERNEL | __GFP_NORETRY);
        if (!req)
                return NULL;
 
@@ -1551,15 +1535,17 @@ parahotplug_process_list(void)
        list_for_each_safe(pos, tmp, &Parahotplug_request_list) {
                struct parahotplug_request *req =
                    list_entry(pos, struct parahotplug_request, list);
-               if (time_after_eq(jiffies, req->expiration)) {
-                       list_del(pos);
-                       if (req->msg.hdr.flags.response_expected)
-                               controlvm_respond_physdev_changestate(
-                                       &req->msg.hdr,
-                                       CONTROLVM_RESP_ERROR_DEVICE_UDEV_TIMEOUT,
-                                       req->msg.cmd.device_change_state.state);
-                       parahotplug_request_destroy(req);
-               }
+
+               if (!time_after_eq(jiffies, req->expiration))
+                       continue;
+
+               list_del(pos);
+               if (req->msg.hdr.flags.response_expected)
+                       controlvm_respond_physdev_changestate(
+                               &req->msg.hdr,
+                               CONTROLVM_RESP_ERROR_DEVICE_UDEV_TIMEOUT,
+                               req->msg.cmd.device_change_state.state);
+               parahotplug_request_destroy(req);
        }
 
        spin_unlock(&Parahotplug_request_list_lock);
@@ -1637,7 +1623,7 @@ parahotplug_process_message(struct controlvm_message *inmsg)
                * indicated it's done.
                */
                spin_lock(&Parahotplug_request_list_lock);
-               list_add_tail(&(req->list), &Parahotplug_request_list);
+               list_add_tail(&req->list, &Parahotplug_request_list);
                spin_unlock(&Parahotplug_request_list_lock);
 
                parahotplug_request_kickoff(req);
@@ -1813,8 +1799,9 @@ controlvm_periodic_work(struct work_struct *work)
                        inmsg = ControlVm_Pending_Msg;
                        ControlVm_Pending_Msg_Valid = FALSE;
                        gotACommand = TRUE;
-               } else
+               } else {
                        gotACommand = read_controlvm_event(&inmsg);
+               }
        }
 
        handle_command_failed = FALSE;
@@ -1936,18 +1923,18 @@ setup_crash_devices_work_queue(struct work_struct *work)
        }
 
        /* reuse IOVM create bus message */
-       if (localCrashCreateBusMsg.cmd.create_bus.channel_addr != 0)
+       if (localCrashCreateBusMsg.cmd.create_bus.channel_addr != 0) {
                bus_create(&localCrashCreateBusMsg);
-       else {
+       else {
                POSTCODE_LINUX_2(CRASH_DEV_BUS_NULL_FAILURE_PC,
                                 POSTCODE_SEVERITY_ERR);
                return;
        }
 
        /* reuse create device message for storage device */
-       if (localCrashCreateDevMsg.cmd.create_device.channel_addr != 0)
+       if (localCrashCreateDevMsg.cmd.create_device.channel_addr != 0) {
                my_device_create(&localCrashCreateDevMsg);
-       else {
+       else {
                POSTCODE_LINUX_2(CRASH_DEV_DEV_NULL_FAILURE_PC,
                                 POSTCODE_SEVERITY_ERR);
                return;