From 86ce7ba5ab7f793d3d3a1a96d71a29ff9a703cf7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herv=C3=A9=20Poussineau?= Date: Thu, 15 Sep 2005 13:25:32 +0000 Subject: [PATCH] Revert 17858 and fix all warnings at once. This fix may be strange at first sight, but original Linux code doesn't use "flags" variable at all. This fix is here only to prevent a warning and shouldn't break the behaviour of the code. svn path=/trunk/; revision=17859 --- reactos/drivers/usb/miniport/linux/linux_wrapper.h | 2 +- reactos/drivers/usb/miniport/usbohci/ohci-hcd.c | 2 +- reactos/drivers/usb/miniport/usbohci/ohci-q.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/reactos/drivers/usb/miniport/linux/linux_wrapper.h b/reactos/drivers/usb/miniport/linux/linux_wrapper.h index da494484ac6..1decac16cf7 100644 --- a/reactos/drivers/usb/miniport/linux/linux_wrapper.h +++ b/reactos/drivers/usb/miniport/linux/linux_wrapper.h @@ -399,7 +399,7 @@ void my_spin_lock(spinlock_t *sl); #define spin_unlock(a) my_spin_unlock(a) void my_spin_unlock(spinlock_t *sl); -#define spin_lock_irqsave(a,b) my_spin_lock_irqsave(a,b) +#define spin_lock_irqsave(a,b) b=0, my_spin_lock_irqsave(a,b) void my_spin_lock_irqsave(spinlock_t *sl, int flags); #define spin_unlock_irqrestore(a,b) my_spin_unlock(a) diff --git a/reactos/drivers/usb/miniport/usbohci/ohci-hcd.c b/reactos/drivers/usb/miniport/usbohci/ohci-hcd.c index 7645ff0a1b3..840c275c862 100644 --- a/reactos/drivers/usb/miniport/usbohci/ohci-hcd.c +++ b/reactos/drivers/usb/miniport/usbohci/ohci-hcd.c @@ -165,7 +165,7 @@ static int ohci_urb_enqueue ( urb_priv_t *urb_priv; unsigned int pipe = urb->pipe; int i, size = 0; - unsigned long flags = 0; + unsigned long flags; int retval = 0; #ifdef OHCI_VERBOSE_DEBUG diff --git a/reactos/drivers/usb/miniport/usbohci/ohci-q.c b/reactos/drivers/usb/miniport/usbohci/ohci-q.c index 2f28ce5c023..eae584ae317 100644 --- a/reactos/drivers/usb/miniport/usbohci/ohci-q.c +++ b/reactos/drivers/usb/miniport/usbohci/ohci-q.c @@ -344,7 +344,7 @@ static struct ed *ed_get ( struct hcd_dev *dev = (struct hcd_dev *) udev->hcpriv; struct ed *ed; unsigned ep; - unsigned long flags = 0; + unsigned long flags; ep = usb_pipeendpoint (pipe) << 1; if (type != PIPE_CONTROL && is_out)