[PATCH -next] drivers/base/memory: fix a compilation warning

[PATCH -next] drivers/base/memory: fix a compilation warning

[Qian Cai]

The linux-next commit 8553938ba3bd ("drivers/base/memory: pass a
block_id to init_memory_block()") left an unused variable,

drivers/base/memory.c: In function 'add_memory_block':
drivers/base/memory.c:697:33: warning: variable 'section_nr' set but not
used [-Wunused-but-set-variable]

Also, rework the code logic a bit.

Signed-off-by: Qian Cai <cai@lca.pw>
---
 drivers/base/memory.c | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/drivers/base/memory.c b/drivers/base/memory.c
index f28efb0bf5c7..826dd76f662e 100644
--- a/drivers/base/memory.c
+++ b/drivers/base/memory.c
@@ -694,17 +694,13 @@ static int init_memory_block(struct memory_block **memory, int block_id,
 static int add_memory_block(int base_section_nr)
 {
 	struct memory_block *mem;
-	int i, ret, section_count = 0, section_nr;
+	int i, ret, section_count = 0;
 
 	for (i = base_section_nr;
 	     i < base_section_nr + sections_per_block;
-	     i++) {
-		if (!present_section_nr(i))
-			continue;
-		if (section_count == 0)
-			section_nr = i;
-		section_count++;
-	}
+	     i++)
+		if (present_section_nr(i))
+			section_count++;
 
 	if (section_count == 0)
 		return 0;
-- 
1.8.3.1

Re: [PATCH -next] drivers/base/memory: fix a compilation warning

[David Hildenbrand]

On 31.05.19 18:29, Qian Cai wrote:
> The linux-next commit 8553938ba3bd ("drivers/base/memory: pass a
> block_id to init_memory_block()") left an unused variable,
> 
> drivers/base/memory.c: In function 'add_memory_block':
> drivers/base/memory.c:697:33: warning: variable 'section_nr' set but not
> used [-Wunused-but-set-variable]
> 
> Also, rework the code logic a bit.
> 
> Signed-off-by: Qian Cai <cai@lca.pw>
> ---
>  drivers/base/memory.c | 12 ++++--------
>  1 file changed, 4 insertions(+), 8 deletions(-)
> 
> diff --git a/drivers/base/memory.c b/drivers/base/memory.c
> index f28efb0bf5c7..826dd76f662e 100644
> --- a/drivers/base/memory.c
> +++ b/drivers/base/memory.c
> @@ -694,17 +694,13 @@ static int init_memory_block(struct memory_block **memory, int block_id,
>  static int add_memory_block(int base_section_nr)
>  {
>  	struct memory_block *mem;
> -	int i, ret, section_count = 0, section_nr;
> +	int i, ret, section_count = 0;
>  
>  	for (i = base_section_nr;
>  	     i < base_section_nr + sections_per_block;
> -	     i++) {
> -		if (!present_section_nr(i))
> -			continue;
> -		if (section_count == 0)
> -			section_nr = i;
> -		section_count++;
> -	}
> +	     i++)
> +		if (present_section_nr(i))
> +			section_count++;
>  
>  	if (section_count == 0)
>  		return 0;
> 

Thanks!

Reviewed-by: David Hildenbrand <david@redhat.com>

-- 

Thanks,

David / dhildenb