diff mbox

[U-Boot] spl: mmc: Fix compiler warning

Message ID 1449348155-18390-1-git-send-email-marex@denx.de
State Deferred
Delegated to: Tom Rini
Headers show

Commit Message

Marek Vasut Dec. 5, 2015, 8:42 p.m. UTC
Fix the following warning:
common/spl/spl_mmc.c: In function 'spl_mmc_load_image':
common/spl/spl_mmc.c:31:24: warning: 'mmc' may be used uninitialized in this function [-Wmaybe-uninitialized]
  count = mmc->block_dev.block_read(0, sector, 1, header);
                        ^
common/spl/spl_mmc.c:251:14: note: 'mmc' was declared here
  struct mmc *mmc;
              ^

The fix is as simple as initializing the struct mmc *mmc to NULL,
so the subsequent functions can check if the variable is set or
not.

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Pantelis Antoniou <panto@antoniou-consulting.com>
Cc: Tom Rini <trini@konsulko.com>
Cc: Simon Glass <sjg@chromium.org>
---
 common/spl/spl_mmc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Tom Rini Dec. 5, 2015, 9:02 p.m. UTC | #1
On Sat, Dec 05, 2015 at 09:42:35PM +0100, Marek Vasut wrote:

> Fix the following warning:
> common/spl/spl_mmc.c: In function 'spl_mmc_load_image':
> common/spl/spl_mmc.c:31:24: warning: 'mmc' may be used uninitialized in this function [-Wmaybe-uninitialized]
>   count = mmc->block_dev.block_read(0, sector, 1, header);
>                         ^
> common/spl/spl_mmc.c:251:14: note: 'mmc' was declared here
>   struct mmc *mmc;
>               ^
> 
> The fix is as simple as initializing the struct mmc *mmc to NULL,
> so the subsequent functions can check if the variable is set or
> not.
> 
> Signed-off-by: Marek Vasut <marex@denx.de>
> Cc: Pantelis Antoniou <panto@antoniou-consulting.com>
> Cc: Tom Rini <trini@konsulko.com>
> Cc: Simon Glass <sjg@chromium.org>

I'm glad we're all grabbing gcc-5.x now.  I am however going to grab
Simon's patch for this shortly.  Thanks!
Marek Vasut Dec. 5, 2015, 9:04 p.m. UTC | #2
On Saturday, December 05, 2015 at 10:02:56 PM, Tom Rini wrote:
> On Sat, Dec 05, 2015 at 09:42:35PM +0100, Marek Vasut wrote:
> > Fix the following warning:
> > common/spl/spl_mmc.c: In function 'spl_mmc_load_image':
> > common/spl/spl_mmc.c:31:24: warning: 'mmc' may be used uninitialized in
> > this function [-Wmaybe-uninitialized]
> > 
> >   count = mmc->block_dev.block_read(0, sector, 1, header);
> >   
> >                         ^
> > 
> > common/spl/spl_mmc.c:251:14: note: 'mmc' was declared here
> > 
> >   struct mmc *mmc;
> >   
> >               ^
> > 
> > The fix is as simple as initializing the struct mmc *mmc to NULL,
> > so the subsequent functions can check if the variable is set or
> > not.
> > 
> > Signed-off-by: Marek Vasut <marex@denx.de>
> > Cc: Pantelis Antoniou <panto@antoniou-consulting.com>
> > Cc: Tom Rini <trini@konsulko.com>
> > Cc: Simon Glass <sjg@chromium.org>
> 
> I'm glad we're all grabbing gcc-5.x now.  I am however going to grab
> Simon's patch for this shortly.  Thanks!

This popped up with gcc 4.9 though ;-)
Thanks anyway.

Best regards,
Marek Vasut
diff mbox

Patch

diff --git a/common/spl/spl_mmc.c b/common/spl/spl_mmc.c
index b3c2c64..43748d0 100644
--- a/common/spl/spl_mmc.c
+++ b/common/spl/spl_mmc.c
@@ -248,7 +248,7 @@  int spl_mmc_do_fs_boot(struct mmc *mmc)
 
 int spl_mmc_load_image(u32 boot_device)
 {
-	struct mmc *mmc;
+	struct mmc *mmc = NULL;
 	u32 boot_mode;
 	int err = 0;
 	__maybe_unused int part;