git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
VServer 1.9.2 (patch-2.6.8.1-vs1.9.2.diff)
[linux-2.6.git]
/
drivers
/
usb
/
host
/
ehci-sched.c
diff --git
a/drivers/usb/host/ehci-sched.c
b/drivers/usb/host/ehci-sched.c
index
3682fb9
..
10df266
100644
(file)
--- a/
drivers/usb/host/ehci-sched.c
+++ b/
drivers/usb/host/ehci-sched.c
@@
-89,7
+89,7
@@
static int periodic_unlink (struct ehci_hcd *ehci, unsigned frame, void *ptr)
/* unlink from shadow list; HCD won't see old structure again */
*prev_p = *next_p;
/* unlink from shadow list; HCD won't see old structure again */
*prev_p = *next_p;
- next_p->ptr =
0
;
+ next_p->ptr =
NULL
;
return 1;
}
return 1;
}
@@
-317,7
+317,7
@@
static void intr_deschedule (
} while (frame < ehci->periodic_size);
qh->qh_state = QH_STATE_UNLINK;
} while (frame < ehci->periodic_size);
qh->qh_state = QH_STATE_UNLINK;
- qh->qh_next.ptr =
0
;
+ qh->qh_next.ptr =
NULL
;
ehci->periodic_sched--;
/* maybe turn off periodic schedule */
ehci->periodic_sched--;
/* maybe turn off periodic schedule */
@@
-483,7
+483,7
@@
static int qh_schedule (struct ehci_hcd *ehci, struct ehci_qh *qh)
qh->start = frame;
/* reset S-frame and (maybe) C-frame masks */
qh->start = frame;
/* reset S-frame and (maybe) C-frame masks */
- qh->hw_info2 &= ~
0xffff
;
+ qh->hw_info2 &= ~
__constant_cpu_to_le32(0xffff)
;
qh->hw_info2 |= cpu_to_le32 (1 << uframe) | c_mask;
} else
dbg ("reused previous qh %p schedule", qh);
qh->hw_info2 |= cpu_to_le32 (1 << uframe) | c_mask;
} else
dbg ("reused previous qh %p schedule", qh);
@@
-718,7
+718,7
@@
iso_stream_put(struct ehci_hcd *ehci, struct ehci_iso_stream *stream)
is_in = (stream->bEndpointAddress & USB_DIR_IN) ? 0x10 : 0;
stream->bEndpointAddress &= 0x0f;
is_in = (stream->bEndpointAddress & USB_DIR_IN) ? 0x10 : 0;
stream->bEndpointAddress &= 0x0f;
- dev->ep
[is_in + stream->bEndpointAddress] = 0
;
+ dev->ep
[is_in + stream->bEndpointAddress] = NULL
;
if (stream->rescheduled) {
ehci_info (ehci, "ep%d%s-iso rescheduled "
if (stream->rescheduled) {
ehci_info (ehci, "ep%d%s-iso rescheduled "
@@
-772,7
+772,7
@@
iso_stream_find (struct ehci_hcd *ehci, struct urb *urb)
ehci_dbg (ehci, "dev %s ep%d%s, not iso??\n",
urb->dev->devpath, epnum & 0x0f,
(epnum & 0x10) ? "in" : "out");
ehci_dbg (ehci, "dev %s ep%d%s, not iso??\n",
urb->dev->devpath, epnum & 0x0f,
(epnum & 0x10) ? "in" : "out");
- stream =
0
;
+ stream =
NULL
;
}
/* caller guarantees an eventual matching iso_stream_put */
}
/* caller guarantees an eventual matching iso_stream_put */
@@
-896,7
+896,7
@@
itd_urb_transaction (
list_del (&itd->itd_list);
itd_dma = itd->itd_dma;
} else
list_del (&itd->itd_list);
itd_dma = itd->itd_dma;
} else
- itd =
0
;
+ itd =
NULL
;
if (!itd) {
spin_unlock_irqrestore (&ehci->lock, flags);
if (!itd) {
spin_unlock_irqrestore (&ehci->lock, flags);
@@
-1116,7
+1116,7
@@
iso_stream_schedule (
fail:
iso_sched_free (stream, sched);
fail:
iso_sched_free (stream, sched);
- urb->hcpriv =
0
;
+ urb->hcpriv =
NULL
;
return status;
ready:
return status;
ready:
@@
-1215,8
+1215,8
@@
itd_link_urb (
hcd_to_bus (&ehci->hcd)->bandwidth_isoc_reqs++;
/* fill iTDs uframe by uframe */
hcd_to_bus (&ehci->hcd)->bandwidth_isoc_reqs++;
/* fill iTDs uframe by uframe */
- for (packet = 0, itd =
0
; packet < urb->number_of_packets; ) {
- if (itd ==
0
) {
+ for (packet = 0, itd =
NULL
; packet < urb->number_of_packets; ) {
+ if (itd ==
NULL
) {
/* ASSERT: we have all necessary itds */
// BUG_ON (list_empty (&iso_sched->td_list));
/* ASSERT: we have all necessary itds */
// BUG_ON (list_empty (&iso_sched->td_list));
@@
-1247,14
+1247,14
@@
itd_link_urb (
if (((next_uframe >> 3) != frame)
|| packet == urb->number_of_packets) {
itd_link (ehci, frame % ehci->periodic_size, itd);
if (((next_uframe >> 3) != frame)
|| packet == urb->number_of_packets) {
itd_link (ehci, frame % ehci->periodic_size, itd);
- itd =
0
;
+ itd =
NULL
;
}
}
stream->next_uframe = next_uframe;
/* don't need that schedule data any more */
iso_sched_free (stream, iso_sched);
}
}
stream->next_uframe = next_uframe;
/* don't need that schedule data any more */
iso_sched_free (stream, iso_sched);
- urb->hcpriv =
0
;
+ urb->hcpriv =
NULL
;
timer_action (ehci, TIMER_IO_WATCHDOG);
if (unlikely (!ehci->periodic_sched++))
timer_action (ehci, TIMER_IO_WATCHDOG);
if (unlikely (!ehci->periodic_sched++))
@@
-1311,8
+1311,8
@@
itd_complete (
}
usb_put_urb (urb);
}
usb_put_urb (urb);
- itd->urb =
0
;
- itd->stream =
0
;
+ itd->urb =
NULL
;
+ itd->stream =
NULL
;
list_move (&itd->itd_list, &stream->free_list);
iso_stream_put (ehci, stream);
list_move (&itd->itd_list, &stream->free_list);
iso_stream_put (ehci, stream);
@@
-1328,7
+1328,7
@@
itd_complete (
/* give urb back to the driver ... can be out-of-order */
dev = usb_get_dev (urb->dev);
ehci_urb_done (ehci, urb, regs);
/* give urb back to the driver ... can be out-of-order */
dev = usb_get_dev (urb->dev);
ehci_urb_done (ehci, urb, regs);
- urb =
0
;
+ urb =
NULL
;
/* defer stopping schedule; completion can submit */
ehci->periodic_sched--;
/* defer stopping schedule; completion can submit */
ehci->periodic_sched--;
@@
-1499,7
+1499,7
@@
sitd_urb_transaction (
list_del (&sitd->sitd_list);
sitd_dma = sitd->sitd_dma;
} else
list_del (&sitd->sitd_list);
sitd_dma = sitd->sitd_dma;
} else
- sitd =
0
;
+ sitd =
NULL
;
if (!sitd) {
spin_unlock_irqrestore (&ehci->lock, flags);
if (!sitd) {
spin_unlock_irqrestore (&ehci->lock, flags);
@@
-1600,7
+1600,7
@@
sitd_link_urb (
hcd_to_bus (&ehci->hcd)->bandwidth_isoc_reqs++;
/* fill sITDs frame by frame */
hcd_to_bus (&ehci->hcd)->bandwidth_isoc_reqs++;
/* fill sITDs frame by frame */
- for (packet = 0, sitd =
0
;
+ for (packet = 0, sitd =
NULL
;
packet < urb->number_of_packets;
packet++) {
packet < urb->number_of_packets;
packet++) {
@@
-1626,7
+1626,7
@@
sitd_link_urb (
/* don't need that schedule data any more */
iso_sched_free (stream, sched);
/* don't need that schedule data any more */
iso_sched_free (stream, sched);
- urb->hcpriv =
0
;
+ urb->hcpriv =
NULL
;
timer_action (ehci, TIMER_IO_WATCHDOG);
if (!ehci->periodic_sched++)
timer_action (ehci, TIMER_IO_WATCHDOG);
if (!ehci->periodic_sched++)
@@
-1673,8
+1673,8
@@
sitd_complete (
}
usb_put_urb (urb);
}
usb_put_urb (urb);
- sitd->urb =
0
;
- sitd->stream =
0
;
+ sitd->urb =
NULL
;
+ sitd->stream =
NULL
;
list_move (&sitd->sitd_list, &stream->free_list);
stream->depth -= stream->interval << 3;
iso_stream_put (ehci, stream);
list_move (&sitd->sitd_list, &stream->free_list);
stream->depth -= stream->interval << 3;
iso_stream_put (ehci, stream);
@@
-1691,7
+1691,7
@@
sitd_complete (
/* give urb back to the driver */
dev = usb_get_dev (urb->dev);
ehci_urb_done (ehci, urb, regs);
/* give urb back to the driver */
dev = usb_get_dev (urb->dev);
ehci_urb_done (ehci, urb, regs);
- urb =
0
;
+ urb =
NULL
;
/* defer stopping schedule; completion can submit */
ehci->periodic_sched--;
/* defer stopping schedule; completion can submit */
ehci->periodic_sched--;
@@
-1903,7
+1903,7
@@
restart:
dbg ("corrupt type %d frame %d shadow %p",
type, frame, q.ptr);
// BUG ();
dbg ("corrupt type %d frame %d shadow %p",
type, frame, q.ptr);
// BUG ();
- q.ptr =
0
;
+ q.ptr =
NULL
;
}
/* assume completion callbacks modify the queue */
}
/* assume completion callbacks modify the queue */