From 750ed556a5fa727284856300eb0f329c81271b70 Mon Sep 17 00:00:00 2001
From: Nick Craig-Wood <nick@craig-wood.com>
Date: Fri, 20 Oct 2023 18:52:58 +0100
Subject: [PATCH] build: fix new lint errors with golangci-lint v1.55.0

---
 backend/webdav/api/types.go |  3 +--
 lib/buildinfo/arch.go       | 11 +++++------
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/backend/webdav/api/types.go b/backend/webdav/api/types.go
index a959a3c9f..50feae106 100644
--- a/backend/webdav/api/types.go
+++ b/backend/webdav/api/types.go
@@ -121,9 +121,8 @@ func (p *Prop) Hashes() (hashes map[hash.Type]string) {
 		hashes = make(map[hash.Type]string)
 		hashes[hash.SHA1] = *p.MESha1Hex
 		return hashes
-	} else {
-		return nil
 	}
+	return nil
 }
 
 // PropValue is a tagged name and value
diff --git a/lib/buildinfo/arch.go b/lib/buildinfo/arch.go
index c69b4ff9c..cf5f2d69a 100644
--- a/lib/buildinfo/arch.go
+++ b/lib/buildinfo/arch.go
@@ -37,13 +37,12 @@ func GetSupportedGOARM() int {
 			// means it can run programs built with GOARM value 6 and lower,
 			// but not 7.
 			return 6
-		} else {
-			// This CPU has no VFP floating point hardware, which means it can
-			// only run programs built with GOARM value 5, which is minimum supported.
-			// Note that the CPU can still in reality be based on e.g. ARMv7
-			// architecture, but simply lack hardfloat support.
-			return 5
 		}
+		// This CPU has no VFP floating point hardware, which means it can
+		// only run programs built with GOARM value 5, which is minimum supported.
+		// Note that the CPU can still in reality be based on e.g. ARMv7
+		// architecture, but simply lack hardfloat support.
+		return 5
 	}
 	return 0
 }