usb-storage: prepare for subdriver separation