lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

USB: EHCI whitespace fixes (cosmetic)

Browse Source 
[ ... when you have an editor set to remind you of whitespace bugs ... ]

Cosmetic EHCI changes: remove end-of-line whitespace, spaces before tabs.

Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
David Brownell
2006-08-30 14:50:06 -07:00
committed by Greg Kroah-Hartman
parent 729ed6d502
commit 53bd6a601a
7 changed files with 64 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/usb/host/ehci-hcd.c
View File

@@ -70,7 +70,7 @@
* 2002-08-06 Handling for bulk and interrupt transfers is mostly shared; * 2002-08-06 Handling for bulk and interrupt transfers is mostly shared;
* only scheduling is different, no arbitrary limitations. * only scheduling is different, no arbitrary limitations.
* 2002-07-25 Sanity check PCI reads, mostly for better cardbus support, * 2002-07-25 Sanity check PCI reads, mostly for better cardbus support,
* clean up HC run state handshaking. * clean up HC run state handshaking.
* 2002-05-24 Preliminary FS/LS interrupts, using scheduling shortcuts * 2002-05-24 Preliminary FS/LS interrupts, using scheduling shortcuts
* 2002-05-11 Clear TT errors for FS/LS ctrl/bulk. Fill in some other * 2002-05-11 Clear TT errors for FS/LS ctrl/bulk. Fill in some other
* missing pieces: enabling 64bit dma, handoff from BIOS/SMM. * missing pieces: enabling 64bit dma, handoff from BIOS/SMM.
@@ -425,7 +425,7 @@ static int ehci_init(struct usb_hcd *hcd)
/* controllers may cache some of the periodic schedule ... */ /* controllers may cache some of the periodic schedule ... */
hcc_params = readl(&ehci->caps->hcc_params); hcc_params = readl(&ehci->caps->hcc_params);
if (HCC_ISOC_CACHE(hcc_params)) // full frame cache if (HCC_ISOC_CACHE(hcc_params)) // full frame cache
ehci->i_thresh = 8; ehci->i_thresh = 8;
else // N microframes cached else // N microframes cached
ehci->i_thresh = 2 + HCC_ISOC_THRES(hcc_params); ehci->i_thresh = 2 + HCC_ISOC_THRES(hcc_params);

8
drivers/usb/host/ehci-hub.c
View File

@@ -103,10 +103,10 @@ static int ehci_bus_resume (struct usb_hcd *hcd)
/* re-init operational registers in case we lost power */ /* re-init operational registers in case we lost power */
if (readl (&ehci->regs->intr_enable) == 0) { if (readl (&ehci->regs->intr_enable) == 0) {
/* at least some APM implementations will try to deliver /* at least some APM implementations will try to deliver
* IRQs right away, so delay them until we're ready. * IRQs right away, so delay them until we're ready.
*/ */
intr_enable = 1; intr_enable = 1;
writel (0, &ehci->regs->segment); writel (0, &ehci->regs->segment);
writel (ehci->periodic_dma, &ehci->regs->frame_list); writel (ehci->periodic_dma, &ehci->regs->frame_list);
writel ((u32)ehci->async->qh_dma, &ehci->regs->async_next); writel ((u32)ehci->async->qh_dma, &ehci->regs->async_next);
@@ -304,7 +304,7 @@ ehci_hub_descriptor (
/*-------------------------------------------------------------------------*/ /*-------------------------------------------------------------------------*/
#define PORT_WAKE_BITS (PORT_WKOC_E|PORT_WKDISC_E|PORT_WKCONN_E) #define PORT_WAKE_BITS (PORT_WKOC_E|PORT_WKDISC_E|PORT_WKCONN_E)
static int ehci_hub_control ( static int ehci_hub_control (
struct usb_hcd *hcd, struct usb_hcd *hcd,

6
drivers/usb/host/ehci-q.c
View File

@@ -199,7 +199,7 @@ static void qtd_copy_status (
&& ((token & QTD_STS_MMF) != 0 && ((token & QTD_STS_MMF) != 0
|| QTD_CERR(token) == 0) || QTD_CERR(token) == 0)
&& (!ehci_is_TDI(ehci) && (!ehci_is_TDI(ehci)
|| urb->dev->tt->hub != || urb->dev->tt->hub !=
ehci_to_hcd(ehci)->self.root_hub)) { ehci_to_hcd(ehci)->self.root_hub)) {
#ifdef DEBUG #ifdef DEBUG
struct usb_device *tt = urb->dev->tt->hub; struct usb_device *tt = urb->dev->tt->hub;
@@ -759,7 +759,7 @@ qh_make (
} }
break; break;
default: default:
dbg ("bogus dev %p speed %d", urb->dev, urb->dev->speed); dbg ("bogus dev %p speed %d", urb->dev, urb->dev->speed);
done: done:
qh_put (qh); qh_put (qh);
return NULL; return NULL;
@@ -1046,7 +1046,7 @@ static void start_unlink_async (struct ehci_hcd *ehci, struct ehci_qh *qh)
if (unlikely (ehci_to_hcd(ehci)->state == HC_STATE_HALT)) { if (unlikely (ehci_to_hcd(ehci)->state == HC_STATE_HALT)) {
/* if (unlikely (qh->reclaim != 0)) /* if (unlikely (qh->reclaim != 0))
* this will recurse, probably not much * this will recurse, probably not much
*/ */
end_unlink_async (ehci, NULL); end_unlink_async (ehci, NULL);
return; return;

12
drivers/usb/host/ehci-sched.c
View File

@@ -666,7 +666,7 @@ static int check_intr_schedule (
__le32 *c_maskp __le32 *c_maskp
) )
{ {
int retval = -ENOSPC; int retval = -ENOSPC;
u8 mask = 0; u8 mask = 0;
if (qh->c_usecs && uframe >= 6) /* FSTN territory? */ if (qh->c_usecs && uframe >= 6) /* FSTN territory? */
@@ -728,7 +728,7 @@ done:
*/ */
static int qh_schedule (struct ehci_hcd *ehci, struct ehci_qh *qh) static int qh_schedule (struct ehci_hcd *ehci, struct ehci_qh *qh)
{ {
int status; int status;
unsigned uframe; unsigned uframe;
__le32 c_mask; __le32 c_mask;
unsigned frame; /* 0..(qh->period - 1), or NO_FRAME */ unsigned frame; /* 0..(qh->period - 1), or NO_FRAME */
@@ -784,7 +784,7 @@ static int qh_schedule (struct ehci_hcd *ehci, struct ehci_qh *qh)
ehci_dbg (ehci, "reused qh %p schedule\n", qh); ehci_dbg (ehci, "reused qh %p schedule\n", qh);
/* stuff into the periodic schedule */ /* stuff into the periodic schedule */
status = qh_link_periodic (ehci, qh); status = qh_link_periodic (ehci, qh);
done: done:
return status; return status;
} }
@@ -1681,7 +1681,7 @@ static int itd_submit (struct ehci_hcd *ehci, struct urb *urb,
status = -ESHUTDOWN; status = -ESHUTDOWN;
else else
status = iso_stream_schedule (ehci, urb, stream); status = iso_stream_schedule (ehci, urb, stream);
if (likely (status == 0)) if (likely (status == 0))
itd_link_urb (ehci, urb, ehci->periodic_size << 3, stream); itd_link_urb (ehci, urb, ehci->periodic_size << 3, stream);
spin_unlock_irqrestore (&ehci->lock, flags); spin_unlock_irqrestore (&ehci->lock, flags);
@@ -1925,7 +1925,7 @@ sitd_link_urb (
/*-------------------------------------------------------------------------*/ /*-------------------------------------------------------------------------*/
#define SITD_ERRS (SITD_STS_ERR | SITD_STS_DBE | SITD_STS_BABBLE \ #define SITD_ERRS (SITD_STS_ERR | SITD_STS_DBE | SITD_STS_BABBLE \
| SITD_STS_XACT | SITD_STS_MMF) | SITD_STS_XACT | SITD_STS_MMF)
static unsigned static unsigned
sitd_complete ( sitd_complete (
@@ -2043,7 +2043,7 @@ static int sitd_submit (struct ehci_hcd *ehci, struct urb *urb,
status = -ESHUTDOWN; status = -ESHUTDOWN;
else else
status = iso_stream_schedule (ehci, urb, stream); status = iso_stream_schedule (ehci, urb, stream);
if (status == 0) if (status == 0)
sitd_link_urb (ehci, urb, ehci->periodic_size << 3, stream); sitd_link_urb (ehci, urb, ehci->periodic_size << 3, stream);
spin_unlock_irqrestore (&ehci->lock, flags); spin_unlock_irqrestore (&ehci->lock, flags);

14
drivers/usb/host/ehci.h
View File

@@ -204,7 +204,7 @@ struct ehci_regs {
#define CMD_LRESET (1<<7) /* partial reset (no ports, etc) */ #define CMD_LRESET (1<<7) /* partial reset (no ports, etc) */
#define CMD_IAAD (1<<6) /* "doorbell" interrupt async advance */ #define CMD_IAAD (1<<6) /* "doorbell" interrupt async advance */
#define CMD_ASE (1<<5) /* async schedule enable */ #define CMD_ASE (1<<5) /* async schedule enable */
#define CMD_PSE (1<<4) /* periodic schedule enable */ #define CMD_PSE (1<<4) /* periodic schedule enable */
/* 3:2 is periodic frame list size */ /* 3:2 is periodic frame list size */
#define CMD_RESET (1<<1) /* reset HC not bus */ #define CMD_RESET (1<<1) /* reset HC not bus */
#define CMD_RUN (1<<0) /* start/stop HC */ #define CMD_RUN (1<<0) /* start/stop HC */
@@ -230,9 +230,9 @@ struct ehci_regs {
/* FRINDEX: offset 0x0C */ /* FRINDEX: offset 0x0C */
u32 frame_index; /* current microframe number */ u32 frame_index; /* current microframe number */
/* CTRLDSSEGMENT: offset 0x10 */ /* CTRLDSSEGMENT: offset 0x10 */
u32 segment; /* address bits 63:32 if needed */ u32 segment; /* address bits 63:32 if needed */
/* PERIODICLISTBASE: offset 0x14 */ /* PERIODICLISTBASE: offset 0x14 */
u32 frame_list; /* points to periodic list */ u32 frame_list; /* points to periodic list */
/* ASYNCLISTADDR: offset 0x18 */ /* ASYNCLISTADDR: offset 0x18 */
u32 async_next; /* address of next async queue head */ u32 async_next; /* address of next async queue head */
@@ -348,8 +348,8 @@ struct ehci_qtd {
/* values for that type tag */ /* values for that type tag */
#define Q_TYPE_ITD __constant_cpu_to_le32 (0 << 1) #define Q_TYPE_ITD __constant_cpu_to_le32 (0 << 1)
#define Q_TYPE_QH __constant_cpu_to_le32 (1 << 1) #define Q_TYPE_QH __constant_cpu_to_le32 (1 << 1)
#define Q_TYPE_SITD __constant_cpu_to_le32 (2 << 1) #define Q_TYPE_SITD __constant_cpu_to_le32 (2 << 1)
#define Q_TYPE_FSTN __constant_cpu_to_le32 (3 << 1) #define Q_TYPE_FSTN __constant_cpu_to_le32 (3 << 1)
/* next async queue entry, or pointer to interrupt/periodic QH */ /* next async queue entry, or pointer to interrupt/periodic QH */
#define QH_NEXT(dma) (cpu_to_le32(((u32)dma)&~0x01f)|Q_TYPE_QH) #define QH_NEXT(dma) (cpu_to_le32(((u32)dma)&~0x01f)|Q_TYPE_QH)
@@ -366,7 +366,7 @@ struct ehci_qtd {
* For entries in the async schedule, the type tag always says "qh". * For entries in the async schedule, the type tag always says "qh".
*/ */
union ehci_shadow { union ehci_shadow {
struct ehci_qh *qh; /* Q_TYPE_QH */ struct ehci_qh *qh; /* Q_TYPE_QH */
struct ehci_itd *itd; /* Q_TYPE_ITD */ struct ehci_itd *itd; /* Q_TYPE_ITD */
struct ehci_sitd *sitd; /* Q_TYPE_SITD */ struct ehci_sitd *sitd; /* Q_TYPE_SITD */
struct ehci_fstn *fstn; /* Q_TYPE_FSTN */ struct ehci_fstn *fstn; /* Q_TYPE_FSTN */
@@ -471,7 +471,7 @@ struct ehci_iso_stream {
struct list_head td_list; /* queued itds/sitds */ struct list_head td_list; /* queued itds/sitds */
struct list_head free_list; /* list of unused itds/sitds */ struct list_head free_list; /* list of unused itds/sitds */
struct usb_device *udev; struct usb_device *udev;
struct usb_host_endpoint *ep; struct usb_host_endpoint *ep;
/* output of (re)scheduling */ /* output of (re)scheduling */
unsigned long start; /* jiffies */ unsigned long start; /* jiffies */