Fix -Wpedantic warnings

Don't need these extra ; and give warnings with -Wpedantic

Change-Id: I877fee2a6421b151697ca3845a09d70f3b2b302b
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>