The casts replaced in this change were redundant; they were initially
added after some consideration of pointer provenance, but in these
particular cases loss of provenance is deliberate.
Change-Id: I9971fd47155b4ec395b2d8d7991c215d0c6a06d3
Signed-off-by: Chris Kay <chris.kay@arm.com>