Cleanup redundant else statements find via golint #11602

Signed-off-by: George MacRorie <gmacr31@gmail.com>
Upstream-commit: cd08d97a64
Component: cli

components/cli/opts/opts.go

@@ -192,9 +192,8 @@ func ValidateMACAddress(val string) (string, error) {
 	_, err := net.ParseMAC(strings.TrimSpace(val))
 	if err != nil {
 		return "", err
-	} else {
-		return val, nil
 	}
+	return val, nil
 }
 
 // Validates domain for resolvconf search configuration.