Revert 17858 and fix all warnings at once.
authorHervé Poussineau <hpoussin@reactos.org>
Thu, 15 Sep 2005 13:25:32 +0000 (13:25 +0000)
committerHervé Poussineau <hpoussin@reactos.org>
Thu, 15 Sep 2005 13:25:32 +0000 (13:25 +0000)
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
reactos/drivers/usb/miniport/usbohci/ohci-hcd.c
reactos/drivers/usb/miniport/usbohci/ohci-q.c

index da49448..1decac1 100644 (file)
@@ -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)
 
index 7645ff0..840c275 100644 (file)
@@ -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
index 2f28ce5..eae584a 100644 (file)
@@ -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)