fix: lint errors after upgrading golangci-lint (#12368)

cmd/format-disk-cache.go

@@ -495,8 +495,5 @@ func migrateCacheFormatJSON(cacheFormatPath string) error {
 	formatV2.Version = formatMetaVersion1
 	formatV2.Cache = formatV1.Cache
 	formatV2.Cache.Version = formatCacheVersionV2
-	if err := jsonSave(f, formatV2); err != nil {
-		return err
-	}
-	return nil
+	return jsonSave(f, formatV2)
 }