From da9d8082b094cb8ac8455d44a75bef6fc3ca8b11 Mon Sep 17 00:00:00 2001
From: Johannes Anderwald <johannes.anderwald@reactos.org>
Date: Wed, 1 Jun 2011 11:31:34 +0000
Subject: [PATCH] [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   | 1 -
 drivers/usb/usbstor/pdo.c     | 4 ++--
 drivers/usb/usbstor/usbstor.h | 6 ------
 3 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/drivers/usb/usbstor/error.c b/drivers/usb/usbstor/error.c
index 936caaef3c2..91e25ba322f 100644
--- a/drivers/usb/usbstor/error.c
+++ b/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;
 
diff --git a/drivers/usb/usbstor/pdo.c b/drivers/usb/usbstor/pdo.c
index 9ff81cc8507..732c9348d9e 100644
--- a/drivers/usb/usbstor/pdo.c
+++ b/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
diff --git a/drivers/usb/usbstor/usbstor.h b/drivers/usb/usbstor/usbstor.h
index 6e12ffe5dda..3f3b90743ef 100644
--- a/drivers/usb/usbstor/usbstor.h
+++ b/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;