Cleans up the code a bit and prepares for the next patch
that will use the function elsewhere.
Signed-off-by: NJohannes Berg <johannes@sipsolutions.net>
Signed-off-by: NJohn W. Linville <linville@tuxdriver.com>