drivers: clean it up a bit

Change-Id: Ice7d83972a5f8f00ac2bf216a65d9824f29c0d22