staging: speakup: i18n.c: Refactor conditionals in spk_msg_set

Reduce the indentation level in spk_msg_set and remove
unnecessary return variable.
Signed-off-by: Narcisa Ana Maria Vasile <narcisaanamaria12@gmail.com>
Acked-by: Julia Lawall <julia.lawall@lip6.fr>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

drivers/staging/speakup/i18n.c

@@ -541,19 +541,21 @@ static bool fmt_validate(char *template, char *user)
  */
 ssize_t spk_msg_set(enum msg_index_t index, char *text, size_t length)
 {
-	int rc = 0;
 	char *newstr = NULL;
 	unsigned long flags;
 
-	if ((index >= MSG_FIRST_INDEX) && (index < MSG_LAST_INDEX)) {
+	if ((index < MSG_FIRST_INDEX) || (index >= MSG_LAST_INDEX))
+		return -EINVAL;
+
 	newstr = kmalloc(length + 1, GFP_KERNEL);
-		if (newstr) {
+	if (!newstr)
+		return -ENOMEM;
+
 	memcpy(newstr, text, length);
 	newstr[length] = '\0';
 	if (index >= MSG_FORMATTED_START &&
 	    index <= MSG_FORMATTED_END &&
-			    !fmt_validate(speakup_default_msgs[index],
-					  newstr)) {
+	    !fmt_validate(speakup_default_msgs[index], newstr)) {
 		kfree(newstr);
 		return -EINVAL;
 	}
@@ -562,13 +564,7 @@ ssize_t spk_msg_set(enum msg_index_t index, char *text, size_t length)
 		kfree(speakup_msgs[index]);
 	speakup_msgs[index] = newstr;
 	spin_unlock_irqrestore(&speakup_info.spinlock, flags);
-		} else {
-			rc = -ENOMEM;
-		}
-	} else {
-		rc = -EINVAL;
-	}
-	return rc;
+	return 0;
 }
 
 /*