tipc: use min() to simplify the code

Li Zetao · kuba-moo · commit a18308623ce3 · 2024-08-26T09:48:53.000-07:00
When calculating size of own domain based on number of peers, the result should be less than MAX_MON_DOMAIN, so using min() here is very semantic. Signed-off-by: Li Zetao <lizetao1@huawei.com> Reviewed-by: Simon Horman <horms@kernel.org> Link: https://patch.msgid.link/20240822133908.1042240-8-lizetao1@huawei.com Signed-off-by: Jakub Kicinski <kuba@kernel.org>
diff --git a/net/tipc/monitor.c b/net/tipc/monitor.c
@@ -149,7 +149,7 @@ static int dom_size(int peers)
 
 	while ((i * i) < peers)
 		i++;
-	return i < MAX_MON_DOMAIN ? i : MAX_MON_DOMAIN;
+	return min(i, MAX_MON_DOMAIN);
 }
 
 static void map_set(u64 *up_map, int i, unsigned int v)

Original file line number	Diff line number	Diff line change
`@@ -149,7 +149,7 @@ static int dom_size(int peers)`
`149`	`149`
`150`	`150`	`while ((i * i) < peers)`
`151`	`151`	`i++;`
`152`		`- return i < MAX_MON_DOMAIN ? i : MAX_MON_DOMAIN;`
	`152`	`+ return min(i, MAX_MON_DOMAIN);`
`153`	`153`	`}`
`154`	`154`
`155`	`155`	`static void map_set(u64 *up_map, int i, unsigned int v)`