This looks ok, but I think it's just too much churn at the moment. We already have one patch that moves it to scsi.c as part of the fw activation without reset patchset, and we if the scsi emulation removal goes in it should just go away entirely..