This helper takes tunnel as parameter. Convert existing code to call
this where possible.

No functional changes.
Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com>