| Message ID | 20110826112643.f86132d55edc5d452df3ebd0@canb.auug.org.au (mailing list archive) |
|---|---|
| State | Not Applicable |
| Headers | show |
On Fri, Aug 26, 2011 at 11:26:43AM +1000, Stephen Rothwell wrote: > I assume that these variables were used in the past but not removed when > their usage was removed. > > Fixes these warnings: > > scripts/dtc/dtc.c: In function 'main': > scripts/dtc/dtc.c:102:17: warning: variable 'check' set but not used [-Wunused-but-set-variable] > scripts/dtc/flattree.c: In function 'flat_read_mem_reserve': > scripts/dtc/flattree.c:700:14: warning: variable 'p' set but not used [-Wunused-but-set-variable] > > Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> Acked-by: David Gibson <david@gibson.dropbear.id.au> Yeah, I noticed these gcc 4.6 warnings recently, but didn't get around to sending a patch. Jon, please apply. Uh.. except that this is a patch against the in kernel dtc, rather than upstream.
Hi David, On Fri, 26 Aug 2011 14:49:02 +1000 David Gibson <dwg@au1.ibm.com> wrote: > > Jon, please apply. Uh.. except that this is a patch against the in > kernel dtc, rather than upstream. Yeah, Josh pointed out that these are fixed in upstream. I guess we need to do another snapshot merge ...
diff --git a/scripts/dtc/dtc.c b/scripts/dtc/dtc.c index cbc0193..fc83355 100644 --- a/scripts/dtc/dtc.c +++ b/scripts/dtc/dtc.c @@ -99,7 +99,7 @@ int main(int argc, char *argv[]) const char *inform = "dts"; const char *outform = "dts"; const char *outname = "-"; - int force = 0, check = 0, sort = 0; + int force = 0, sort = 0; const char *arg; int opt; FILE *outf = NULL; @@ -137,9 +137,6 @@ int main(int argc, char *argv[]) case 'f': force = 1; break; - case 'c': - check = 1; - break; case 'q': quiet++; break; diff --git a/scripts/dtc/flattree.c b/scripts/dtc/flattree.c index ead0332..28d0b23 100644 --- a/scripts/dtc/flattree.c +++ b/scripts/dtc/flattree.c @@ -697,7 +697,6 @@ static struct reserve_info *flat_read_mem_reserve(struct inbuf *inb) { struct reserve_info *reservelist = NULL; struct reserve_info *new; - const char *p; struct fdt_reserve_entry re; /* @@ -706,7 +705,6 @@ static struct reserve_info *flat_read_mem_reserve(struct inbuf *inb) * * First pass, count entries. */ - p = inb->ptr; while (1) { flat_read_chunk(inb, &re, sizeof(re)); re.address = fdt64_to_cpu(re.address);
I assume that these variables were used in the past but not removed when their usage was removed. Fixes these warnings: scripts/dtc/dtc.c: In function 'main': scripts/dtc/dtc.c:102:17: warning: variable 'check' set but not used [-Wunused-but-set-variable] scripts/dtc/flattree.c: In function 'flat_read_mem_reserve': scripts/dtc/flattree.c:700:14: warning: variable 'p' set but not used [-Wunused-but-set-variable] Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> --- scripts/dtc/dtc.c | 5 +---- scripts/dtc/flattree.c | 2 -- 2 files changed, 1 insertions(+), 6 deletions(-)