Both functions are fairly short, and so are their callers.  There's no
particular logical distinction between them, so fold them together.
Signed-off-by: NDavid Gibson <david@gibson.dropbear.id.au>
Reviewed-by: NMichael Roth <mdroth@linux.vnet.ibm.com>
Acked-by: NMichael Roth <mdroth@linux.vnet.ibm.com>