2011-06-05 10:35:18

by Connor Hansen

[permalink] [raw]
Subject: [PATCH] iscsi_ibft_find unused variable i

int i is only needed if CONFIG_ACPI is set
so move it within ifdef so kernels without ACPI
dont allocate space for nothing. Fixes warning too.

Signed-off-by: Connor Hansen <[email protected]>
---
drivers/firmware/iscsi_ibft_find.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/firmware/iscsi_ibft_find.c b/drivers/firmware/iscsi_ibft_find.c
index f032e44..c2bfa50 100644
--- a/drivers/firmware/iscsi_ibft_find.c
+++ b/drivers/firmware/iscsi_ibft_find.c
@@ -108,10 +108,10 @@ done:
*/
unsigned long __init find_ibft_region(unsigned long *sizep)
{
- int i;
ibft_addr = NULL;

#ifdef CONFIG_ACPI
+ int i;
for (i = 0; i < ARRAY_SIZE(ibft_signs) && !ibft_addr; i++)
acpi_table_parse(ibft_signs[i].sign, acpi_find_ibft);
#endif /* CONFIG_ACPI */
--
1.7.4.4


2011-06-06 14:07:31

by Peter Jones

[permalink] [raw]
Subject: Re: [PATCH] iscsi_ibft_find unused variable i

On 06/05/2011 06:35 AM, Connor Hansen wrote:
> int i is only needed if CONFIG_ACPI is set
> so move it within ifdef so kernels without ACPI
> dont allocate space for nothing. Fixes warning too.
>
> Signed-off-by: Connor Hansen <[email protected]>

Reasonable enough.

Signed-off-by: Peter Jones <[email protected]>

> ---
> drivers/firmware/iscsi_ibft_find.c | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/firmware/iscsi_ibft_find.c b/drivers/firmware/iscsi_ibft_find.c
> index f032e44..c2bfa50 100644
> --- a/drivers/firmware/iscsi_ibft_find.c
> +++ b/drivers/firmware/iscsi_ibft_find.c
> @@ -108,10 +108,10 @@ done:
> */
> unsigned long __init find_ibft_region(unsigned long *sizep)
> {
> - int i;
> ibft_addr = NULL;
>
> #ifdef CONFIG_ACPI
> + int i;
> for (i = 0; i < ARRAY_SIZE(ibft_signs) && !ibft_addr; i++)
> acpi_table_parse(ibft_signs[i].sign, acpi_find_ibft);
> #endif /* CONFIG_ACPI */


--
Peter

Space, is big. Really big. You just won't believe how vastly hugely
mindbogglingly big it is. I mean you may think it's a long way down the
road to the chemist, but that's just peanuts to space.
-- The Hitchhiker's Guide to the Galaxy

01234567890123456789012345678901234567890123456789012345678901234567890123456789

2011-06-06 15:02:47

by Konrad Rzeszutek Wilk

[permalink] [raw]
Subject: Re: [PATCH] iscsi_ibft_find unused variable i

On Mon, Jun 06, 2011 at 10:06:59AM -0400, Peter Jones wrote:
> On 06/05/2011 06:35 AM, Connor Hansen wrote:
> > int i is only needed if CONFIG_ACPI is set
> > so move it within ifdef so kernels without ACPI
> > dont allocate space for nothing. Fixes warning too.
> >
> > Signed-off-by: Connor Hansen <[email protected]>
>
> Reasonable enough.
>
> Signed-off-by: Peter Jones <[email protected]>

<nods> Queued up for 3.0-rc2