Stop adding sysfs attributes after we call scsi_remove_device()
when we encounter an error.  Also a small whitespace cleanup
and removing a useless "return".