The patch removes some local variables in these functions.
Signed-off-by: NRobert Richter <robert.richter@amd.com>