Merge branch 'ionic-cleanups'

Shannon Nelson says:

====================
ionic: housekeeping updates

These are a few changes for code clean up and a couple
more lock management tweaks.

v2: rebased
====================

Signed-off-by: David S. Miller <davem@davemloft.net>