Removed redundant elses

aneshas · aneshas · commit 1b6065de8f46 · 2015-03-25T23:34:00.000+01:00
Signed-off-by: Anes Hasicic &lt;anes.hasicic@gmail.com&gt;
diff --git a/pkg/devicemapper/devmapper.go b/pkg/devicemapper/devmapper.go
@@ -586,9 +586,10 @@ func CreateDevice(poolName string, deviceId int) error {
 		// Caller wants to know about ErrDeviceIdExists so that it can try with a different device id.
 		if dmSawExist {
 			return ErrDeviceIdExists
-		} else {
-			return fmt.Errorf("Error running CreateDevice %s", err)
 		}
+
+		return fmt.Errorf("Error running CreateDevice %s", err)
+
 	}
 	return nil
 }
@@ -681,9 +682,10 @@ func CreateSnapDevice(poolName string, deviceId int, baseName string, baseDevice
 		// Caller wants to know about ErrDeviceIdExists so that it can try with a different device id.
 		if dmSawExist {
 			return ErrDeviceIdExists
-		} else {
-			return fmt.Errorf("Error running DeviceCreate (createSnapDevice) %s", err)
 		}
+
+		return fmt.Errorf("Error running DeviceCreate (createSnapDevice) %s", err)
+
 	}
 
 	if doSuspend {

Original file line number	Diff line number	Diff line change
`@@ -586,9 +586,10 @@ func CreateDevice(poolName string, deviceId int) error {`
`586`	`586`	`// Caller wants to know about ErrDeviceIdExists so that it can try with a different device id.`
`587`	`587`	`if dmSawExist {`
`588`	`588`	`return ErrDeviceIdExists`
`589`		`- } else {`
`590`		`- return fmt.Errorf("Error running CreateDevice %s", err)`
`591`	`589`	`}`
	`590`	`+`
	`591`	`+ return fmt.Errorf("Error running CreateDevice %s", err)`
	`592`	`+`
`592`	`593`	`}`
`593`	`594`	`return nil`
`594`	`595`	`}`
`@@ -681,9 +682,10 @@ func CreateSnapDevice(poolName string, deviceId int, baseName string, baseDevice`
`681`	`682`	`// Caller wants to know about ErrDeviceIdExists so that it can try with a different device id.`
`682`	`683`	`if dmSawExist {`
`683`	`684`	`return ErrDeviceIdExists`
`684`		`- } else {`
`685`		`- return fmt.Errorf("Error running DeviceCreate (createSnapDevice) %s", err)`
`686`	`685`	`}`
	`686`	`+`
	`687`	`+ return fmt.Errorf("Error running DeviceCreate (createSnapDevice) %s", err)`
	`688`	`+`
`687`	`689`	`}`
`688`	`690`
`689`	`691`	`if doSuspend {`