[PATCH] omap: remove dead wdt code in plat-omap/devices.c

Tony Lindgren tony at atomide.com
Fri Dec 17 20:47:04 EST 2010


* Anand Gadiyar <gadiyar at ti.com> [101203 09:17]:
> Commit f2ce62312650 (OMAP: WDT: Split OMAP1 and OMAP2PLUS device
> registration) removed omap_init_wdt and related structures from
> plat-omap/devices.c. However a subsequent commit or merge
> seems to have reintroduced these by accident. The caller of
> omap_init_wdt was also removed by that commit, and this did
> not get restored. So we have the following build warning now:
> 
>   CC      arch/arm/plat-omap/devices.o
> arch/arm/plat-omap/devices.c:252: warning: 'omap_init_wdt' defined but not used
> 
> Fix this by removing this dead code.
> 
> Signed-off-by: Anand Gadiyar <gadiyar at ti.com>
> Cc: Tony Lindgren <tony at atomide.com>
> ---
> Couldn't figure out which commit reintroduced this code - git blame
> only points to the original commits that added the code years ago.
> 
> I suspect it's the DSP bridge commits that got merged via staging.
> 
> If someone can debug this mystery for me, that'd be nice.

Thanks applying. Looks like it was added back by mismerge in
e4c5bf8e3dca827a1b3a6fac494eae8c74b7e1e7 (Merge 'staging-next'
into Linus's tree).

Tony



More information about the linux-arm-kernel mailing list