Commit a07d7c38 authored by Tim Sell's avatar Tim Sell Committed by Greg Kroah-Hartman

staging: unisys: visorbus: CHECK: Alignment should match open parenthesis

Fix 'CHECK: Alignment should match open parenthesis' as recommended by
checkpatch.
Signed-off-by: default avatarTim Sell <Timothy.Sell@unisys.com>
Signed-off-by: default avatarDavid Kershner <david.kershner@unisys.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent e4feb2f2
...@@ -530,10 +530,11 @@ static ssize_t toolaction_store(struct device *dev, ...@@ -530,10 +530,11 @@ static ssize_t toolaction_store(struct device *dev,
if (kstrtou8(buf, 10, &tool_action)) if (kstrtou8(buf, 10, &tool_action))
return -EINVAL; return -EINVAL;
ret = visorchannel_write(controlvm_channel, ret = visorchannel_write
offsetof(struct spar_controlvm_channel_protocol, (controlvm_channel,
tool_action), offsetof(struct spar_controlvm_channel_protocol,
&tool_action, sizeof(u8)); tool_action),
&tool_action, sizeof(u8));
if (ret) if (ret)
return ret; return ret;
...@@ -565,10 +566,11 @@ static ssize_t boottotool_store(struct device *dev, ...@@ -565,10 +566,11 @@ static ssize_t boottotool_store(struct device *dev,
return -EINVAL; return -EINVAL;
efi_spar_indication.boot_to_tool = val; efi_spar_indication.boot_to_tool = val;
ret = visorchannel_write(controlvm_channel, ret = visorchannel_write
offsetof(struct spar_controlvm_channel_protocol, (controlvm_channel,
efi_spar_ind), &(efi_spar_indication), offsetof(struct spar_controlvm_channel_protocol,
sizeof(struct efi_spar_indication)); efi_spar_ind), &(efi_spar_indication),
sizeof(struct efi_spar_indication));
if (ret) if (ret)
return ret; return ret;
...@@ -596,10 +598,11 @@ static ssize_t error_store(struct device *dev, struct device_attribute *attr, ...@@ -596,10 +598,11 @@ static ssize_t error_store(struct device *dev, struct device_attribute *attr,
if (kstrtou32(buf, 10, &error)) if (kstrtou32(buf, 10, &error))
return -EINVAL; return -EINVAL;
ret = visorchannel_write(controlvm_channel, ret = visorchannel_write
offsetof(struct spar_controlvm_channel_protocol, (controlvm_channel,
installation_error), offsetof(struct spar_controlvm_channel_protocol,
&error, sizeof(u32)); installation_error),
&error, sizeof(u32));
if (ret) if (ret)
return ret; return ret;
return count; return count;
...@@ -610,10 +613,11 @@ static ssize_t textid_show(struct device *dev, struct device_attribute *attr, ...@@ -610,10 +613,11 @@ static ssize_t textid_show(struct device *dev, struct device_attribute *attr,
{ {
u32 text_id; u32 text_id;
visorchannel_read(controlvm_channel, visorchannel_read
offsetof(struct spar_controlvm_channel_protocol, (controlvm_channel,
installation_text_id), offsetof(struct spar_controlvm_channel_protocol,
&text_id, sizeof(u32)); installation_text_id),
&text_id, sizeof(u32));
return scnprintf(buf, PAGE_SIZE, "%i\n", text_id); return scnprintf(buf, PAGE_SIZE, "%i\n", text_id);
} }
...@@ -626,10 +630,11 @@ static ssize_t textid_store(struct device *dev, struct device_attribute *attr, ...@@ -626,10 +630,11 @@ static ssize_t textid_store(struct device *dev, struct device_attribute *attr,
if (kstrtou32(buf, 10, &text_id)) if (kstrtou32(buf, 10, &text_id))
return -EINVAL; return -EINVAL;
ret = visorchannel_write(controlvm_channel, ret = visorchannel_write
offsetof(struct spar_controlvm_channel_protocol, (controlvm_channel,
installation_text_id), offsetof(struct spar_controlvm_channel_protocol,
&text_id, sizeof(u32)); installation_text_id),
&text_id, sizeof(u32));
if (ret) if (ret)
return ret; return ret;
return count; return count;
...@@ -657,10 +662,11 @@ static ssize_t remaining_steps_store(struct device *dev, ...@@ -657,10 +662,11 @@ static ssize_t remaining_steps_store(struct device *dev,
if (kstrtou16(buf, 10, &remaining_steps)) if (kstrtou16(buf, 10, &remaining_steps))
return -EINVAL; return -EINVAL;
ret = visorchannel_write(controlvm_channel, ret = visorchannel_write
offsetof(struct spar_controlvm_channel_protocol, (controlvm_channel,
installation_remaining_steps), offsetof(struct spar_controlvm_channel_protocol,
&remaining_steps, sizeof(u16)); installation_remaining_steps),
&remaining_steps, sizeof(u16));
if (ret) if (ret)
return ret; return ret;
return count; return count;
...@@ -1226,8 +1232,9 @@ bus_configure(struct controlvm_message *inmsg, ...@@ -1226,8 +1232,9 @@ bus_configure(struct controlvm_message *inmsg,
POSTCODE_SEVERITY_ERR); POSTCODE_SEVERITY_ERR);
rc = -CONTROLVM_RESP_ERROR_MESSAGE_ID_INVALID_FOR_CLIENT; rc = -CONTROLVM_RESP_ERROR_MESSAGE_ID_INVALID_FOR_CLIENT;
} else { } else {
visorchannel_set_clientpartition(bus_info->visorchannel, visorchannel_set_clientpartition
cmd->configure_bus.guest_handle); (bus_info->visorchannel,
cmd->configure_bus.guest_handle);
bus_info->partition_uuid = parser_id_get(parser_ctx); bus_info->partition_uuid = parser_id_get(parser_ctx);
parser_param_start(parser_ctx, PARSERSTRING_NAME); parser_param_start(parser_ctx, PARSERSTRING_NAME);
bus_info->name = parser_string_get(parser_ctx); bus_info->name = parser_string_get(parser_ctx);
...@@ -1709,9 +1716,10 @@ parahotplug_process_message(struct controlvm_message *inmsg) ...@@ -1709,9 +1716,10 @@ parahotplug_process_message(struct controlvm_message *inmsg)
* initialization. * initialization.
*/ */
parahotplug_request_kickoff(req); parahotplug_request_kickoff(req);
controlvm_respond_physdev_changestate(&inmsg->hdr, controlvm_respond_physdev_changestate
CONTROLVM_RESP_SUCCESS, (&inmsg->hdr,
inmsg->cmd.device_change_state.state); CONTROLVM_RESP_SUCCESS,
inmsg->cmd.device_change_state.state);
parahotplug_request_destroy(req); parahotplug_request_destroy(req);
} else { } else {
/* For disable messages, add the request to the /* For disable messages, add the request to the
...@@ -1823,8 +1831,9 @@ handle_command(struct controlvm_message inmsg, u64 channel_addr) ...@@ -1823,8 +1831,9 @@ handle_command(struct controlvm_message inmsg, u64 channel_addr)
break; break;
default: default:
if (inmsg.hdr.flags.response_expected) if (inmsg.hdr.flags.response_expected)
controlvm_respond(&inmsg.hdr, controlvm_respond
-CONTROLVM_RESP_ERROR_MESSAGE_ID_UNKNOWN); (&inmsg.hdr,
-CONTROLVM_RESP_ERROR_MESSAGE_ID_UNKNOWN);
break; break;
} }
...@@ -2177,10 +2186,11 @@ visorchipset_mmap(struct file *file, struct vm_area_struct *vma) ...@@ -2177,10 +2186,11 @@ visorchipset_mmap(struct file *file, struct vm_area_struct *vma)
if (!*file_controlvm_channel) if (!*file_controlvm_channel)
return -ENXIO; return -ENXIO;
visorchannel_read(*file_controlvm_channel, visorchannel_read
offsetof(struct spar_controlvm_channel_protocol, (*file_controlvm_channel,
gp_control_channel), offsetof(struct spar_controlvm_channel_protocol,
&addr, sizeof(addr)); gp_control_channel),
&addr, sizeof(addr));
if (!addr) if (!addr)
return -ENXIO; return -ENXIO;
......
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