Further cleanup of the logic in device_init.

Change-Id: I96e4b11894926b50792b9b7d7cfa0fe8392abef6
1 file changed