[USBSTOR]

- Remove superflous declaration
- Fix bug when quering for compatible ids
- Remove unused local variable

svn path=/branches/usb-bringup/; revision=52038

drivers/usb/usbstor/error.c

@@ -65,7 +65,6 @@ USBSTOR_HandleTransferError(
 {
 	NTSTATUS Status;
 	PIO_STACK_LOCATION Stack;
-	PURB Urb;
 	USBD_PIPE_HANDLE PipeHandle;
 	PSCSI_REQUEST_BLOCK Request;
 

drivers/usb/usbstor/pdo.c

@@ -600,8 +600,8 @@ USBSTOR_PdoHandleQueryCompatibleId(
     //
     // format instance id
     //
-    Length = sprintf(Buffer, L"USBSTOR\\%s", DeviceType) + 1;
-    Length += sprintf(&Buffer[Length], L"USBSTOR\\%s", L"RAW") + 2;
+    Length = sprintf(Buffer, "USBSTOR\\%s", DeviceType) + 1;
+    Length += sprintf(&Buffer[Length], "USBSTOR\\%s", "RAW") + 2;
 
     //
     // allocate instance id

drivers/usb/usbstor/usbstor.h

@@ -38,12 +38,6 @@
 #define USB_RECOVERABLE_ERRORS (USBD_STATUS_STALL_PID | USBD_STATUS_DEV_NOT_RESPONDING \
 	| USBD_STATUS_ENDPOINT_HALTED | USBD_STATUS_NO_BANDWIDTH)
 
-NTSTATUS NTAPI
-IoAttachDeviceToDeviceStackSafe(
-  IN PDEVICE_OBJECT SourceDevice,
-  IN PDEVICE_OBJECT TargetDevice,
-  OUT PDEVICE_OBJECT *AttachedToDeviceObject);
-
 typedef struct __COMMON_DEVICE_EXTENSION__
 {
     BOOLEAN IsFDO;