Commit e22a4a0f authored by Benjamin Romer's avatar Benjamin Romer Committed by Greg Kroah-Hartman

staging: unisys: remove generally useless elses from visorchipset_main.c

There are several else clauses that aren't necessary listed by checkpatch.pl in
visorchipset_main.c. Remove these.
Signed-off-by: default avatarBenjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 26eb2c0c
...@@ -58,8 +58,7 @@ NONULLSTR(char *s) ...@@ -58,8 +58,7 @@ NONULLSTR(char *s)
{ {
if (s) if (s)
return s; return s;
else return "";
return "";
} }
static int serverregistered; static int serverregistered;
...@@ -379,8 +378,7 @@ static ssize_t toolaction_store(struct device *dev, ...@@ -379,8 +378,7 @@ static ssize_t toolaction_store(struct device *dev,
if (ret) if (ret)
return ret; return ret;
else return count;
return count;
} }
static ssize_t boottotool_show(struct device *dev, static ssize_t boottotool_show(struct device *dev,
...@@ -416,8 +414,7 @@ static ssize_t boottotool_store(struct device *dev, ...@@ -416,8 +414,7 @@ static ssize_t boottotool_store(struct device *dev,
if (ret) if (ret)
return ret; return ret;
else return count;
return count;
} }
static ssize_t error_show(struct device *dev, struct device_attribute *attr, static ssize_t error_show(struct device *dev, struct device_attribute *attr,
...@@ -446,8 +443,7 @@ static ssize_t error_store(struct device *dev, struct device_attribute *attr, ...@@ -446,8 +443,7 @@ static ssize_t error_store(struct device *dev, struct device_attribute *attr,
&error, sizeof(u32)); &error, sizeof(u32));
if (ret) if (ret)
return ret; return ret;
else return count;
return count;
} }
static ssize_t textid_show(struct device *dev, struct device_attribute *attr, static ssize_t textid_show(struct device *dev, struct device_attribute *attr,
...@@ -476,8 +472,7 @@ static ssize_t textid_store(struct device *dev, struct device_attribute *attr, ...@@ -476,8 +472,7 @@ static ssize_t textid_store(struct device *dev, struct device_attribute *attr,
&textId, sizeof(u32)); &textId, sizeof(u32));
if (ret) if (ret)
return ret; return ret;
else return count;
return count;
} }
...@@ -509,8 +504,7 @@ static ssize_t remaining_steps_store(struct device *dev, ...@@ -509,8 +504,7 @@ static ssize_t remaining_steps_store(struct device *dev,
&remainingSteps, sizeof(u16)); &remainingSteps, sizeof(u16));
if (ret) if (ret)
return ret; return ret;
else return count;
return count;
} }
#if 0 #if 0
...@@ -1544,8 +1538,8 @@ read_controlvm_event(CONTROLVM_MESSAGE *msg) ...@@ -1544,8 +1538,8 @@ read_controlvm_event(CONTROLVM_MESSAGE *msg)
if (msg->hdr.Flags.testMessage == 1) { if (msg->hdr.Flags.testMessage == 1) {
LOGERR("ignoring bad CONTROLVM_QUEUE_EVENT msg with controlvm_msg_id=0x%x because Flags.testMessage is nonsensical (=1)", msg->hdr.Id); LOGERR("ignoring bad CONTROLVM_QUEUE_EVENT msg with controlvm_msg_id=0x%x because Flags.testMessage is nonsensical (=1)", msg->hdr.Id);
return FALSE; return FALSE;
} else }
return TRUE; return TRUE;
} }
return FALSE; return FALSE;
} }
...@@ -2305,8 +2299,8 @@ static ssize_t chipsetready_store(struct device *dev, ...@@ -2305,8 +2299,8 @@ static ssize_t chipsetready_store(struct device *dev,
} else if (strcmp(msgtype, "MODULES_LOADED") == 0) { } else if (strcmp(msgtype, "MODULES_LOADED") == 0) {
chipset_events[1] = 1; chipset_events[1] = 1;
return count; return count;
} else }
return -EINVAL; return -EINVAL;
} }
/* The parahotplug/devicedisabled interface gets called by our support script /* The parahotplug/devicedisabled interface gets called by our support script
......
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