Merge pull request #13311 from WeiZhang555/cleanup

clean some redundant else clauses

api/client/help.go

@@ -23,10 +23,9 @@ func (cli *DockerCli) CmdHelp(args ...string) error {
 		method, exists := cli.getMethod(args[0])
 		if !exists {
 			return fmt.Errorf("docker: '%s' is not a docker command. See 'docker --help'.", args[0])
-		} else {
-			method("--help")
-			return nil
 		}
+		method("--help")
+		return nil
 	}
 
 	flag.Usage()

daemon/networkdriver/bridge/driver.go

@@ -307,11 +307,11 @@ func InitDriver(config *Config) error {
 		}
 	}
 
-	if gateway, err := requestDefaultGateway(config.DefaultGatewayIPv4, bridgeIPv4Network); err != nil {
+	gateway, err := requestDefaultGateway(config.DefaultGatewayIPv4, bridgeIPv4Network)
+	if err != nil {
 		return err
-	} else {
-		gatewayIPv4 = gateway
 	}
+	gatewayIPv4 = gateway
 
 	if config.FixedCIDRv6 != "" {
 		_, subnet, err := net.ParseCIDR(config.FixedCIDRv6)
@@ -325,11 +325,11 @@ func InitDriver(config *Config) error {
 		}
 		globalIPv6Network = subnet
 
-		if gateway, err := requestDefaultGateway(config.DefaultGatewayIPv6, globalIPv6Network); err != nil {
+		gateway, err := requestDefaultGateway(config.DefaultGatewayIPv6, globalIPv6Network)
+		if err != nil {
 			return err
-		} else {
-			gatewayIPv6 = gateway
 		}
+		gatewayIPv6 = gateway
 	}
 
 	// Block BridgeIP in IP allocator

pkg/units/duration.go

@@ -26,7 +26,6 @@ func HumanDuration(d time.Duration) string {
 		return fmt.Sprintf("%d weeks", hours/24/7)
 	} else if hours < 24*365*2 {
 		return fmt.Sprintf("%d months", hours/24/30)
-	} else {
-		return fmt.Sprintf("%d years", hours/24/365)
 	}
+	return fmt.Sprintf("%d years", int(d.Hours())/24/365)
 }