From: Jeffrey <jeffrey.br...@unisys.com>
Changed the camel case for Controlvm_channel to controlvm_channel
on line 105
Controlvm_channel => controlvm_channel
Signed-off-by: Jeffrey Brown <jeffrey.br...@unisys.com>
---
.../unisys/visorchipset/visorchipset_main.c | 78 +++++++++++-----------
1 file changed, 39 insertions(+), 39 deletions(-)
diff --git a/drivers/staging/unisys/visorchipset/visorchipset_main.c
b/drivers/staging/unisys/visorchipset/visorchipset_main.c
index 789904a..882834e 100644
--- a/drivers/staging/unisys/visorchipset/visorchipset_main.c
+++ b/drivers/staging/unisys/visorchipset/visorchipset_main.c
@@ -102,7 +102,7 @@ static struct controlvm_message_packet
g_devicechangestatepacket;
static LIST_HEAD(businfolist);
static LIST_HEAD(devinfolist);
-static VISORCHANNEL *ControlVm_channel;
+static VISORCHANNEL *controlvm_channel;
typedef struct {
u8 __iomem *ptr; /* pointer to base address of payload pool */
@@ -366,7 +366,7 @@ static ssize_t toolaction_show(struct device *dev,
{
u8 toolAction;
- visorchannel_read(ControlVm_channel,
+ visorchannel_read(controlvm_channel,
offsetof(struct spar_controlvm_channel_protocol,
tool_action), &toolAction, sizeof(u8));
return scnprintf(buf, PAGE_SIZE, "%u\n", toolAction);
@@ -382,7 +382,7 @@ static ssize_t toolaction_store(struct device *dev,
if (kstrtou8(buf, 10, &toolAction) != 0)
return -EINVAL;
- ret = visorchannel_write(ControlVm_channel,
+ ret = visorchannel_write(controlvm_channel,
offsetof(struct
spar_controlvm_channel_protocol,
tool_action),
&toolAction, sizeof(u8));
@@ -398,7 +398,7 @@ static ssize_t boottotool_show(struct device *dev,
{
struct efi_spar_indication efiSparIndication;
- visorchannel_read(ControlVm_channel,
+ visorchannel_read(controlvm_channel,
offsetof(struct spar_controlvm_channel_protocol,
efi_spar_ind), &efiSparIndication,
sizeof(struct efi_spar_indication));
@@ -417,7 +417,7 @@ static ssize_t boottotool_store(struct device *dev,
return -EINVAL;
efiSparIndication.boot_to_tool = val;
- ret = visorchannel_write(ControlVm_channel,
+ ret = visorchannel_write(controlvm_channel,
offsetof(struct
spar_controlvm_channel_protocol,
efi_spar_ind), &(efiSparIndication),
sizeof(struct efi_spar_indication));
@@ -432,7 +432,7 @@ static ssize_t error_show(struct device *dev, struct
device_attribute *attr,
{
u32 error;
- visorchannel_read(ControlVm_channel,
+ visorchannel_read(controlvm_channel,
offsetof(struct spar_controlvm_channel_protocol,
installation_error), &error, sizeof(u32));
return scnprintf(buf, PAGE_SIZE, "%i\n", error);
@@ -447,7 +447,7 @@ static ssize_t error_store(struct device *dev, struct
device_attribute *attr,
if (kstrtou32(buf, 10, &error) != 0)
return -EINVAL;
- ret = visorchannel_write(ControlVm_channel,
+ ret = visorchannel_write(controlvm_channel,
offsetof(struct
spar_controlvm_channel_protocol,
installation_error),
&error, sizeof(u32));
@@ -461,7 +461,7 @@ static ssize_t textid_show(struct device *dev, struct
device_attribute *attr,
{
u32 textId;
- visorchannel_read(ControlVm_channel, offsetof(
+ visorchannel_read(controlvm_channel, offsetof(
struct spar_controlvm_channel_protocol, installation_text_id),
&textId, sizeof(u32));
return scnprintf(buf, PAGE_SIZE, "%i\n", textId);
@@ -476,7 +476,7 @@ static ssize_t textid_store(struct device *dev, struct
device_attribute *attr,
if (kstrtou32(buf, 10, &textId) != 0)
return -EINVAL;
- ret = visorchannel_write(ControlVm_channel,
+ ret = visorchannel_write(controlvm_channel,
offsetof(struct
spar_controlvm_channel_protocol,
installation_text_id),
&textId, sizeof(u32));
@@ -490,7 +490,7 @@ static ssize_t remaining_steps_show(struct device *dev,
{
u16 remainingSteps;
- visorchannel_read(ControlVm_channel,
+ visorchannel_read(controlvm_channel,
offsetof(struct spar_controlvm_channel_protocol,
installation_remaining_steps),
&remainingSteps, sizeof(u16));
@@ -507,7 +507,7 @@ static ssize_t remaining_steps_store(struct device *dev,
if (kstrtou16(buf, 10, &remainingSteps) != 0)
return -EINVAL;
- ret = visorchannel_write(ControlVm_channel,
+ ret = visorchannel_write(controlvm_channel,
offsetof(struct
spar_controlvm_channel_protocol,
installation_remaining_steps),
&remainingSteps, sizeof(u16));
@@ -729,7 +729,7 @@ controlvm_respond(struct controlvm_message_header *msgHdr,
int response)
__func__, outmsg.hdr.id, response);
return;
}
- if (!visorchannel_signalinsert(ControlVm_channel,
+ if (!visorchannel_signalinsert(controlvm_channel,
CONTROLVM_QUEUE_REQUEST, &outmsg)) {
LOGERR("signalinsert failed!");
return;
@@ -745,7 +745,7 @@ controlvm_respond_chipset_init(struct
controlvm_message_header *msgHdr,
controlvm_init_response(&outmsg, msgHdr, response);
outmsg.cmd.init_chipset.features = features;
- if (!visorchannel_signalinsert(ControlVm_channel,
+ if (!visorchannel_signalinsert(controlvm_channel,
CONTROLVM_QUEUE_REQUEST, &outmsg)) {
LOGERR("signalinsert failed!");
return;
@@ -761,7 +761,7 @@ static void controlvm_respond_physdev_changestate(
controlvm_init_response(&outmsg, msgHdr, response);
outmsg.cmd.device_change_state.state = state;
outmsg.cmd.device_change_state.flags.phys_device = 1;
- if (!visorchannel_signalinsert(ControlVm_channel,
+ if (!visorchannel_signalinsert(controlvm_channel,
CONTROLVM_QUEUE_REQUEST, &outmsg)) {
LOGERR("signalinsert failed!");
return;
@@ -776,7 +776,7 @@ visorchipset_save_message(struct controlvm_message *msg,
u16 localSavedCrashMsgCount;
/* get saved message count */
- if (visorchannel_read(ControlVm_channel,
+ if (visorchannel_read(controlvm_channel,
offsetof(struct spar_controlvm_channel_protocol,
saved_crash_message_count),
&localSavedCrashMsgCount, sizeof(u16)) < 0) {
@@ -796,7 +796,7 @@ visorchipset_save_message(struct controlvm_message *msg,
}
/* get saved crash message offset */
- if (visorchannel_read(ControlVm_channel,
+ if (visorchannel_read(controlvm_channel,
offsetof(struct spar_controlvm_channel_protocol,
saved_crash_message_offset),
&localSavedCrashMsgOffset, sizeof(u32)) < 0) {
@@ -807,7 +807,7 @@ visorchipset_save_message(struct controlvm_message *msg,
}
if (type == CRASH_BUS) {
- if (visorchannel_write(ControlVm_channel,
+ if (visorchannel_write(controlvm_channel,
localSavedCrashMsgOffset,
msg,
sizeof(struct controlvm_message)) < 0) {
@@ -817,7 +817,7 @@ visorchipset_save_message(struct controlvm_message *msg,
return;
}
} else {
- if (visorchannel_write(ControlVm_channel,
+ if (visorchannel_write(controlvm_channel,
localSavedCrashMsgOffset +
sizeof(struct controlvm_message), msg,
sizeof(struct controlvm_message)) < 0) {
@@ -897,7 +897,7 @@ device_changestate_responder(enum controlvm_id cmdId,
outmsg.cmd.device_change_state.dev_no = devNo;
outmsg.cmd.device_change_state.state = responseState;
- if (!visorchannel_signalinsert(ControlVm_channel,
+ if (!visorchannel_signalinsert(controlvm_channel,
CONTROLVM_QUEUE_REQUEST, &outmsg)) {
LOGERR("signalinsert failed!");
return;
@@ -1445,11 +1445,11 @@ destroy_controlvm_payload_info(CONTROLVM_PAYLOAD_INFO
*info)
static void
initialize_controlvm_payload(void)
{
- HOSTADDRESS phys_addr = visorchannel_get_physaddr(ControlVm_channel);
+ HOSTADDRESS phys_addr = visorchannel_get_physaddr(controlvm_channel);
u64 payloadOffset = 0;
u32 payloadBytes = 0;
- if (visorchannel_read(ControlVm_channel,
+ if (visorchannel_read(controlvm_channel,
offsetof(struct spar_controlvm_channel_protocol,
request_payload_offset),
&payloadOffset, sizeof(payloadOffset)) < 0) {
@@ -1458,7 +1458,7 @@ initialize_controlvm_payload(void)
POSTCODE_SEVERITY_ERR);
return;
}
- if (visorchannel_read(ControlVm_channel,
+ if (visorchannel_read(controlvm_channel,
offsetof(struct spar_controlvm_channel_protocol,
request_payload_bytes),
&payloadBytes, sizeof(payloadBytes)) < 0) {
@@ -1553,7 +1553,7 @@ chipset_notready(struct controlvm_message_header *msgHdr)
static BOOL
read_controlvm_event(struct controlvm_message *msg)
{
- if (visorchannel_signalremove(ControlVm_channel,
+ if (visorchannel_signalremove(controlvm_channel,
CONTROLVM_QUEUE_EVENT, msg)) {
/* got a message */
if (msg->hdr.flags.test_message == 1) {
@@ -1836,9 +1836,9 @@ handle_command(struct controlvm_message inmsg,
HOSTADDRESS channel_addr)
if (!isLocalAddr) {
controlvm_init_response(&ackmsg, &inmsg.hdr,
CONTROLVM_RESP_SUCCESS);
- if ((ControlVm_channel) &&
+ if ((controlvm_channel) &&
(!visorchannel_signalinsert
- (ControlVm_channel, CONTROLVM_QUEUE_ACK, &ackmsg)))
+ (controlvm_channel, CONTROLVM_QUEUE_ACK, &ackmsg)))
LOGWRN("failed to send ACK failed");
}
switch (inmsg.hdr.id) {
@@ -1983,7 +1983,7 @@ controlvm_periodic_work(struct work_struct *work)
}
}
- while (visorchannel_signalremove(ControlVm_channel,
+ while (visorchannel_signalremove(controlvm_channel,
CONTROLVM_QUEUE_RESPONSE,
&inmsg)) {
if (inmsg.hdr.payload_max_bytes != 0) {
@@ -2012,7 +2012,7 @@ controlvm_periodic_work(struct work_struct *work)
most_recent_message_jiffies = jiffies;
if (handle_command(inmsg,
visorchannel_get_physaddr
- (ControlVm_channel)))
+ (controlvm_channel)))
gotACommand = read_controlvm_event(&inmsg);
else {
/* this is a scenario where throttling
@@ -2082,7 +2082,7 @@ setup_crash_devices_work_queue(struct work_struct *work)
chipset_init(&msg);
/* get saved message count */
- if (visorchannel_read(ControlVm_channel,
+ if (visorchannel_read(controlvm_channel,
offsetof(struct spar_controlvm_channel_protocol,
saved_crash_message_count),
&localSavedCrashMsgCount, sizeof(u16)) < 0) {
@@ -2102,7 +2102,7 @@ setup_crash_devices_work_queue(struct work_struct *work)
}
/* get saved crash message offset */
- if (visorchannel_read(ControlVm_channel,
+ if (visorchannel_read(controlvm_channel,
offsetof(struct spar_controlvm_channel_protocol,
saved_crash_message_offset),
&localSavedCrashMsgOffset, sizeof(u32)) < 0) {
@@ -2113,7 +2113,7 @@ setup_crash_devices_work_queue(struct work_struct *work)
}
/* read create device message for storage bus offset */
- if (visorchannel_read(ControlVm_channel,
+ if (visorchannel_read(controlvm_channel,
localSavedCrashMsgOffset,
&localCrashCreateBusMsg,
sizeof(struct controlvm_message)) < 0) {
@@ -2124,7 +2124,7 @@ setup_crash_devices_work_queue(struct work_struct *work)
}
/* read create device message for storage device */
- if (visorchannel_read(ControlVm_channel,
+ if (visorchannel_read(controlvm_channel,
localSavedCrashMsgOffset +
sizeof(struct controlvm_message),
&localCrashCreateDevMsg,
@@ -2400,20 +2400,20 @@ visorchipset_init(void)
addr = controlvm_get_channel_address();
if (addr != 0) {
- ControlVm_channel =
+ controlvm_channel =
visorchannel_create_with_lock
(addr,
sizeof(struct spar_controlvm_channel_protocol),
spar_controlvm_channel_protocol_uuid);
if (SPAR_CONTROLVM_CHANNEL_OK_CLIENT(
- visorchannel_get_header(ControlVm_channel))) {
+ visorchannel_get_header(controlvm_channel))) {
LOGINF("Channel %s (ControlVm) discovered",
- visorchannel_id(ControlVm_channel, s));
+ visorchannel_id(controlvm_channel, s));
initialize_controlvm_payload();
} else {
LOGERR("controlvm channel is invalid");
- visorchannel_destroy(ControlVm_channel);
- ControlVm_channel = NULL;
+ visorchannel_destroy(controlvm_channel);
+ controlvm_channel = NULL;
return -ENODEV;
}
} else {
@@ -2422,7 +2422,7 @@ visorchipset_init(void)
}
MajorDev = MKDEV(visorchipset_major, 0);
- rc = visorchipset_file_init(MajorDev, &ControlVm_channel);
+ rc = visorchipset_file_init(MajorDev, &controlvm_channel);
if (rc < 0) {
ERRDRV("visorchipset_file_init(MajorDev, &ControlVm_channel):
error (status=%d)\n", rc);
POSTCODE_LINUX_2(CHIPSET_INIT_FAILURE_PC, DIAG_SEVERITY_ERR);
@@ -2528,8 +2528,8 @@ visorchipset_exit(void)
memset(&g_deldumpmsghdr, 0, sizeof(struct controlvm_message_header));
LOGINF("Channel %s (ControlVm) disconnected",
- visorchannel_id(ControlVm_channel, s));
- visorchannel_destroy(ControlVm_channel);
+ visorchannel_id(controlvm_channel, s));
+ visorchannel_destroy(controlvm_channel);
visorchipset_file_cleanup();
POSTCODE_LINUX_2(DRIVER_EXIT_PC, POSTCODE_SEVERITY_INFO);
--
1.8.4
_______________________________________________
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
