[PATCH 12/14] RFC: usb/host/faraday-hcd: Replace fotg210 by fhcd2xx

From: Peter Senna Tschudin
Date: Mon Sep 21 2015 - 11:01:59 EST

Next message: Peter Senna Tschudin: "[PATCH 05/14] RFC: usb/host/fotg210: change kmalloc by kmalloc_array"
Previous message: Peter Senna Tschudin: "[PATCH 06/14] RFC: usb/host/fotg210: replace msleep by usleep_range"
In reply to: Peter Senna Tschudin: "[PATCH 06/14] RFC: usb/host/fotg210: replace msleep by usleep_range"
Next in thread: Peter Senna Tschudin: "[PATCH 05/14] RFC: usb/host/fotg210: change kmalloc by kmalloc_array"
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

This patch replaces the strings:
FOTG210 by FHCD2XX
fotg210 by fhcd2xx

The goal is to remove all references to fotg210 as the driver will
support both fotg210 and fusbh200.

Signed-off-by: Peter Senna Tschudin <peter.senna@xxxxxxxxx>
---
drivers/usb/host/faraday-hcd.c | 2612 ++++++++++++++++++++--------------------
drivers/usb/host/faraday-hcd.h | 248 ++--
2 files changed, 1430 insertions(+), 1430 deletions(-)

diff --git a/drivers/usb/host/faraday-hcd.c b/drivers/usb/host/faraday-hcd.c
index ab1257f..3da3f59 100644
--- a/drivers/usb/host/faraday-hcd.c
+++ b/drivers/usb/host/faraday-hcd.c
@@ -52,17 +52,17 @@

#define DRIVER_AUTHOR "Yuan-Hsin Chen"
#define DRIVER_DESC "FOTG210 Host Controller (EHCI) Driver"
-static const char hcd_name[] = "fotg210_hcd";
+static const char hcd_name[] = "fhcd2xx_hcd";

-#undef FOTG210_URB_TRACE
-#define FOTG210_STATS
+#undef FHCD2XX_URB_TRACE
+#define FHCD2XX_STATS

/* magic numbers that can affect system performance */
-#define FOTG210_TUNE_CERR 3 /* 0-3 qtd retries; 0 == don't stop */
-#define FOTG210_TUNE_RL_HS 4 /* nak throttle; see 4.9 */
-#define FOTG210_TUNE_RL_TT 0
-#define FOTG210_TUNE_MULT_HS 1 /* 1-3 transactions/uframe; 4.10.3 */
-#define FOTG210_TUNE_MULT_TT 1
+#define FHCD2XX_TUNE_CERR 3 /* 0-3 qtd retries; 0 == don't stop */
+#define FHCD2XX_TUNE_RL_HS 4 /* nak throttle; see 4.9 */
+#define FHCD2XX_TUNE_RL_TT 0
+#define FHCD2XX_TUNE_MULT_HS 1 /* 1-3 transactions/uframe; 4.10.3 */
+#define FHCD2XX_TUNE_MULT_TT 1

/*
* Some drivers think it's safe to schedule isochronous transfers more than 256
@@ -70,7 +70,7 @@ static const char hcd_name[] = "fotg210_hcd";
* code). In an attempt to avoid trouble, we will use a minimum scheduling
* length of 512 frames instead of 256.
*/
-#define FOTG210_TUNE_FLS 1 /* (medium) 512-frame schedule */
+#define FHCD2XX_TUNE_FLS 1 /* (medium) 512-frame schedule */

/* Initial IRQ latency: faster than hw default */
static int log2_irq_thresh; /* 0 to 6 */
@@ -91,95 +91,95 @@ MODULE_PARM_DESC(hird, "host initiated resume duration, +1 for each 75us");

#include "faraday-hcd.h"

-#define fotg210_dbg(fotg210, fmt, args...) \
- dev_dbg(fotg210_to_hcd(fotg210)->self.controller, fmt, ## args)
-#define fotg210_err(fotg210, fmt, args...) \
- dev_err(fotg210_to_hcd(fotg210)->self.controller, fmt, ## args)
-#define fotg210_info(fotg210, fmt, args...) \
- dev_info(fotg210_to_hcd(fotg210)->self.controller, fmt, ## args)
-#define fotg210_warn(fotg210, fmt, args...) \
- dev_warn(fotg210_to_hcd(fotg210)->self.controller, fmt, ## args)
+#define fhcd2xx_dbg(fhcd2xx, fmt, args...) \
+ dev_dbg(fhcd2xx_to_hcd(fhcd2xx)->self.controller, fmt, ## args)
+#define fhcd2xx_err(fhcd2xx, fmt, args...) \
+ dev_err(fhcd2xx_to_hcd(fhcd2xx)->self.controller, fmt, ## args)
+#define fhcd2xx_info(fhcd2xx, fmt, args...) \
+ dev_info(fhcd2xx_to_hcd(fhcd2xx)->self.controller, fmt, ## args)
+#define fhcd2xx_warn(fhcd2xx, fmt, args...) \
+ dev_warn(fhcd2xx_to_hcd(fhcd2xx)->self.controller, fmt, ## args)

/* check the values in the HCSPARAMS register (host controller _Structural_
* parameters) see EHCI spec, Table 2-4 for each value
*/
-static void dbg_hcs_params(struct fotg210_hcd *fotg210, char *label)
+static void dbg_hcs_params(struct fhcd2xx_hcd *fhcd2xx, char *label)
{
- u32 params = fotg210_readl(fotg210, &fotg210->caps->hcs_params);
+ u32 params = fhcd2xx_readl(fhcd2xx, &fhcd2xx->caps->hcs_params);

- fotg210_dbg(fotg210, "%s hcs_params 0x%x ports=%d\n", label, params,
+ fhcd2xx_dbg(fhcd2xx, "%s hcs_params 0x%x ports=%d\n", label, params,
HCS_N_PORTS(params));
}

/* check the values in the HCCPARAMS register (host controller _Capability_
* parameters) see EHCI Spec, Table 2-5 for each value
*/
-static void dbg_hcc_params(struct fotg210_hcd *fotg210, char *label)
+static void dbg_hcc_params(struct fhcd2xx_hcd *fhcd2xx, char *label)
{
- u32 params = fotg210_readl(fotg210, &fotg210->caps->hcc_params);
+ u32 params = fhcd2xx_readl(fhcd2xx, &fhcd2xx->caps->hcc_params);

- fotg210_dbg(fotg210, "%s hcc_params %04x uframes %s%s\n", label,
+ fhcd2xx_dbg(fhcd2xx, "%s hcc_params %04x uframes %s%s\n", label,
params,
HCC_PGM_FRAMELISTLEN(params) ? "256/512/1024" : "1024",
HCC_CANPARK(params) ? " park" : "");
}

static void __maybe_unused
-dbg_qtd(const char *label, struct fotg210_hcd *fotg210, struct fotg210_qtd *qtd)
+dbg_qtd(const char *label, struct fhcd2xx_hcd *fhcd2xx, struct fhcd2xx_qtd *qtd)
{
- fotg210_dbg(fotg210, "%s td %p n%08x %08x t%08x p0=%08x\n", label, qtd,
- hc32_to_cpup(fotg210, &qtd->hw_next),
- hc32_to_cpup(fotg210, &qtd->hw_alt_next),
- hc32_to_cpup(fotg210, &qtd->hw_token),
- hc32_to_cpup(fotg210, &qtd->hw_buf[0]));
+ fhcd2xx_dbg(fhcd2xx, "%s td %p n%08x %08x t%08x p0=%08x\n", label, qtd,
+ hc32_to_cpup(fhcd2xx, &qtd->hw_next),
+ hc32_to_cpup(fhcd2xx, &qtd->hw_alt_next),
+ hc32_to_cpup(fhcd2xx, &qtd->hw_token),
+ hc32_to_cpup(fhcd2xx, &qtd->hw_buf[0]));
if (qtd->hw_buf[1])
- fotg210_dbg(fotg210, " p1=%08x p2=%08x p3=%08x p4=%08x\n",
- hc32_to_cpup(fotg210, &qtd->hw_buf[1]),
- hc32_to_cpup(fotg210, &qtd->hw_buf[2]),
- hc32_to_cpup(fotg210, &qtd->hw_buf[3]),
- hc32_to_cpup(fotg210, &qtd->hw_buf[4]));
+ fhcd2xx_dbg(fhcd2xx, " p1=%08x p2=%08x p3=%08x p4=%08x\n",
+ hc32_to_cpup(fhcd2xx, &qtd->hw_buf[1]),
+ hc32_to_cpup(fhcd2xx, &qtd->hw_buf[2]),
+ hc32_to_cpup(fhcd2xx, &qtd->hw_buf[3]),
+ hc32_to_cpup(fhcd2xx, &qtd->hw_buf[4]));
}

static void __maybe_unused
-dbg_qh(const char *label, struct fotg210_hcd *fotg210, struct fotg210_qh *qh)
+dbg_qh(const char *label, struct fhcd2xx_hcd *fhcd2xx, struct fhcd2xx_qh *qh)
{
- struct fotg210_qh_hw *hw = qh->hw;
+ struct fhcd2xx_qh_hw *hw = qh->hw;

- fotg210_dbg(fotg210, "%s qh %p n%08x info %x %x qtd %x\n", label, qh,
+ fhcd2xx_dbg(fhcd2xx, "%s qh %p n%08x info %x %x qtd %x\n", label, qh,
hw->hw_next, hw->hw_info1, hw->hw_info2, hw->hw_current);

- dbg_qtd("overlay", fotg210, (struct fotg210_qtd *) &hw->hw_qtd_next);
+ dbg_qtd("overlay", fhcd2xx, (struct fhcd2xx_qtd *) &hw->hw_qtd_next);
}

static void __maybe_unused
-dbg_itd(const char *label, struct fotg210_hcd *fotg210, struct fotg210_itd *itd)
+dbg_itd(const char *label, struct fhcd2xx_hcd *fhcd2xx, struct fhcd2xx_itd *itd)
{
- fotg210_dbg(fotg210, "%s[%d] itd %p, next %08x, urb %p\n", label,
- itd->frame, itd, hc32_to_cpu(fotg210, itd->hw_next),
+ fhcd2xx_dbg(fhcd2xx, "%s[%d] itd %p, next %08x, urb %p\n", label,
+ itd->frame, itd, hc32_to_cpu(fhcd2xx, itd->hw_next),
itd->urb);

- fotg210_dbg(fotg210,
+ fhcd2xx_dbg(fhcd2xx,
" trans: %08x %08x %08x %08x %08x %08x %08x %08x\n",
- hc32_to_cpu(fotg210, itd->hw_transaction[0]),
- hc32_to_cpu(fotg210, itd->hw_transaction[1]),
- hc32_to_cpu(fotg210, itd->hw_transaction[2]),
- hc32_to_cpu(fotg210, itd->hw_transaction[3]),
- hc32_to_cpu(fotg210, itd->hw_transaction[4]),
- hc32_to_cpu(fotg210, itd->hw_transaction[5]),
- hc32_to_cpu(fotg210, itd->hw_transaction[6]),
- hc32_to_cpu(fotg210, itd->hw_transaction[7]));
-
- fotg210_dbg(fotg210,
+ hc32_to_cpu(fhcd2xx, itd->hw_transaction[0]),
+ hc32_to_cpu(fhcd2xx, itd->hw_transaction[1]),
+ hc32_to_cpu(fhcd2xx, itd->hw_transaction[2]),
+ hc32_to_cpu(fhcd2xx, itd->hw_transaction[3]),
+ hc32_to_cpu(fhcd2xx, itd->hw_transaction[4]),
+ hc32_to_cpu(fhcd2xx, itd->hw_transaction[5]),
+ hc32_to_cpu(fhcd2xx, itd->hw_transaction[6]),
+ hc32_to_cpu(fhcd2xx, itd->hw_transaction[7]));
+
+ fhcd2xx_dbg(fhcd2xx,
" buf: %08x %08x %08x %08x %08x %08x %08x\n",
- hc32_to_cpu(fotg210, itd->hw_bufp[0]),
- hc32_to_cpu(fotg210, itd->hw_bufp[1]),
- hc32_to_cpu(fotg210, itd->hw_bufp[2]),
- hc32_to_cpu(fotg210, itd->hw_bufp[3]),
- hc32_to_cpu(fotg210, itd->hw_bufp[4]),
- hc32_to_cpu(fotg210, itd->hw_bufp[5]),
- hc32_to_cpu(fotg210, itd->hw_bufp[6]));
-
- fotg210_dbg(fotg210, " index: %d %d %d %d %d %d %d %d\n",
+ hc32_to_cpu(fhcd2xx, itd->hw_bufp[0]),
+ hc32_to_cpu(fhcd2xx, itd->hw_bufp[1]),
+ hc32_to_cpu(fhcd2xx, itd->hw_bufp[2]),
+ hc32_to_cpu(fhcd2xx, itd->hw_bufp[3]),
+ hc32_to_cpu(fhcd2xx, itd->hw_bufp[4]),
+ hc32_to_cpu(fhcd2xx, itd->hw_bufp[5]),
+ hc32_to_cpu(fhcd2xx, itd->hw_bufp[6]));
+
+ fhcd2xx_dbg(fhcd2xx, " index: %d %d %d %d %d %d %d %d\n",
itd->index[0], itd->index[1], itd->index[2],
itd->index[3], itd->index[4], itd->index[5],
itd->index[6], itd->index[7]);
@@ -271,21 +271,21 @@ static char *dbg_port_buf(char *buf, unsigned len, const char *label, int port,
}

/* functions have the "wrong" filename when they're output... */
-#define dbg_status(fotg210, label, status) { \
+#define dbg_status(fhcd2xx, label, status) { \
char _buf[80]; \
dbg_status_buf(_buf, sizeof(_buf), label, status); \
- fotg210_dbg(fotg210, "%s\n", _buf); \
+ fhcd2xx_dbg(fhcd2xx, "%s\n", _buf); \
}

-#define dbg_cmd(fotg210, label, command) { \
+#define dbg_cmd(fhcd2xx, label, command) { \
char _buf[80]; \
dbg_command_buf(_buf, sizeof(_buf), label, command); \
- fotg210_dbg(fotg210, "%s\n", _buf); \
+ fhcd2xx_dbg(fhcd2xx, "%s\n", _buf); \
}

-#define dbg_port(fotg210, label, port, status) { \
+#define dbg_port(fhcd2xx, label, port, status) { \
char _buf[80]; \
- fotg210_dbg(fotg210, "%s\n", \
+ fhcd2xx_dbg(fhcd2xx, "%s\n", \
dbg_port_buf(_buf, sizeof(_buf), label, port, status)); \
}

@@ -320,7 +320,7 @@ static const struct file_operations debug_registers_fops = {
.llseek = default_llseek,
};

-static struct dentry *fotg210_debug_root;
+static struct dentry *fhcd2xx_debug_root;

struct debug_buffer {
ssize_t (*fill_func)(struct debug_buffer *); /* fill method */
@@ -348,9 +348,9 @@ static inline char speed_char(u32 scratch)
}
}

-static inline char token_mark(struct fotg210_hcd *fotg210, __hc32 token)
+static inline char token_mark(struct fhcd2xx_hcd *fhcd2xx, __hc32 token)
{
- __u32 v = hc32_to_cpu(fotg210, token);
+ __u32 v = hc32_to_cpu(fhcd2xx, token);

if (v & QTD_STS_ACTIVE)
return '*';
@@ -362,58 +362,58 @@ static inline char token_mark(struct fotg210_hcd *fotg210, __hc32 token)
return '/';
}

-static void qh_lines(struct fotg210_hcd *fotg210, struct fotg210_qh *qh,
+static void qh_lines(struct fhcd2xx_hcd *fhcd2xx, struct fhcd2xx_qh *qh,
char **nextp, unsigned *sizep)
{
u32 scratch;
u32 hw_curr;
- struct fotg210_qtd *td;
+ struct fhcd2xx_qtd *td;
unsigned temp;
unsigned size = *sizep;
char *next = *nextp;
char mark;
char *tmp;

- __le32 list_end = FOTG210_LIST_END(fotg210);
- struct fotg210_qh_hw *hw = qh->hw;
+ __le32 list_end = FHCD2XX_LIST_END(fhcd2xx);
+ struct fhcd2xx_qh_hw *hw = qh->hw;

if (hw->hw_qtd_next == list_end) /* NEC does this */
mark = '@';
else
- mark = token_mark(fotg210, hw->hw_token);
+ mark = token_mark(fhcd2xx, hw->hw_token);
if (mark == '/') { /* qh_alt_next controls qh advance? */
- if ((hw->hw_alt_next & QTD_MASK(fotg210)) ==
- fotg210->async->hw->hw_alt_next)
+ if ((hw->hw_alt_next & QTD_MASK(fhcd2xx)) ==
+ fhcd2xx->async->hw->hw_alt_next)
mark = '#'; /* blocked */
else if (hw->hw_alt_next == list_end)
mark = '.'; /* use hw_qtd_next */
/* else alt_next points to some other qtd */
}
- scratch = hc32_to_cpup(fotg210, &hw->hw_info1);
- hw_curr = (mark == '*') ? hc32_to_cpup(fotg210, &hw->hw_current) : 0;
+ scratch = hc32_to_cpup(fhcd2xx, &hw->hw_info1);
+ hw_curr = (mark == '*') ? hc32_to_cpup(fhcd2xx, &hw->hw_current) : 0;
temp = scnprintf(next, size,
"qh/%p dev%d %cs ep%d %08x %08x(%08x%c %s nak%d)",
qh, scratch & 0x007f,
speed_char(scratch),
(scratch >> 8) & 0x000f,
- scratch, hc32_to_cpup(fotg210, &hw->hw_info2),
- hc32_to_cpup(fotg210, &hw->hw_token), mark,
- (cpu_to_hc32(fotg210, QTD_TOGGLE) & hw->hw_token)
+ scratch, hc32_to_cpup(fhcd2xx, &hw->hw_info2),
+ hc32_to_cpup(fhcd2xx, &hw->hw_token), mark,
+ (cpu_to_hc32(fhcd2xx, QTD_TOGGLE) & hw->hw_token)
? "data1" : "data0",
- (hc32_to_cpup(fotg210, &hw->hw_alt_next) >> 1) & 0x0f);
+ (hc32_to_cpup(fhcd2xx, &hw->hw_alt_next) >> 1) & 0x0f);
size -= temp;
next += temp;

/* hc may be modifying the list as we read it ... */
list_for_each_entry(td, &qh->qtd_list, qtd_list) {
- scratch = hc32_to_cpup(fotg210, &td->hw_token);
+ scratch = hc32_to_cpup(fhcd2xx, &td->hw_token);
mark = ' ';
if (hw_curr == td->qtd_dma)
mark = '*';
- else if (hw->hw_qtd_next == cpu_to_hc32(fotg210, td->qtd_dma))
+ else if (hw->hw_qtd_next == cpu_to_hc32(fhcd2xx, td->qtd_dma))
mark = '+';
else if (QTD_LENGTH(scratch)) {
- if (td->hw_alt_next == fotg210->async->hw->hw_alt_next)
+ if (td->hw_alt_next == fhcd2xx->async->hw->hw_alt_next)
mark = '#';
else if (td->hw_alt_next != list_end)
mark = '/';
@@ -462,14 +462,14 @@ done:
static ssize_t fill_async_buffer(struct debug_buffer *buf)
{
struct usb_hcd *hcd;
- struct fotg210_hcd *fotg210;
+ struct fhcd2xx_hcd *fhcd2xx;
unsigned long flags;
unsigned temp, size;
char *next;
- struct fotg210_qh *qh;
+ struct fhcd2xx_qh *qh;

hcd = bus_to_hcd(buf->bus);
- fotg210 = hcd_to_fotg210(hcd);
+ fhcd2xx = hcd_to_fhcd2xx(hcd);
next = buf->output_buf;
size = buf->alloc_size;

@@ -479,39 +479,39 @@ static ssize_t fill_async_buffer(struct debug_buffer *buf)
* usually empty except for long-term bulk reads, or head.
* one QH per line, and TDs we know about
*/
- spin_lock_irqsave(&fotg210->lock, flags);
- for (qh = fotg210->async->qh_next.qh; size > 0 && qh;
+ spin_lock_irqsave(&fhcd2xx->lock, flags);
+ for (qh = fhcd2xx->async->qh_next.qh; size > 0 && qh;
qh = qh->qh_next.qh)
- qh_lines(fotg210, qh, &next, &size);
- if (fotg210->async_unlink && size > 0) {
+ qh_lines(fhcd2xx, qh, &next, &size);
+ if (fhcd2xx->async_unlink && size > 0) {
temp = scnprintf(next, size, "\nunlink =\n");
size -= temp;
next += temp;

- for (qh = fotg210->async_unlink; size > 0 && qh;
+ for (qh = fhcd2xx->async_unlink; size > 0 && qh;
qh = qh->unlink_next)
- qh_lines(fotg210, qh, &next, &size);
+ qh_lines(fhcd2xx, qh, &next, &size);
}
- spin_unlock_irqrestore(&fotg210->lock, flags);
+ spin_unlock_irqrestore(&fhcd2xx->lock, flags);

return strlen(buf->output_buf);
}

/* count tds, get ep direction */
static inline unsigned output_buf_tds_dir(char *buf,
- struct fotg210_hcd *fotg210,
- struct fotg210_qh_hw *hw,
- struct fotg210_qh *qh, unsigned size)
+ struct fhcd2xx_hcd *fhcd2xx,
+ struct fhcd2xx_qh_hw *hw,
+ struct fhcd2xx_qh *qh, unsigned size)
{
- u32 scratch = hc32_to_cpup(fotg210, &hw->hw_info1);
- struct fotg210_qtd *qtd;
+ u32 scratch = hc32_to_cpup(fhcd2xx, &hw->hw_info1);
+ struct fhcd2xx_qtd *qtd;
char *type = "";
unsigned temp = 0;

/* count tds, get ep direction */
list_for_each_entry(qtd, &qh->qtd_list, qtd_list) {
temp++;
- switch (0x03 & (hc32_to_cpu(fotg210, qtd->hw_token) >> 8)) {
+ switch (0x03 & (hc32_to_cpu(fhcd2xx, qtd->hw_token) >> 8)) {
case 0:
type = "out";
continue;
@@ -531,9 +531,9 @@ static inline unsigned output_buf_tds_dir(char *buf,
static ssize_t fill_periodic_buffer(struct debug_buffer *buf)
{
struct usb_hcd *hcd;
- struct fotg210_hcd *fotg210;
+ struct fhcd2xx_hcd *fhcd2xx;
unsigned long flags;
- union fotg210_shadow p, *seen;
+ union fhcd2xx_shadow p, *seen;
unsigned temp, size, seen_count;
char *next;
unsigned i;
@@ -546,38 +546,38 @@ static ssize_t fill_periodic_buffer(struct debug_buffer *buf)
seen_count = 0;

hcd = bus_to_hcd(buf->bus);
- fotg210 = hcd_to_fotg210(hcd);
+ fhcd2xx = hcd_to_fhcd2xx(hcd);
next = buf->output_buf;
size = buf->alloc_size;

- temp = scnprintf(next, size, "size = %d\n", fotg210->periodic_size);
+ temp = scnprintf(next, size, "size = %d\n", fhcd2xx->periodic_size);
size -= temp;
next += temp;

/* dump a snapshot of the periodic schedule.
* iso changes, interrupt usually doesn't.
*/
- spin_lock_irqsave(&fotg210->lock, flags);
- for (i = 0; i < fotg210->periodic_size; i++) {
- p = fotg210->pshadow[i];
+ spin_lock_irqsave(&fhcd2xx->lock, flags);
+ for (i = 0; i < fhcd2xx->periodic_size; i++) {
+ p = fhcd2xx->pshadow[i];
if (likely(!p.ptr))
continue;

- tag = Q_NEXT_TYPE(fotg210, fotg210->periodic[i]);
+ tag = Q_NEXT_TYPE(fhcd2xx, fhcd2xx->periodic[i]);

temp = scnprintf(next, size, "%4d: ", i);
size -= temp;
next += temp;

do {
- struct fotg210_qh_hw *hw;
+ struct fhcd2xx_qh_hw *hw;

- switch (hc32_to_cpu(fotg210, tag)) {
+ switch (hc32_to_cpu(fhcd2xx, tag)) {
case Q_TYPE_QH:
hw = p.qh->hw;
temp = scnprintf(next, size, " qh%d-%04x/%p",
p.qh->period,
- hc32_to_cpup(fotg210,
+ hc32_to_cpup(fhcd2xx,
&hw->hw_info2)
/* uframe masks */
& (QH_CMASK | QH_SMASK),
@@ -599,27 +599,27 @@ static ssize_t fill_periodic_buffer(struct debug_buffer *buf)
/* show more info the first time around */
if (temp == seen_count) {
temp = output_buf_tds_dir(next,
- fotg210, hw,
+ fhcd2xx, hw,
p.qh, size);

if (seen_count < DBG_SCHED_LIMIT)
seen[seen_count++].qh = p.qh;
} else
temp = 0;
- tag = Q_NEXT_TYPE(fotg210, hw->hw_next);
+ tag = Q_NEXT_TYPE(fhcd2xx, hw->hw_next);
p = p.qh->qh_next;
break;
case Q_TYPE_FSTN:
temp = scnprintf(next, size,
" fstn-%8x/%p", p.fstn->hw_prev,
p.fstn);
- tag = Q_NEXT_TYPE(fotg210, p.fstn->hw_next);
+ tag = Q_NEXT_TYPE(fhcd2xx, p.fstn->hw_next);
p = p.fstn->fstn_next;
break;
case Q_TYPE_ITD:
temp = scnprintf(next, size,
" itd/%p", p.itd);
- tag = Q_NEXT_TYPE(fotg210, p.itd->hw_next);
+ tag = Q_NEXT_TYPE(fhcd2xx, p.itd->hw_next);
p = p.itd->itd_next;
break;
}
@@ -631,23 +631,23 @@ static ssize_t fill_periodic_buffer(struct debug_buffer *buf)
size -= temp;
next += temp;
}
- spin_unlock_irqrestore(&fotg210->lock, flags);
+ spin_unlock_irqrestore(&fhcd2xx->lock, flags);
kfree(seen);

return buf->alloc_size - size;
}
#undef DBG_SCHED_LIMIT

-static const char *rh_state_string(struct fotg210_hcd *fotg210)
+static const char *rh_state_string(struct fhcd2xx_hcd *fhcd2xx)
{
- switch (fotg210->rh_state) {
- case FOTG210_RH_HALTED:
+ switch (fhcd2xx->rh_state) {
+ case FHCD2XX_RH_HALTED:
return "halted";
- case FOTG210_RH_SUSPENDED:
+ case FHCD2XX_RH_SUSPENDED:
return "suspended";
- case FOTG210_RH_RUNNING:
+ case FHCD2XX_RH_RUNNING:
return "running";
- case FOTG210_RH_STOPPING:
+ case FHCD2XX_RH_STOPPING:
return "stopping";
}
return "?";
@@ -656,7 +656,7 @@ static const char *rh_state_string(struct fotg210_hcd *fotg210)
static ssize_t fill_registers_buffer(struct debug_buffer *buf)
{
struct usb_hcd *hcd;
- struct fotg210_hcd *fotg210;
+ struct fhcd2xx_hcd *fhcd2xx;
unsigned long flags;
unsigned temp, size, i;
char *next, scratch[80];
@@ -664,11 +664,11 @@ static ssize_t fill_registers_buffer(struct debug_buffer *buf)
static const char label[] = "";

hcd = bus_to_hcd(buf->bus);
- fotg210 = hcd_to_fotg210(hcd);
+ fhcd2xx = hcd_to_fhcd2xx(hcd);
next = buf->output_buf;
size = buf->alloc_size;

- spin_lock_irqsave(&fotg210->lock, flags);
+ spin_lock_irqsave(&fhcd2xx->lock, flags);

if (!HCD_HW_ACCESSIBLE(hcd)) {
size = scnprintf(next, size,
@@ -682,8 +682,8 @@ static ssize_t fill_registers_buffer(struct debug_buffer *buf)
}

/* Capability Registers */
- i = HC_VERSION(fotg210, fotg210_readl(fotg210,
- &fotg210->caps->hc_capbase));
+ i = HC_VERSION(fhcd2xx, fhcd2xx_readl(fhcd2xx,
+ &fhcd2xx->caps->hc_capbase));
temp = scnprintf(next, size,
"bus %s, device %s\n"
"%s\n"
@@ -691,68 +691,68 @@ static ssize_t fill_registers_buffer(struct debug_buffer *buf)
hcd->self.controller->bus->name,
dev_name(hcd->self.controller),
hcd->product_desc,
- i >> 8, i & 0x0ff, rh_state_string(fotg210));
+ i >> 8, i & 0x0ff, rh_state_string(fhcd2xx));
size -= temp;
next += temp;

/* FIXME interpret both types of params */
- i = fotg210_readl(fotg210, &fotg210->caps->hcs_params);
+ i = fhcd2xx_readl(fhcd2xx, &fhcd2xx->caps->hcs_params);
temp = scnprintf(next, size, "structural params 0x%08x\n", i);
size -= temp;
next += temp;

- i = fotg210_readl(fotg210, &fotg210->caps->hcc_params);
+ i = fhcd2xx_readl(fhcd2xx, &fhcd2xx->caps->hcc_params);
temp = scnprintf(next, size, "capability params 0x%08x\n", i);
size -= temp;
next += temp;

/* Operational Registers */
temp = dbg_status_buf(scratch, sizeof(scratch), label,
- fotg210_readl(fotg210, &fotg210->regs->status));
+ fhcd2xx_readl(fhcd2xx, &fhcd2xx->regs->status));
temp = scnprintf(next, size, fmt, temp, scratch);
size -= temp;
next += temp;

temp = dbg_command_buf(scratch, sizeof(scratch), label,
- fotg210_readl(fotg210, &fotg210->regs->command));
+ fhcd2xx_readl(fhcd2xx, &fhcd2xx->regs->command));
temp = scnprintf(next, size, fmt, temp, scratch);
size -= temp;
next += temp;

temp = dbg_intr_buf(scratch, sizeof(scratch), label,
- fotg210_readl(fotg210, &fotg210->regs->intr_enable));
+ fhcd2xx_readl(fhcd2xx, &fhcd2xx->regs->intr_enable));
temp = scnprintf(next, size, fmt, temp, scratch);
size -= temp;
next += temp;

temp = scnprintf(next, size, "uframe %04x\n",
- fotg210_read_frame_index(fotg210));
+ fhcd2xx_read_frame_index(fhcd2xx));
size -= temp;
next += temp;

- if (fotg210->async_unlink) {
+ if (fhcd2xx->async_unlink) {
temp = scnprintf(next, size, "async unlink qh %p\n",
- fotg210->async_unlink);
+ fhcd2xx->async_unlink);
size -= temp;
next += temp;
}

-#ifdef FOTG210_STATS
+#ifdef FHCD2XX_STATS
temp = scnprintf(next, size,
"irq normal %ld err %ld iaa %ld(lost %ld)\n",
- fotg210->stats.normal, fotg210->stats.error, fotg210->stats.iaa,
- fotg210->stats.lost_iaa);
+ fhcd2xx->stats.normal, fhcd2xx->stats.error, fhcd2xx->stats.iaa,
+ fhcd2xx->stats.lost_iaa);
size -= temp;
next += temp;

temp = scnprintf(next, size, "complete %ld unlink %ld\n",
- fotg210->stats.complete, fotg210->stats.unlink);
+ fhcd2xx->stats.complete, fhcd2xx->stats.unlink);
size -= temp;
next += temp;
#endif

done:
- spin_unlock_irqrestore(&fotg210->lock, flags);
+ spin_unlock_irqrestore(&fhcd2xx->lock, flags);

return buf->alloc_size - size;
}
@@ -860,36 +860,36 @@ static int debug_registers_open(struct inode *inode, struct file *file)
return file->private_data ? 0 : -ENOMEM;
}

-static inline void create_debug_files(struct fotg210_hcd *fotg210)
+static inline void create_debug_files(struct fhcd2xx_hcd *fhcd2xx)
{
- struct usb_bus *bus = &fotg210_to_hcd(fotg210)->self;
+ struct usb_bus *bus = &fhcd2xx_to_hcd(fhcd2xx)->self;

- fotg210->debug_dir = debugfs_create_dir(bus->bus_name,
- fotg210_debug_root);
- if (!fotg210->debug_dir)
+ fhcd2xx->debug_dir = debugfs_create_dir(bus->bus_name,
+ fhcd2xx_debug_root);
+ if (!fhcd2xx->debug_dir)
return;

- if (!debugfs_create_file("async", S_IRUGO, fotg210->debug_dir, bus,
+ if (!debugfs_create_file("async", S_IRUGO, fhcd2xx->debug_dir, bus,
&debug_async_fops))
goto file_error;

- if (!debugfs_create_file("periodic", S_IRUGO, fotg210->debug_dir, bus,
+ if (!debugfs_create_file("periodic", S_IRUGO, fhcd2xx->debug_dir, bus,
&debug_periodic_fops))
goto file_error;

- if (!debugfs_create_file("registers", S_IRUGO, fotg210->debug_dir, bus,
+ if (!debugfs_create_file("registers", S_IRUGO, fhcd2xx->debug_dir, bus,
&debug_registers_fops))
goto file_error;

return;

file_error:
- debugfs_remove_recursive(fotg210->debug_dir);
+ debugfs_remove_recursive(fhcd2xx->debug_dir);
}

-static inline void remove_debug_files(struct fotg210_hcd *fotg210)
+static inline void remove_debug_files(struct fhcd2xx_hcd *fhcd2xx)
{
- debugfs_remove_recursive(fotg210->debug_dir);
+ debugfs_remove_recursive(fhcd2xx->debug_dir);
}

/*
@@ -909,13 +909,13 @@ static inline void remove_debug_files(struct fotg210_hcd *fotg210)
* before driver shutdown. But it also seems to be caused by bugs in cardbus
* bridge shutdown: shutting down the bridge before the devices using it.
*/
-static int handshake(struct fotg210_hcd *fotg210, void __iomem *ptr,
+static int handshake(struct fhcd2xx_hcd *fhcd2xx, void __iomem *ptr,
u32 mask, u32 done, int usec)
{
u32 result;

do {
- result = fotg210_readl(fotg210, ptr);
+ result = fhcd2xx_readl(fhcd2xx, ptr);
if (result == ~(u32)0) /* card removed */
return -ENODEV;
result &= mask;
@@ -931,28 +931,28 @@ static int handshake(struct fotg210_hcd *fotg210, void __iomem *ptr,
* Force HC to halt state from unknown (EHCI spec section 2.3).
* Must be called with interrupts enabled and the lock not held.
*/
-static int fotg210_halt(struct fotg210_hcd *fotg210)
+static int fhcd2xx_halt(struct fhcd2xx_hcd *fhcd2xx)
{
u32 temp;

- spin_lock_irq(&fotg210->lock);
+ spin_lock_irq(&fhcd2xx->lock);

/* disable any irqs left enabled by previous code */
- fotg210_writel(fotg210, 0, &fotg210->regs->intr_enable);
+ fhcd2xx_writel(fhcd2xx, 0, &fhcd2xx->regs->intr_enable);

/*
- * This routine gets called during probe before fotg210->command
+ * This routine gets called during probe before fhcd2xx->command
* has been initialized, so we can't rely on its value.
*/
- fotg210->command &= ~CMD_RUN;
- temp = fotg210_readl(fotg210, &fotg210->regs->command);
+ fhcd2xx->command &= ~CMD_RUN;
+ temp = fhcd2xx_readl(fhcd2xx, &fhcd2xx->regs->command);
temp &= ~(CMD_RUN | CMD_IAAD);
- fotg210_writel(fotg210, temp, &fotg210->regs->command);
+ fhcd2xx_writel(fhcd2xx, temp, &fhcd2xx->regs->command);

- spin_unlock_irq(&fotg210->lock);
- synchronize_irq(fotg210_to_hcd(fotg210)->irq);
+ spin_unlock_irq(&fhcd2xx->lock);
+ synchronize_irq(fhcd2xx_to_hcd(fhcd2xx)->irq);

- return handshake(fotg210, &fotg210->regs->status,
+ return handshake(fhcd2xx, &fhcd2xx->regs->status,
STS_HALT, STS_HALT, 16 * 125);
}

@@ -960,33 +960,33 @@ static int fotg210_halt(struct fotg210_hcd *fotg210)
* Reset a non-running (STS_HALT == 1) controller.
* Must be called with interrupts enabled and the lock not held.
*/
-static int fotg210_reset(struct fotg210_hcd *fotg210)
+static int fhcd2xx_reset(struct fhcd2xx_hcd *fhcd2xx)
{
int retval;
- u32 command = fotg210_readl(fotg210, &fotg210->regs->command);
+ u32 command = fhcd2xx_readl(fhcd2xx, &fhcd2xx->regs->command);

/* If the EHCI debug controller is active, special care must be
* taken before and after a host controller reset
*/
- if (fotg210->debug && !dbgp_reset_prep(fotg210_to_hcd(fotg210)))
- fotg210->debug = NULL;
+ if (fhcd2xx->debug && !dbgp_reset_prep(fhcd2xx_to_hcd(fhcd2xx)))
+ fhcd2xx->debug = NULL;

command |= CMD_RESET;
- dbg_cmd(fotg210, "reset", command);
- fotg210_writel(fotg210, command, &fotg210->regs->command);
- fotg210->rh_state = FOTG210_RH_HALTED;
- fotg210->next_statechange = jiffies;
- retval = handshake(fotg210, &fotg210->regs->command,
+ dbg_cmd(fhcd2xx, "reset", command);
+ fhcd2xx_writel(fhcd2xx, command, &fhcd2xx->regs->command);
+ fhcd2xx->rh_state = FHCD2XX_RH_HALTED;
+ fhcd2xx->next_statechange = jiffies;
+ retval = handshake(fhcd2xx, &fhcd2xx->regs->command,
CMD_RESET, 0, 250 * 1000);

if (retval)
return retval;

- if (fotg210->debug)
- dbgp_external_startup(fotg210_to_hcd(fotg210));
+ if (fhcd2xx->debug)
+ dbgp_external_startup(fhcd2xx_to_hcd(fhcd2xx));

- fotg210->port_c_suspend = fotg210->suspended_ports =
- fotg210->resuming_ports = 0;
+ fhcd2xx->port_c_suspend = fhcd2xx->suspended_ports =
+ fhcd2xx->resuming_ports = 0;
return retval;
}

@@ -994,69 +994,69 @@ static int fotg210_reset(struct fotg210_hcd *fotg210)
* Idle the controller (turn off the schedules).
* Must be called with interrupts enabled and the lock not held.
*/
-static void fotg210_quiesce(struct fotg210_hcd *fotg210)
+static void fhcd2xx_quiesce(struct fhcd2xx_hcd *fhcd2xx)
{
u32 temp;

- if (fotg210->rh_state != FOTG210_RH_RUNNING)
+ if (fhcd2xx->rh_state != FHCD2XX_RH_RUNNING)
return;

/* wait for any schedule enables/disables to take effect */
- temp = (fotg210->command << 10) & (STS_ASS | STS_PSS);
- handshake(fotg210, &fotg210->regs->status, STS_ASS | STS_PSS, temp,
+ temp = (fhcd2xx->command << 10) & (STS_ASS | STS_PSS);
+ handshake(fhcd2xx, &fhcd2xx->regs->status, STS_ASS | STS_PSS, temp,
16 * 125);

/* then disable anything that's still active */
- spin_lock_irq(&fotg210->lock);
- fotg210->command &= ~(CMD_ASE | CMD_PSE);
- fotg210_writel(fotg210, fotg210->command, &fotg210->regs->command);
- spin_unlock_irq(&fotg210->lock);
+ spin_lock_irq(&fhcd2xx->lock);
+ fhcd2xx->command &= ~(CMD_ASE | CMD_PSE);
+ fhcd2xx_writel(fhcd2xx, fhcd2xx->command, &fhcd2xx->regs->command);
+ spin_unlock_irq(&fhcd2xx->lock);

/* hardware can take 16 microframes to turn off ... */
- handshake(fotg210, &fotg210->regs->status, STS_ASS | STS_PSS, 0,
+ handshake(fhcd2xx, &fhcd2xx->regs->status, STS_ASS | STS_PSS, 0,
16 * 125);
}

-static void end_unlink_async(struct fotg210_hcd *fotg210);
-static void unlink_empty_async(struct fotg210_hcd *fotg210);
-static void fotg210_work(struct fotg210_hcd *fotg210);
-static void start_unlink_intr(struct fotg210_hcd *fotg210,
- struct fotg210_qh *qh);
-static void end_unlink_intr(struct fotg210_hcd *fotg210, struct fotg210_qh *qh);
+static void end_unlink_async(struct fhcd2xx_hcd *fhcd2xx);
+static void unlink_empty_async(struct fhcd2xx_hcd *fhcd2xx);
+static void fhcd2xx_work(struct fhcd2xx_hcd *fhcd2xx);
+static void start_unlink_intr(struct fhcd2xx_hcd *fhcd2xx,
+ struct fhcd2xx_qh *qh);
+static void end_unlink_intr(struct fhcd2xx_hcd *fhcd2xx, struct fhcd2xx_qh *qh);

/* Set a bit in the USBCMD register */
-static void fotg210_set_command_bit(struct fotg210_hcd *fotg210, u32 bit)
+static void fhcd2xx_set_command_bit(struct fhcd2xx_hcd *fhcd2xx, u32 bit)
{
- fotg210->command |= bit;
- fotg210_writel(fotg210, fotg210->command, &fotg210->regs->command);
+ fhcd2xx->command |= bit;
+ fhcd2xx_writel(fhcd2xx, fhcd2xx->command, &fhcd2xx->regs->command);

/* unblock posted write */
- fotg210_readl(fotg210, &fotg210->regs->command);
+ fhcd2xx_readl(fhcd2xx, &fhcd2xx->regs->command);
}

/* Clear a bit in the USBCMD register */
-static void fotg210_clear_command_bit(struct fotg210_hcd *fotg210, u32 bit)
+static void fhcd2xx_clear_command_bit(struct fhcd2xx_hcd *fhcd2xx, u32 bit)
{
- fotg210->command &= ~bit;
- fotg210_writel(fotg210, fotg210->command, &fotg210->regs->command);
+ fhcd2xx->command &= ~bit;
+ fhcd2xx_writel(fhcd2xx, fhcd2xx->command, &fhcd2xx->regs->command);

/* unblock posted write */
- fotg210_readl(fotg210, &fotg210->regs->command);
+ fhcd2xx_readl(fhcd2xx, &fhcd2xx->regs->command);
}

/*
* EHCI timer support... Now using hrtimers.
*
- * Lots of different events are triggered from fotg210->hrtimer. Whenever
+ * Lots of different events are triggered from fhcd2xx->hrtimer. Whenever
* the timer routine runs, it checks each possible event; events that are
* currently enabled and whose expiration time has passed get handled.
* The set of enabled events is stored as a collection of bitflags in
- * fotg210->enabled_hrtimer_events, and they are numbered in order of
+ * fhcd2xx->enabled_hrtimer_events, and they are numbered in order of
* increasing delay values (ranging between 1 ms and 100 ms).
*
* Rather than implementing a sorted list or tree of all pending events,
* we keep track only of the lowest-numbered pending event, in
- * fotg210->next_hrtimer_event. Whenever fotg210->hrtimer gets restarted, its
+ * fhcd2xx->next_hrtimer_event. Whenever fhcd2xx->hrtimer gets restarted, its
* expiration time is set to the timeout value for this event.
*
* As a result, events might not get handled right away; the actual delay
@@ -1070,166 +1070,166 @@ static void fotg210_clear_command_bit(struct fotg210_hcd *fotg210, u32 bit)
/*
* Delay lengths for the hrtimer event types.
* Keep this list sorted by delay length, in the same order as
- * the event types indexed by enum fotg210_hrtimer_event in fotg210.h.
+ * the event types indexed by enum fhcd2xx_hrtimer_event in fhcd2xx.h.
*/
static unsigned event_delays_ns[] = {
- 1 * NSEC_PER_MSEC, /* FOTG210_HRTIMER_POLL_ASS */
- 1 * NSEC_PER_MSEC, /* FOTG210_HRTIMER_POLL_PSS */
- 1 * NSEC_PER_MSEC, /* FOTG210_HRTIMER_POLL_DEAD */
- 1125 * NSEC_PER_USEC, /* FOTG210_HRTIMER_UNLINK_INTR */
- 2 * NSEC_PER_MSEC, /* FOTG210_HRTIMER_FREE_ITDS */
- 6 * NSEC_PER_MSEC, /* FOTG210_HRTIMER_ASYNC_UNLINKS */
- 10 * NSEC_PER_MSEC, /* FOTG210_HRTIMER_IAA_WATCHDOG */
- 10 * NSEC_PER_MSEC, /* FOTG210_HRTIMER_DISABLE_PERIODIC */
- 15 * NSEC_PER_MSEC, /* FOTG210_HRTIMER_DISABLE_ASYNC */
- 100 * NSEC_PER_MSEC, /* FOTG210_HRTIMER_IO_WATCHDOG */
+ 1 * NSEC_PER_MSEC, /* FHCD2XX_HRTIMER_POLL_ASS */
+ 1 * NSEC_PER_MSEC, /* FHCD2XX_HRTIMER_POLL_PSS */
+ 1 * NSEC_PER_MSEC, /* FHCD2XX_HRTIMER_POLL_DEAD */
+ 1125 * NSEC_PER_USEC, /* FHCD2XX_HRTIMER_UNLINK_INTR */
+ 2 * NSEC_PER_MSEC, /* FHCD2XX_HRTIMER_FREE_ITDS */
+ 6 * NSEC_PER_MSEC, /* FHCD2XX_HRTIMER_ASYNC_UNLINKS */
+ 10 * NSEC_PER_MSEC, /* FHCD2XX_HRTIMER_IAA_WATCHDOG */
+ 10 * NSEC_PER_MSEC, /* FHCD2XX_HRTIMER_DISABLE_PERIODIC */
+ 15 * NSEC_PER_MSEC, /* FHCD2XX_HRTIMER_DISABLE_ASYNC */
+ 100 * NSEC_PER_MSEC, /* FHCD2XX_HRTIMER_IO_WATCHDOG */
};

/* Enable a pending hrtimer event */
-static void fotg210_enable_event(struct fotg210_hcd *fotg210, unsigned event,
+static void fhcd2xx_enable_event(struct fhcd2xx_hcd *fhcd2xx, unsigned event,
bool resched)
{
- ktime_t *timeout = &fotg210->hr_timeouts[event];
+ ktime_t *timeout = &fhcd2xx->hr_timeouts[event];

if (resched)
*timeout = ktime_add(ktime_get(),
ktime_set(0, event_delays_ns[event]));
- fotg210->enabled_hrtimer_events |= (1 << event);
+ fhcd2xx->enabled_hrtimer_events |= (1 << event);

/* Track only the lowest-numbered pending event */
- if (event < fotg210->next_hrtimer_event) {
- fotg210->next_hrtimer_event = event;
- hrtimer_start_range_ns(&fotg210->hrtimer, *timeout,
+ if (event < fhcd2xx->next_hrtimer_event) {
+ fhcd2xx->next_hrtimer_event = event;
+ hrtimer_start_range_ns(&fhcd2xx->hrtimer, *timeout,
NSEC_PER_MSEC, HRTIMER_MODE_ABS);
}
}

/* Poll the STS_ASS status bit; see when it agrees with CMD_ASE */
-static void fotg210_poll_ASS(struct fotg210_hcd *fotg210)
+static void fhcd2xx_poll_ASS(struct fhcd2xx_hcd *fhcd2xx)
{
unsigned actual, want;

/* Don't enable anything if the controller isn't running (e.g., died) */
- if (fotg210->rh_state != FOTG210_RH_RUNNING)
+ if (fhcd2xx->rh_state != FHCD2XX_RH_RUNNING)
return;

- want = (fotg210->command & CMD_ASE) ? STS_ASS : 0;
- actual = fotg210_readl(fotg210, &fotg210->regs->status) & STS_ASS;
+ want = (fhcd2xx->command & CMD_ASE) ? STS_ASS : 0;
+ actual = fhcd2xx_readl(fhcd2xx, &fhcd2xx->regs->status) & STS_ASS;

if (want != actual) {

/* Poll again later, but give up after about 20 ms */
- if (fotg210->ASS_poll_count++ < 20) {
- fotg210_enable_event(fotg210, FOTG210_HRTIMER_POLL_ASS,
+ if (fhcd2xx->ASS_poll_count++ < 20) {
+ fhcd2xx_enable_event(fhcd2xx, FHCD2XX_HRTIMER_POLL_ASS,
true);
return;
}
- fotg210_dbg(fotg210, "Waited too long for the async schedule status (%x/%x), giving up\n",
+ fhcd2xx_dbg(fhcd2xx, "Waited too long for the async schedule status (%x/%x), giving up\n",
want, actual);
}
- fotg210->ASS_poll_count = 0;
+ fhcd2xx->ASS_poll_count = 0;

/* The status is up-to-date; restart or stop the schedule as needed */
if (want == 0) { /* Stopped */
- if (fotg210->async_count > 0)
- fotg210_set_command_bit(fotg210, CMD_ASE);
+ if (fhcd2xx->async_count > 0)
+ fhcd2xx_set_command_bit(fhcd2xx, CMD_ASE);

} else { /* Running */
- if (fotg210->async_count == 0) {
+ if (fhcd2xx->async_count == 0) {

/* Turn off the schedule after a while */
- fotg210_enable_event(fotg210,
- FOTG210_HRTIMER_DISABLE_ASYNC,
+ fhcd2xx_enable_event(fhcd2xx,
+ FHCD2XX_HRTIMER_DISABLE_ASYNC,
true);
}
}
}

/* Turn off the async schedule after a brief delay */
-static void fotg210_disable_ASE(struct fotg210_hcd *fotg210)
+static void fhcd2xx_disable_ASE(struct fhcd2xx_hcd *fhcd2xx)
{
- fotg210_clear_command_bit(fotg210, CMD_ASE);
+ fhcd2xx_clear_command_bit(fhcd2xx, CMD_ASE);
}

/* Poll the STS_PSS status bit; see when it agrees with CMD_PSE */
-static void fotg210_poll_PSS(struct fotg210_hcd *fotg210)
+static void fhcd2xx_poll_PSS(struct fhcd2xx_hcd *fhcd2xx)
{
unsigned actual, want;

/* Don't do anything if the controller isn't running (e.g., died) */
- if (fotg210->rh_state != FOTG210_RH_RUNNING)
+ if (fhcd2xx->rh_state != FHCD2XX_RH_RUNNING)
return;

- want = (fotg210->command & CMD_PSE) ? STS_PSS : 0;
- actual = fotg210_readl(fotg210, &fotg210->regs->status) & STS_PSS;
+ want = (fhcd2xx->command & CMD_PSE) ? STS_PSS : 0;
+ actual = fhcd2xx_readl(fhcd2xx, &fhcd2xx->regs->status) & STS_PSS;

if (want != actual) {

/* Poll again later, but give up after about 20 ms */
- if (fotg210->PSS_poll_count++ < 20) {
- fotg210_enable_event(fotg210, FOTG210_HRTIMER_POLL_PSS,
+ if (fhcd2xx->PSS_poll_count++ < 20) {
+ fhcd2xx_enable_event(fhcd2xx, FHCD2XX_HRTIMER_POLL_PSS,
true);
return;
}
- fotg210_dbg(fotg210, "Waited too long for the periodic schedule status (%x/%x), giving up\n",
+ fhcd2xx_dbg(fhcd2xx, "Waited too long for the periodic schedule status (%x/%x), giving up\n",
want, actual);
}
- fotg210->PSS_poll_count = 0;
+ fhcd2xx->PSS_poll_count = 0;

/* The status is up-to-date; restart or stop the schedule as needed */
if (want == 0) { /* Stopped */
- if (fotg210->periodic_count > 0)
- fotg210_set_command_bit(fotg210, CMD_PSE);
+ if (fhcd2xx->periodic_count > 0)
+ fhcd2xx_set_command_bit(fhcd2xx, CMD_PSE);

} else { /* Running */
- if (fotg210->periodic_count == 0) {
+ if (fhcd2xx->periodic_count == 0) {

/* Turn off the schedule after a while */
- fotg210_enable_event(fotg210,
- FOTG210_HRTIMER_DISABLE_PERIODIC,
+ fhcd2xx_enable_event(fhcd2xx,
+ FHCD2XX_HRTIMER_DISABLE_PERIODIC,
true);
}
}
}

/* Turn off the periodic schedule after a brief delay */
-static void fotg210_disable_PSE(struct fotg210_hcd *fotg210)
+static void fhcd2xx_disable_PSE(struct fhcd2xx_hcd *fhcd2xx)
{
- fotg210_clear_command_bit(fotg210, CMD_PSE);
+ fhcd2xx_clear_command_bit(fhcd2xx, CMD_PSE);
}

/* Poll the STS_HALT status bit; see when a dead controller stops */
-static void fotg210_handle_controller_death(struct fotg210_hcd *fotg210)
+static void fhcd2xx_handle_controller_death(struct fhcd2xx_hcd *fhcd2xx)
{
- if (!(fotg210_readl(fotg210, &fotg210->regs->status) & STS_HALT)) {
+ if (!(fhcd2xx_readl(fhcd2xx, &fhcd2xx->regs->status) & STS_HALT)) {

/* Give up after a few milliseconds */
- if (fotg210->died_poll_count++ < 5) {
+ if (fhcd2xx->died_poll_count++ < 5) {
/* Try again later */
- fotg210_enable_event(fotg210,
- FOTG210_HRTIMER_POLL_DEAD, true);
+ fhcd2xx_enable_event(fhcd2xx,
+ FHCD2XX_HRTIMER_POLL_DEAD, true);
return;
}
- fotg210_warn(fotg210, "Waited too long for the controller to stop, giving up\n");
+ fhcd2xx_warn(fhcd2xx, "Waited too long for the controller to stop, giving up\n");
}

/* Clean up the mess */
- fotg210->rh_state = FOTG210_RH_HALTED;
- fotg210_writel(fotg210, 0, &fotg210->regs->intr_enable);
- fotg210_work(fotg210);
- end_unlink_async(fotg210);
+ fhcd2xx->rh_state = FHCD2XX_RH_HALTED;
+ fhcd2xx_writel(fhcd2xx, 0, &fhcd2xx->regs->intr_enable);
+ fhcd2xx_work(fhcd2xx);
+ end_unlink_async(fhcd2xx);

/* Not in process context, so don't try to reset the controller */
}

/* Handle unlinked interrupt QHs once they are gone from the hardware */
-static void fotg210_handle_intr_unlinks(struct fotg210_hcd *fotg210)
+static void fhcd2xx_handle_intr_unlinks(struct fhcd2xx_hcd *fhcd2xx)
{
- bool stopped = (fotg210->rh_state < FOTG210_RH_RUNNING);
+ bool stopped = (fhcd2xx->rh_state < FHCD2XX_RH_RUNNING);

/*
* Process all the QHs on the intr_unlink list that were added
@@ -1238,63 +1238,63 @@ static void fotg210_handle_intr_unlinks(struct fotg210_hcd *fotg210)
* current cycle. But if the root hub isn't running then
* process all the QHs on the list.
*/
- fotg210->intr_unlinking = true;
- while (fotg210->intr_unlink) {
- struct fotg210_qh *qh = fotg210->intr_unlink;
+ fhcd2xx->intr_unlinking = true;
+ while (fhcd2xx->intr_unlink) {
+ struct fhcd2xx_qh *qh = fhcd2xx->intr_unlink;

- if (!stopped && qh->unlink_cycle == fotg210->intr_unlink_cycle)
+ if (!stopped && qh->unlink_cycle == fhcd2xx->intr_unlink_cycle)
break;
- fotg210->intr_unlink = qh->unlink_next;
+ fhcd2xx->intr_unlink = qh->unlink_next;
qh->unlink_next = NULL;
- end_unlink_intr(fotg210, qh);
+ end_unlink_intr(fhcd2xx, qh);
}

/* Handle remaining entries later */
- if (fotg210->intr_unlink) {
- fotg210_enable_event(fotg210, FOTG210_HRTIMER_UNLINK_INTR,
+ if (fhcd2xx->intr_unlink) {
+ fhcd2xx_enable_event(fhcd2xx, FHCD2XX_HRTIMER_UNLINK_INTR,
true);
- ++fotg210->intr_unlink_cycle;
+ ++fhcd2xx->intr_unlink_cycle;
}
- fotg210->intr_unlinking = false;
+ fhcd2xx->intr_unlinking = false;
}

/* Start another free-iTDs/siTDs cycle */
-static void start_free_itds(struct fotg210_hcd *fotg210)
-{
- if (!(fotg210->enabled_hrtimer_events &
- BIT(FOTG210_HRTIMER_FREE_ITDS))) {
- fotg210->last_itd_to_free = list_entry(
- fotg210->cached_itd_list.prev,
- struct fotg210_itd, itd_list);
- fotg210_enable_event(fotg210, FOTG210_HRTIMER_FREE_ITDS, true);
+static void start_free_itds(struct fhcd2xx_hcd *fhcd2xx)
+{
+ if (!(fhcd2xx->enabled_hrtimer_events &
+ BIT(FHCD2XX_HRTIMER_FREE_ITDS))) {
+ fhcd2xx->last_itd_to_free = list_entry(
+ fhcd2xx->cached_itd_list.prev,
+ struct fhcd2xx_itd, itd_list);
+ fhcd2xx_enable_event(fhcd2xx, FHCD2XX_HRTIMER_FREE_ITDS, true);
}
}

/* Wait for controller to stop using old iTDs and siTDs */
-static void end_free_itds(struct fotg210_hcd *fotg210)
+static void end_free_itds(struct fhcd2xx_hcd *fhcd2xx)
{
- struct fotg210_itd *itd, *n;
+ struct fhcd2xx_itd *itd, *n;

- if (fotg210->rh_state < FOTG210_RH_RUNNING)
- fotg210->last_itd_to_free = NULL;
+ if (fhcd2xx->rh_state < FHCD2XX_RH_RUNNING)
+ fhcd2xx->last_itd_to_free = NULL;

- list_for_each_entry_safe(itd, n, &fotg210->cached_itd_list, itd_list) {
+ list_for_each_entry_safe(itd, n, &fhcd2xx->cached_itd_list, itd_list) {
list_del(&itd->itd_list);
- dma_pool_free(fotg210->itd_pool, itd, itd->itd_dma);
- if (itd == fotg210->last_itd_to_free)
+ dma_pool_free(fhcd2xx->itd_pool, itd, itd->itd_dma);
+ if (itd == fhcd2xx->last_itd_to_free)
break;
}

- if (!list_empty(&fotg210->cached_itd_list))
- start_free_itds(fotg210);
+ if (!list_empty(&fhcd2xx->cached_itd_list))
+ start_free_itds(fhcd2xx);
}

/* Handle lost (or very late) IAA interrupts */
-static void fotg210_iaa_watchdog(struct fotg210_hcd *fotg210)
+static void fhcd2xx_iaa_watchdog(struct fhcd2xx_hcd *fhcd2xx)
{
- if (fotg210->rh_state != FOTG210_RH_RUNNING)
+ if (fhcd2xx->rh_state != FHCD2XX_RH_RUNNING)
return;

/*
@@ -1303,7 +1303,7 @@ static void fotg210_iaa_watchdog(struct fotg210_hcd *fotg210)
* (a) SMP races against real IAA firing and retriggering, and
* (b) clean HC shutdown, when IAA watchdog was pending.
*/
- if (fotg210->async_iaa) {
+ if (fhcd2xx->async_iaa) {
u32 cmd, status;

/* If we get here, IAA is *REALLY* late. It's barely
@@ -1312,7 +1312,7 @@ static void fotg210_iaa_watchdog(struct fotg210_hcd *fotg210)
* clear before we read STS_IAA. (The HC should clear
* CMD_IAAD when it sets STS_IAA.)
*/
- cmd = fotg210_readl(fotg210, &fotg210->regs->command);
+ cmd = fhcd2xx_readl(fhcd2xx, &fhcd2xx->regs->command);

/*
* If IAA is set here it either legitimately triggered
@@ -1321,36 +1321,36 @@ static void fotg210_iaa_watchdog(struct fotg210_hcd *fotg210)
* - VIA seems to set IAA without triggering the IRQ;
* - IAAD potentially cleared without setting IAA.
*/
- status = fotg210_readl(fotg210, &fotg210->regs->status);
+ status = fhcd2xx_readl(fhcd2xx, &fhcd2xx->regs->status);
if ((status & STS_IAA) || !(cmd & CMD_IAAD)) {
- COUNT(fotg210->stats.lost_iaa);
- fotg210_writel(fotg210, STS_IAA,
- &fotg210->regs->status);
+ COUNT(fhcd2xx->stats.lost_iaa);
+ fhcd2xx_writel(fhcd2xx, STS_IAA,
+ &fhcd2xx->regs->status);
}

- fotg210_dbg(fotg210, "IAA watchdog: status %x cmd %x\n",
+ fhcd2xx_dbg(fhcd2xx, "IAA watchdog: status %x cmd %x\n",
status, cmd);
- end_unlink_async(fotg210);
+ end_unlink_async(fhcd2xx);
}
}

/* Enable the I/O watchdog, if appropriate */
-static void turn_on_io_watchdog(struct fotg210_hcd *fotg210)
+static void turn_on_io_watchdog(struct fhcd2xx_hcd *fhcd2xx)
{
/* Not needed if the controller isn't running or it's already enabled */
- if (fotg210->rh_state != FOTG210_RH_RUNNING ||
- (fotg210->enabled_hrtimer_events &
- BIT(FOTG210_HRTIMER_IO_WATCHDOG)))
+ if (fhcd2xx->rh_state != FHCD2XX_RH_RUNNING ||
+ (fhcd2xx->enabled_hrtimer_events &
+ BIT(FHCD2XX_HRTIMER_IO_WATCHDOG)))
return;

/*
* Isochronous transfers always need the watchdog.
* For other sorts we use it only if the flag is set.
*/
- if (fotg210->isoc_count > 0 || (fotg210->need_io_watchdog &&
- fotg210->async_count + fotg210->intr_count > 0))
- fotg210_enable_event(fotg210, FOTG210_HRTIMER_IO_WATCHDOG,
+ if (fhcd2xx->isoc_count > 0 || (fhcd2xx->need_io_watchdog &&
+ fhcd2xx->async_count + fhcd2xx->intr_count > 0))
+ fhcd2xx_enable_event(fhcd2xx, FHCD2XX_HRTIMER_IO_WATCHDOG,
true);
}

@@ -1358,56 +1358,56 @@ static void turn_on_io_watchdog(struct fotg210_hcd *fotg210)
/*
* Handler functions for the hrtimer event types.
* Keep this array in the same order as the event types indexed by
- * enum fotg210_hrtimer_event in fotg210.h.
+ * enum fhcd2xx_hrtimer_event in fhcd2xx.h.
*/
-static void (*event_handlers[])(struct fotg210_hcd *) = {
- fotg210_poll_ASS, /* FOTG210_HRTIMER_POLL_ASS */
- fotg210_poll_PSS, /* FOTG210_HRTIMER_POLL_PSS */
- fotg210_handle_controller_death, /* FOTG210_HRTIMER_POLL_DEAD */
- fotg210_handle_intr_unlinks, /* FOTG210_HRTIMER_UNLINK_INTR */
- end_free_itds, /* FOTG210_HRTIMER_FREE_ITDS */
- unlink_empty_async, /* FOTG210_HRTIMER_ASYNC_UNLINKS */
- fotg210_iaa_watchdog, /* FOTG210_HRTIMER_IAA_WATCHDOG */
- fotg210_disable_PSE, /* FOTG210_HRTIMER_DISABLE_PERIODIC */
- fotg210_disable_ASE, /* FOTG210_HRTIMER_DISABLE_ASYNC */
- fotg210_work, /* FOTG210_HRTIMER_IO_WATCHDOG */
+static void (*event_handlers[])(struct fhcd2xx_hcd *) = {
+ fhcd2xx_poll_ASS, /* FHCD2XX_HRTIMER_POLL_ASS */
+ fhcd2xx_poll_PSS, /* FHCD2XX_HRTIMER_POLL_PSS */
+ fhcd2xx_handle_controller_death, /* FHCD2XX_HRTIMER_POLL_DEAD */
+ fhcd2xx_handle_intr_unlinks, /* FHCD2XX_HRTIMER_UNLINK_INTR */
+ end_free_itds, /* FHCD2XX_HRTIMER_FREE_ITDS */
+ unlink_empty_async, /* FHCD2XX_HRTIMER_ASYNC_UNLINKS */
+ fhcd2xx_iaa_watchdog, /* FHCD2XX_HRTIMER_IAA_WATCHDOG */
+ fhcd2xx_disable_PSE, /* FHCD2XX_HRTIMER_DISABLE_PERIODIC */
+ fhcd2xx_disable_ASE, /* FHCD2XX_HRTIMER_DISABLE_ASYNC */
+ fhcd2xx_work, /* FHCD2XX_HRTIMER_IO_WATCHDOG */
};

-static enum hrtimer_restart fotg210_hrtimer_func(struct hrtimer *t)
+static enum hrtimer_restart fhcd2xx_hrtimer_func(struct hrtimer *t)
{
- struct fotg210_hcd *fotg210 =
- container_of(t, struct fotg210_hcd, hrtimer);
+ struct fhcd2xx_hcd *fhcd2xx =
+ container_of(t, struct fhcd2xx_hcd, hrtimer);
ktime_t now;
unsigned long events;
unsigned long flags;
unsigned e;

- spin_lock_irqsave(&fotg210->lock, flags);
+ spin_lock_irqsave(&fhcd2xx->lock, flags);

- events = fotg210->enabled_hrtimer_events;
- fotg210->enabled_hrtimer_events = 0;
- fotg210->next_hrtimer_event = FOTG210_HRTIMER_NO_EVENT;
+ events = fhcd2xx->enabled_hrtimer_events;
+ fhcd2xx->enabled_hrtimer_events = 0;
+ fhcd2xx->next_hrtimer_event = FHCD2XX_HRTIMER_NO_EVENT;

/*
* Check each pending event. If its time has expired, handle
* the event; otherwise re-enable it.
*/
now = ktime_get();
- for_each_set_bit(e, &events, FOTG210_HRTIMER_NUM_EVENTS) {
- if (now.tv64 >= fotg210->hr_timeouts[e].tv64)
- event_handlers[e](fotg210);
+ for_each_set_bit(e, &events, FHCD2XX_HRTIMER_NUM_EVENTS) {
+ if (now.tv64 >= fhcd2xx->hr_timeouts[e].tv64)
+ event_handlers[e](fhcd2xx);
else
- fotg210_enable_event(fotg210, e, false);
+ fhcd2xx_enable_event(fhcd2xx, e, false);
}

- spin_unlock_irqrestore(&fotg210->lock, flags);
+ spin_unlock_irqrestore(&fhcd2xx->lock, flags);
return HRTIMER_NORESTART;
}

-#define fotg210_bus_suspend NULL
-#define fotg210_bus_resume NULL
+#define fhcd2xx_bus_suspend NULL
+#define fhcd2xx_bus_resume NULL

-static int check_reset_complete(struct fotg210_hcd *fotg210, int index,
+static int check_reset_complete(struct fhcd2xx_hcd *fhcd2xx, int index,
u32 __iomem *status_reg, int port_status)
{
if (!(port_status & PORT_CONNECT))
@@ -1416,12 +1416,12 @@ static int check_reset_complete(struct fotg210_hcd *fotg210, int index,
/* if reset finished and it's still not enabled -- handoff */
if (!(port_status & PORT_PE)) {
/* with integrated TT, there's nobody to hand it to! */
- fotg210_dbg(fotg210,
+ fhcd2xx_dbg(fhcd2xx,
"Failed to enable port %d on root hub TT\n",
index+1);
return port_status;
}
- fotg210_dbg(fotg210, "port %d reset complete, port enabled\n",
+ fhcd2xx_dbg(fhcd2xx, "port %d reset complete, port enabled\n",
index + 1);

return port_status;
@@ -1430,9 +1430,9 @@ static int check_reset_complete(struct fotg210_hcd *fotg210, int index,

/* build "status change" packet (one or two bytes) from HC registers */

-static int fotg210_hub_status_data(struct usb_hcd *hcd, char *buf)
+static int fhcd2xx_hub_status_data(struct usb_hcd *hcd, char *buf)
{
- struct fotg210_hcd *fotg210 = hcd_to_fotg210(hcd);
+ struct fhcd2xx_hcd *fhcd2xx = hcd_to_fhcd2xx(hcd);
u32 temp, status;
u32 mask;
int retval = 1;
@@ -1444,7 +1444,7 @@ static int fotg210_hub_status_data(struct usb_hcd *hcd, char *buf)
/* Inform the core about resumes-in-progress by returning
* a non-zero value even if there are no status changes.
*/
- status = fotg210->resuming_ports;
+ status = fhcd2xx->resuming_ports;

mask = PORT_CSC | PORT_PEC;
/* PORT_RESUME from hardware ~= PORT_STAT_C_SUSPEND */
@@ -1452,9 +1452,9 @@ static int fotg210_hub_status_data(struct usb_hcd *hcd, char *buf)
/* no hub change reports (bit 0) for now (power, ...) */

/* port N changes (bit N)? */
- spin_lock_irqsave(&fotg210->lock, flags);
+ spin_lock_irqsave(&fhcd2xx->lock, flags);

- temp = fotg210_readl(fotg210, &fotg210->regs->port_status);
+ temp = fhcd2xx_readl(fhcd2xx, &fhcd2xx->regs->port_status);

/*
* Return status information even for ports with OWNER set.
@@ -1463,25 +1463,25 @@ static int fotg210_hub_status_data(struct usb_hcd *hcd, char *buf)
* controller by the user.
*/

- if ((temp & mask) != 0 || test_bit(0, &fotg210->port_c_suspend)
- || (fotg210->reset_done[0] && time_after_eq(
- jiffies, fotg210->reset_done[0]))) {
+ if ((temp & mask) != 0 || test_bit(0, &fhcd2xx->port_c_suspend)
+ || (fhcd2xx->reset_done[0] && time_after_eq(
+ jiffies, fhcd2xx->reset_done[0]))) {
buf[0] |= 1 << 1;
status = STS_PCD;
}
/* FIXME autosuspend idle root hubs */
- spin_unlock_irqrestore(&fotg210->lock, flags);
+ spin_unlock_irqrestore(&fhcd2xx->lock, flags);
return status ? retval : 0;
}

-static void fotg210_hub_descriptor(struct fotg210_hcd *fotg210,
+static void fhcd2xx_hub_descriptor(struct fhcd2xx_hcd *fhcd2xx,
struct usb_hub_descriptor *desc)
{
- int ports = HCS_N_PORTS(fotg210->hcs_params);
+ int ports = HCS_N_PORTS(fhcd2xx->hcs_params);
u16 temp;

desc->bDescriptorType = USB_DT_HUB;
- desc->bPwrOn2PwrGood = 10; /* fotg210 1.0, 2.3.9 says 20ms max */
+ desc->bPwrOn2PwrGood = 10; /* fhcd2xx 1.0, 2.3.9 says 20ms max */
desc->bHubContrCurrent = 0;

desc->bNbrPorts = ports;
@@ -1497,12 +1497,12 @@ static void fotg210_hub_descriptor(struct fotg210_hcd *fotg210,
desc->wHubCharacteristics = cpu_to_le16(temp);
}

-static int fotg210_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue,
+static int fhcd2xx_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue,
u16 wIndex, char *buf, u16 wLength)
{
- struct fotg210_hcd *fotg210 = hcd_to_fotg210(hcd);
- int ports = HCS_N_PORTS(fotg210->hcs_params);
- u32 __iomem *status_reg = &fotg210->regs->port_status;
+ struct fhcd2xx_hcd *fhcd2xx = hcd_to_fhcd2xx(hcd);
+ int ports = HCS_N_PORTS(fhcd2xx->hcs_params);
+ u32 __iomem *status_reg = &fhcd2xx->regs->port_status;
u32 temp, temp1, status;
unsigned long flags;
int retval = 0;
@@ -1515,7 +1515,7 @@ static int fotg210_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue,
* power, "this is the one", etc. EHCI spec supports this.
*/

- spin_lock_irqsave(&fotg210->lock, flags);
+ spin_lock_irqsave(&fhcd2xx->lock, flags);
switch (typeReq) {
case ClearHubFeature:
switch (wValue) {
@@ -1531,7 +1531,7 @@ static int fotg210_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue,
if (!wIndex || wIndex > ports)
goto error;
wIndex--;
- temp = fotg210_readl(fotg210, status_reg);
+ temp = fhcd2xx_readl(fhcd2xx, status_reg);
temp &= ~PORT_RWC_BITS;

/*
@@ -1543,10 +1543,10 @@ static int fotg210_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue,

switch (wValue) {
case USB_PORT_FEAT_ENABLE:
- fotg210_writel(fotg210, temp & ~PORT_PE, status_reg);
+ fhcd2xx_writel(fhcd2xx, temp & ~PORT_PE, status_reg);
break;
case USB_PORT_FEAT_C_ENABLE:
- fotg210_writel(fotg210, temp | PORT_PEC, status_reg);
+ fhcd2xx_writel(fhcd2xx, temp | PORT_PEC, status_reg);
break;
case USB_PORT_FEAT_SUSPEND:
if (temp & PORT_RESET)
@@ -1557,19 +1557,19 @@ static int fotg210_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue,
goto error;

/* resume signaling for 20 msec */
- fotg210_writel(fotg210, temp | PORT_RESUME, status_reg);
- fotg210->reset_done[wIndex] = jiffies
+ fhcd2xx_writel(fhcd2xx, temp | PORT_RESUME, status_reg);
+ fhcd2xx->reset_done[wIndex] = jiffies
+ msecs_to_jiffies(USB_RESUME_TIMEOUT);
break;
case USB_PORT_FEAT_C_SUSPEND:
- clear_bit(wIndex, &fotg210->port_c_suspend);
+ clear_bit(wIndex, &fhcd2xx->port_c_suspend);
break;
case USB_PORT_FEAT_C_CONNECTION:
- fotg210_writel(fotg210, temp | PORT_CSC, status_reg);
+ fhcd2xx_writel(fhcd2xx, temp | PORT_CSC, status_reg);
break;
case USB_PORT_FEAT_C_OVER_CURRENT:
- fotg210_writel(fotg210, temp | OTGISR_OVC,
- &fotg210->regs->otgisr);
+ fhcd2xx_writel(fhcd2xx, temp | OTGISR_OVC,
+ &fhcd2xx->regs->otgisr);
break;
case USB_PORT_FEAT_C_RESET:
/* GetPortStatus clears reset */
@@ -1577,10 +1577,10 @@ static int fotg210_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue,
default:
goto error;
}
- fotg210_readl(fotg210, &fotg210->regs->command);
+ fhcd2xx_readl(fhcd2xx, &fhcd2xx->regs->command);
break;
case GetHubDescriptor:
- fotg210_hub_descriptor(fotg210, (struct usb_hub_descriptor *)
+ fhcd2xx_hub_descriptor(fhcd2xx, (struct usb_hub_descriptor *)
buf);
break;
case GetHubStatus:
@@ -1593,7 +1593,7 @@ static int fotg210_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue,
goto error;
wIndex--;
status = 0;
- temp = fotg210_readl(fotg210, status_reg);
+ temp = fhcd2xx_readl(fhcd2xx, status_reg);

/* wPortChange bits */
if (temp & PORT_CSC)
@@ -1601,7 +1601,7 @@ static int fotg210_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue,
if (temp & PORT_PEC)
status |= USB_PORT_STAT_C_ENABLE << 16;

- temp1 = fotg210_readl(fotg210, &fotg210->regs->otgisr);
+ temp1 = fhcd2xx_readl(fhcd2xx, &fhcd2xx->regs->otgisr);
if (temp1 & OTGISR_OVC)
status |= USB_PORT_STAT_C_OVERCURRENT << 16;

@@ -1609,32 +1609,32 @@ static int fotg210_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue,
if (temp & PORT_RESUME) {

/* Remote Wakeup received? */
- if (!fotg210->reset_done[wIndex]) {
+ if (!fhcd2xx->reset_done[wIndex]) {
/* resume signaling for 20 msec */
- fotg210->reset_done[wIndex] = jiffies
+ fhcd2xx->reset_done[wIndex] = jiffies
+ msecs_to_jiffies(20);
/* check the port again */
- mod_timer(&fotg210_to_hcd(fotg210)->rh_timer,
- fotg210->reset_done[wIndex]);
+ mod_timer(&fhcd2xx_to_hcd(fhcd2xx)->rh_timer,
+ fhcd2xx->reset_done[wIndex]);
}

/* resume completed? */
else if (time_after_eq(jiffies,
- fotg210->reset_done[wIndex])) {
- clear_bit(wIndex, &fotg210->suspended_ports);
- set_bit(wIndex, &fotg210->port_c_suspend);
- fotg210->reset_done[wIndex] = 0;
+ fhcd2xx->reset_done[wIndex])) {
+ clear_bit(wIndex, &fhcd2xx->suspended_ports);
+ set_bit(wIndex, &fhcd2xx->port_c_suspend);
+ fhcd2xx->reset_done[wIndex] = 0;

/* stop resume signaling */
- temp = fotg210_readl(fotg210, status_reg);
- fotg210_writel(fotg210,
+ temp = fhcd2xx_readl(fhcd2xx, status_reg);
+ fhcd2xx_writel(fhcd2xx,
temp & ~(PORT_RWC_BITS | PORT_RESUME),
status_reg);
- clear_bit(wIndex, &fotg210->resuming_ports);
- retval = handshake(fotg210, status_reg,
+ clear_bit(wIndex, &fhcd2xx->resuming_ports);
+ retval = handshake(fhcd2xx, status_reg,
PORT_RESUME, 0, 2000 /* 2msec */);
if (retval != 0) {
- fotg210_err(fotg210,
+ fhcd2xx_err(fhcd2xx,
"port %d resume error %d\n",
wIndex + 1, retval);
goto error;
@@ -1646,44 +1646,44 @@ static int fotg210_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue,
/* whoever resets must GetPortStatus to complete it!! */
if ((temp & PORT_RESET)
&& time_after_eq(jiffies,
- fotg210->reset_done[wIndex])) {
+ fhcd2xx->reset_done[wIndex])) {
status |= USB_PORT_STAT_C_RESET << 16;
- fotg210->reset_done[wIndex] = 0;
- clear_bit(wIndex, &fotg210->resuming_ports);
+ fhcd2xx->reset_done[wIndex] = 0;
+ clear_bit(wIndex, &fhcd2xx->resuming_ports);

/* force reset to complete */
- fotg210_writel(fotg210,
+ fhcd2xx_writel(fhcd2xx,
temp & ~(PORT_RWC_BITS | PORT_RESET),
status_reg);
/* REVISIT: some hardware needs 550+ usec to clear
* this bit; seems too long to spin routinely...
*/
- retval = handshake(fotg210, status_reg,
+ retval = handshake(fhcd2xx, status_reg,
PORT_RESET, 0, 1000);
if (retval != 0) {
- fotg210_err(fotg210, "port %d reset error %d\n",
+ fhcd2xx_err(fhcd2xx, "port %d reset error %d\n",
wIndex + 1, retval);
goto error;
}

/* see what we found out */
- temp = check_reset_complete(fotg210, wIndex, status_reg,
- fotg210_readl(fotg210, status_reg));
+ temp = check_reset_complete(fhcd2xx, wIndex, status_reg,
+ fhcd2xx_readl(fhcd2xx, status_reg));
}

if (!(temp & (PORT_RESUME|PORT_RESET))) {
- fotg210->reset_done[wIndex] = 0;
- clear_bit(wIndex, &fotg210->resuming_ports);
+ fhcd2xx->reset_done[wIndex] = 0;
+ clear_bit(wIndex, &fhcd2xx->resuming_ports);
}

/* transfer dedicated ports to the companion hc */
if ((temp & PORT_CONNECT) &&
- test_bit(wIndex, &fotg210->companion_ports)) {
+ test_bit(wIndex, &fhcd2xx->companion_ports)) {
temp &= ~PORT_RWC_BITS;
- fotg210_writel(fotg210, temp, status_reg);
- fotg210_dbg(fotg210, "port %d --> companion\n",
+ fhcd2xx_writel(fhcd2xx, temp, status_reg);
+ fhcd2xx_dbg(fhcd2xx, "port %d --> companion\n",
wIndex + 1);
- temp = fotg210_readl(fotg210, status_reg);
+ temp = fhcd2xx_readl(fhcd2xx, status_reg);
}

/*
@@ -1694,7 +1694,7 @@ static int fotg210_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue,

if (temp & PORT_CONNECT) {
status |= USB_PORT_STAT_CONNECTION;
- status |= fotg210_port_speed(fotg210, temp);
+ status |= fhcd2xx_port_speed(fhcd2xx, temp);
}
if (temp & PORT_PE)
status |= USB_PORT_STAT_ENABLE;
@@ -1702,24 +1702,24 @@ static int fotg210_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue,
/* maybe the port was unsuspended without our knowledge */
if (temp & (PORT_SUSPEND|PORT_RESUME)) {
status |= USB_PORT_STAT_SUSPEND;
- } else if (test_bit(wIndex, &fotg210->suspended_ports)) {
- clear_bit(wIndex, &fotg210->suspended_ports);
- clear_bit(wIndex, &fotg210->resuming_ports);
- fotg210->reset_done[wIndex] = 0;
+ } else if (test_bit(wIndex, &fhcd2xx->suspended_ports)) {
+ clear_bit(wIndex, &fhcd2xx->suspended_ports);
+ clear_bit(wIndex, &fhcd2xx->resuming_ports);
+ fhcd2xx->reset_done[wIndex] = 0;
if (temp & PORT_PE)
- set_bit(wIndex, &fotg210->port_c_suspend);
+ set_bit(wIndex, &fhcd2xx->port_c_suspend);
}

- temp1 = fotg210_readl(fotg210, &fotg210->regs->otgisr);
+ temp1 = fhcd2xx_readl(fhcd2xx, &fhcd2xx->regs->otgisr);
if (temp1 & OTGISR_OVC)
status |= USB_PORT_STAT_OVERCURRENT;
if (temp & PORT_RESET)
status |= USB_PORT_STAT_RESET;
- if (test_bit(wIndex, &fotg210->port_c_suspend))
+ if (test_bit(wIndex, &fhcd2xx->port_c_suspend))
status |= USB_PORT_STAT_C_SUSPEND << 16;

if (status & ~0xffff) /* only if wPortChange is interesting */
- dbg_port(fotg210, "GetStatus", wIndex + 1, temp);
+ dbg_port(fhcd2xx, "GetStatus", wIndex + 1, temp);
put_unaligned_le32(status, buf);
break;
case SetHubFeature:
@@ -1739,7 +1739,7 @@ static int fotg210_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue,
if (!wIndex || wIndex > ports)
goto error;
wIndex--;
- temp = fotg210_readl(fotg210, status_reg);
+ temp = fhcd2xx_readl(fhcd2xx, status_reg);
temp &= ~PORT_RWC_BITS;
switch (wValue) {
case USB_PORT_FEAT_SUSPEND:
@@ -1751,9 +1751,9 @@ static int fotg210_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue,
* Set appropriate bit thus could put phy into low power
* mode if we have hostpc feature
*/
- fotg210_writel(fotg210, temp | PORT_SUSPEND,
+ fhcd2xx_writel(fhcd2xx, temp | PORT_SUSPEND,
status_reg);
- set_bit(wIndex, &fotg210->suspended_ports);
+ set_bit(wIndex, &fhcd2xx->suspended_ports);
break;
case USB_PORT_FEAT_RESET:
if (temp & PORT_RESUME)
@@ -1762,7 +1762,7 @@ static int fotg210_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue,
* which can be fine if this root hub has a
* transaction translator built in.
*/
- fotg210_dbg(fotg210, "port %d reset\n", wIndex + 1);
+ fhcd2xx_dbg(fhcd2xx, "port %d reset\n", wIndex + 1);
temp |= PORT_RESET;
temp &= ~PORT_PE;

@@ -1770,9 +1770,9 @@ static int fotg210_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue,
* caller must wait, then call GetPortStatus
* usb 2.0 spec says 50 ms resets on root
*/
- fotg210->reset_done[wIndex] = jiffies
+ fhcd2xx->reset_done[wIndex] = jiffies
+ msecs_to_jiffies(50);
- fotg210_writel(fotg210, temp, status_reg);
+ fhcd2xx_writel(fhcd2xx, temp, status_reg);
break;

/* For downstream facing ports (these): one hub port is put
@@ -1784,30 +1784,30 @@ static int fotg210_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue,
case USB_PORT_FEAT_TEST:
if (!selector || selector > 5)
goto error;
- spin_unlock_irqrestore(&fotg210->lock, flags);
- fotg210_quiesce(fotg210);
- spin_lock_irqsave(&fotg210->lock, flags);
+ spin_unlock_irqrestore(&fhcd2xx->lock, flags);
+ fhcd2xx_quiesce(fhcd2xx);
+ spin_lock_irqsave(&fhcd2xx->lock, flags);

/* Put all enabled ports into suspend */
- temp = fotg210_readl(fotg210, status_reg) &
+ temp = fhcd2xx_readl(fhcd2xx, status_reg) &
~PORT_RWC_BITS;
if (temp & PORT_PE)
- fotg210_writel(fotg210, temp | PORT_SUSPEND,
+ fhcd2xx_writel(fhcd2xx, temp | PORT_SUSPEND,
status_reg);

- spin_unlock_irqrestore(&fotg210->lock, flags);
- fotg210_halt(fotg210);
- spin_lock_irqsave(&fotg210->lock, flags);
+ spin_unlock_irqrestore(&fhcd2xx->lock, flags);
+ fhcd2xx_halt(fhcd2xx);
+ spin_lock_irqsave(&fhcd2xx->lock, flags);

- temp = fotg210_readl(fotg210, status_reg);
+ temp = fhcd2xx_readl(fhcd2xx, status_reg);
temp |= selector << 16;
- fotg210_writel(fotg210, temp, status_reg);
+ fhcd2xx_writel(fhcd2xx, temp, status_reg);
break;

default:
goto error;
}
- fotg210_readl(fotg210, &fotg210->regs->command);
+ fhcd2xx_readl(fhcd2xx, &fhcd2xx->regs->command);
break;

default:
@@ -1815,17 +1815,17 @@ error:
/* "stall" on error */
retval = -EPIPE;
}
- spin_unlock_irqrestore(&fotg210->lock, flags);
+ spin_unlock_irqrestore(&fhcd2xx->lock, flags);
return retval;
}

-static void __maybe_unused fotg210_relinquish_port(struct usb_hcd *hcd,
+static void __maybe_unused fhcd2xx_relinquish_port(struct usb_hcd *hcd,
int portnum)
{
return;
}

-static int __maybe_unused fotg210_port_handed_over(struct usb_hcd *hcd,
+static int __maybe_unused fhcd2xx_port_handed_over(struct usb_hcd *hcd,
int portnum)
{
return 0;
@@ -1843,61 +1843,61 @@ static int __maybe_unused fotg210_port_handed_over(struct usb_hcd *hcd,
*/

/* Allocate the key transfer structures from the previously allocated pool */
-static inline void fotg210_qtd_init(struct fotg210_hcd *fotg210,
- struct fotg210_qtd *qtd, dma_addr_t dma)
+static inline void fhcd2xx_qtd_init(struct fhcd2xx_hcd *fhcd2xx,
+ struct fhcd2xx_qtd *qtd, dma_addr_t dma)
{
memset(qtd, 0, sizeof(*qtd));
qtd->qtd_dma = dma;
- qtd->hw_token = cpu_to_hc32(fotg210, QTD_STS_HALT);
- qtd->hw_next = FOTG210_LIST_END(fotg210);
- qtd->hw_alt_next = FOTG210_LIST_END(fotg210);
+ qtd->hw_token = cpu_to_hc32(fhcd2xx, QTD_STS_HALT);
+ qtd->hw_next = FHCD2XX_LIST_END(fhcd2xx);
+ qtd->hw_alt_next = FHCD2XX_LIST_END(fhcd2xx);
INIT_LIST_HEAD(&qtd->qtd_list);
}

-static struct fotg210_qtd *fotg210_qtd_alloc(struct fotg210_hcd *fotg210,
+static struct fhcd2xx_qtd *fhcd2xx_qtd_alloc(struct fhcd2xx_hcd *fhcd2xx,
gfp_t flags)
{
- struct fotg210_qtd *qtd;
+ struct fhcd2xx_qtd *qtd;
dma_addr_t dma;

- qtd = dma_pool_alloc(fotg210->qtd_pool, flags, &dma);
+ qtd = dma_pool_alloc(fhcd2xx->qtd_pool, flags, &dma);
if (qtd != NULL)
- fotg210_qtd_init(fotg210, qtd, dma);
+ fhcd2xx_qtd_init(fhcd2xx, qtd, dma);

return qtd;
}

-static inline void fotg210_qtd_free(struct fotg210_hcd *fotg210,
- struct fotg210_qtd *qtd)
+static inline void fhcd2xx_qtd_free(struct fhcd2xx_hcd *fhcd2xx,
+ struct fhcd2xx_qtd *qtd)
{
- dma_pool_free(fotg210->qtd_pool, qtd, qtd->qtd_dma);
+ dma_pool_free(fhcd2xx->qtd_pool, qtd, qtd->qtd_dma);
}

-static void qh_destroy(struct fotg210_hcd *fotg210, struct fotg210_qh *qh)
+static void qh_destroy(struct fhcd2xx_hcd *fhcd2xx, struct fhcd2xx_qh *qh)
{
/* clean qtds first, and know this is not linked */
if (!list_empty(&qh->qtd_list) || qh->qh_next.ptr) {
- fotg210_dbg(fotg210, "unused qh not empty!\n");
+ fhcd2xx_dbg(fhcd2xx, "unused qh not empty!\n");
BUG();
}
if (qh->dummy)
- fotg210_qtd_free(fotg210, qh->dummy);
- dma_pool_free(fotg210->qh_pool, qh->hw, qh->qh_dma);
+ fhcd2xx_qtd_free(fhcd2xx, qh->dummy);
+ dma_pool_free(fhcd2xx->qh_pool, qh->hw, qh->qh_dma);
kfree(qh);
}

-static struct fotg210_qh *fotg210_qh_alloc(struct fotg210_hcd *fotg210,
+static struct fhcd2xx_qh *fhcd2xx_qh_alloc(struct fhcd2xx_hcd *fhcd2xx,
gfp_t flags)
{
- struct fotg210_qh *qh;
+ struct fhcd2xx_qh *qh;
dma_addr_t dma;

qh = kzalloc(sizeof(*qh), GFP_ATOMIC);
if (!qh)
goto done;
- qh->hw = (struct fotg210_qh_hw *)
- dma_pool_alloc(fotg210->qh_pool, flags, &dma);
+ qh->hw = (struct fhcd2xx_qh_hw *)
+ dma_pool_alloc(fhcd2xx->qh_pool, flags, &dma);
if (!qh->hw)
goto fail;
memset(qh->hw, 0, sizeof(*qh->hw));
@@ -1905,15 +1905,15 @@ static struct fotg210_qh *fotg210_qh_alloc(struct fotg210_hcd *fotg210,
INIT_LIST_HEAD(&qh->qtd_list);

/* dummy td enables safe urb queuing */
- qh->dummy = fotg210_qtd_alloc(fotg210, flags);
+ qh->dummy = fhcd2xx_qtd_alloc(fhcd2xx, flags);
if (qh->dummy == NULL) {
- fotg210_dbg(fotg210, "no dummy td\n");
+ fhcd2xx_dbg(fhcd2xx, "no dummy td\n");
goto fail1;
}
done:
return qh;
fail1:
- dma_pool_free(fotg210->qh_pool, qh->hw, qh->qh_dma);
+ dma_pool_free(fhcd2xx->qh_pool, qh->hw, qh->qh_dma);
fail:
kfree(qh);
return NULL;
@@ -1924,93 +1924,93 @@ fail:
* This is the initialisation and cleanup code.
*/

-static void fotg210_mem_cleanup(struct fotg210_hcd *fotg210)
+static void fhcd2xx_mem_cleanup(struct fhcd2xx_hcd *fhcd2xx)
{
- if (fotg210->async)
- qh_destroy(fotg210, fotg210->async);
- fotg210->async = NULL;
+ if (fhcd2xx->async)
+ qh_destroy(fhcd2xx, fhcd2xx->async);
+ fhcd2xx->async = NULL;

- if (fotg210->dummy)
- qh_destroy(fotg210, fotg210->dummy);
- fotg210->dummy = NULL;
+ if (fhcd2xx->dummy)
+ qh_destroy(fhcd2xx, fhcd2xx->dummy);
+ fhcd2xx->dummy = NULL;

/* DMA consistent memory and pools */
- dma_pool_destroy(fotg210->qtd_pool);
- fotg210->qtd_pool = NULL;
+ dma_pool_destroy(fhcd2xx->qtd_pool);
+ fhcd2xx->qtd_pool = NULL;

- dma_pool_destroy(fotg210->qh_pool);
- fotg210->qh_pool = NULL;
+ dma_pool_destroy(fhcd2xx->qh_pool);
+ fhcd2xx->qh_pool = NULL;

- dma_pool_destroy(fotg210->itd_pool);
- fotg210->itd_pool = NULL;
+ dma_pool_destroy(fhcd2xx->itd_pool);
+ fhcd2xx->itd_pool = NULL;

- if (fotg210->periodic)
- dma_free_coherent(fotg210_to_hcd(fotg210)->self.controller,
- fotg210->periodic_size * sizeof(u32),
- fotg210->periodic, fotg210->periodic_dma);
- fotg210->periodic = NULL;
+ if (fhcd2xx->periodic)
+ dma_free_coherent(fhcd2xx_to_hcd(fhcd2xx)->self.controller,
+ fhcd2xx->periodic_size * sizeof(u32),
+ fhcd2xx->periodic, fhcd2xx->periodic_dma);
+ fhcd2xx->periodic = NULL;

/* shadow periodic table */
- kfree(fotg210->pshadow);
- fotg210->pshadow = NULL;
+ kfree(fhcd2xx->pshadow);
+ fhcd2xx->pshadow = NULL;
}

/* remember to add cleanup code (above) if you add anything here */
-static int fotg210_mem_init(struct fotg210_hcd *fotg210, gfp_t flags)
+static int fhcd2xx_mem_init(struct fhcd2xx_hcd *fhcd2xx, gfp_t flags)
{
int i;

/* QTDs for control/bulk/intr transfers */
- fotg210->qtd_pool = dma_pool_create("fotg210_qtd",
- fotg210_to_hcd(fotg210)->self.controller,
- sizeof(struct fotg210_qtd),
+ fhcd2xx->qtd_pool = dma_pool_create("fhcd2xx_qtd",
+ fhcd2xx_to_hcd(fhcd2xx)->self.controller,
+ sizeof(struct fhcd2xx_qtd),
32 /* byte alignment (for hw parts) */,
4096 /* can't cross 4K */);
- if (!fotg210->qtd_pool)
+ if (!fhcd2xx->qtd_pool)
goto fail;

/* QHs for control/bulk/intr transfers */
- fotg210->qh_pool = dma_pool_create("fotg210_qh",
- fotg210_to_hcd(fotg210)->self.controller,
- sizeof(struct fotg210_qh_hw),
+ fhcd2xx->qh_pool = dma_pool_create("fhcd2xx_qh",
+ fhcd2xx_to_hcd(fhcd2xx)->self.controller,
+ sizeof(struct fhcd2xx_qh_hw),
32 /* byte alignment (for hw parts) */,
4096 /* can't cross 4K */);
- if (!fotg210->qh_pool)
+ if (!fhcd2xx->qh_pool)
goto fail;

- fotg210->async = fotg210_qh_alloc(fotg210, flags);
- if (!fotg210->async)
+ fhcd2xx->async = fhcd2xx_qh_alloc(fhcd2xx, flags);
+ if (!fhcd2xx->async)
goto fail;

/* ITD for high speed ISO transfers */
- fotg210->itd_pool = dma_pool_create("fotg210_itd",
- fotg210_to_hcd(fotg210)->self.controller,
- sizeof(struct fotg210_itd),
+ fhcd2xx->itd_pool = dma_pool_create("fhcd2xx_itd",
+ fhcd2xx_to_hcd(fhcd2xx)->self.controller,
+ sizeof(struct fhcd2xx_itd),
64 /* byte alignment (for hw parts) */,
4096 /* can't cross 4K */);
- if (!fotg210->itd_pool)
+ if (!fhcd2xx->itd_pool)
goto fail;

/* Hardware periodic table */
- fotg210->periodic = (__le32 *)
- dma_alloc_coherent(fotg210_to_hcd(fotg210)->self.controller,
- fotg210->periodic_size * sizeof(__le32),
- &fotg210->periodic_dma, 0);
- if (fotg210->periodic == NULL)
+ fhcd2xx->periodic = (__le32 *)
+ dma_alloc_coherent(fhcd2xx_to_hcd(fhcd2xx)->self.controller,
+ fhcd2xx->periodic_size * sizeof(__le32),
+ &fhcd2xx->periodic_dma, 0);
+ if (fhcd2xx->periodic == NULL)
goto fail;

- for (i = 0; i < fotg210->periodic_size; i++)
- fotg210->periodic[i] = FOTG210_LIST_END(fotg210);
+ for (i = 0; i < fhcd2xx->periodic_size; i++)
+ fhcd2xx->periodic[i] = FHCD2XX_LIST_END(fhcd2xx);

/* software shadow of hardware table */
- fotg210->pshadow = kcalloc(fotg210->periodic_size, sizeof(void *),
+ fhcd2xx->pshadow = kcalloc(fhcd2xx->periodic_size, sizeof(void *),
flags);
- if (fotg210->pshadow != NULL)
+ if (fhcd2xx->pshadow != NULL)
return 0;

fail:
- fotg210_dbg(fotg210, "couldn't init memory\n");
- fotg210_mem_cleanup(fotg210);
+ fhcd2xx_dbg(fhcd2xx, "couldn't init memory\n");
+ fhcd2xx_mem_cleanup(fhcd2xx);
return -ENOMEM;
}
/*
@@ -2032,15 +2032,15 @@ fail:
*/

/* fill a qtd, returning how much of the buffer we were able to queue up */
-static int qtd_fill(struct fotg210_hcd *fotg210, struct fotg210_qtd *qtd,
+static int qtd_fill(struct fhcd2xx_hcd *fhcd2xx, struct fhcd2xx_qtd *qtd,
dma_addr_t buf, size_t len, int token, int maxpacket)
{
int i, count;
u64 addr = buf;

/* one buffer entry per 4K ... first might be short or unaligned */
- qtd->hw_buf[0] = cpu_to_hc32(fotg210, (u32)addr);
- qtd->hw_buf_hi[0] = cpu_to_hc32(fotg210, (u32)(addr >> 32));
+ qtd->hw_buf[0] = cpu_to_hc32(fhcd2xx, (u32)addr);
+ qtd->hw_buf_hi[0] = cpu_to_hc32(fhcd2xx, (u32)(addr >> 32));
count = 0x1000 - (buf & 0x0fff); /* rest of that page */
if (likely(len < count)) /* ... iff needed */
count = len;
@@ -2051,8 +2051,8 @@ static int qtd_fill(struct fotg210_hcd *fotg210, struct fotg210_qtd *qtd,
/* per-qtd limit: from 16K to 20K (best alignment) */
for (i = 1; count < len && i < 5; i++) {
addr = buf;
- qtd->hw_buf[i] = cpu_to_hc32(fotg210, (u32)addr);
- qtd->hw_buf_hi[i] = cpu_to_hc32(fotg210,
+ qtd->hw_buf[i] = cpu_to_hc32(fhcd2xx, (u32)addr);
+ qtd->hw_buf_hi[i] = cpu_to_hc32(fhcd2xx,
(u32)(addr >> 32));
buf += 0x1000;
if ((count + 0x1000) < len)
@@ -2065,56 +2065,56 @@ static int qtd_fill(struct fotg210_hcd *fotg210, struct fotg210_qtd *qtd,
if (count != len)
count -= (count % maxpacket);
}
- qtd->hw_token = cpu_to_hc32(fotg210, (count << 16) | token);
+ qtd->hw_token = cpu_to_hc32(fhcd2xx, (count << 16) | token);
qtd->length = count;

return count;
}

-static inline void qh_update(struct fotg210_hcd *fotg210,
- struct fotg210_qh *qh,
- struct fotg210_qtd *qtd)
+static inline void qh_update(struct fhcd2xx_hcd *fhcd2xx,
+ struct fhcd2xx_qh *qh,
+ struct fhcd2xx_qtd *qtd)
{
- struct fotg210_qh_hw *hw = qh->hw;
+ struct fhcd2xx_qh_hw *hw = qh->hw;

/* writes to an active overlay are unsafe */
BUG_ON(qh->qh_state != QH_STATE_IDLE);

- hw->hw_qtd_next = QTD_NEXT(fotg210, qtd->qtd_dma);
- hw->hw_alt_next = FOTG210_LIST_END(fotg210);
+ hw->hw_qtd_next = QTD_NEXT(fhcd2xx, qtd->qtd_dma);
+ hw->hw_alt_next = FHCD2XX_LIST_END(fhcd2xx);

/* Except for control endpoints, we make hardware maintain data
* toggle (like OHCI) ... here (re)initialize the toggle in the QH,
* and set the pseudo-toggle in udev. Only usb_clear_halt() will
* ever clear it.
*/
- if (!(hw->hw_info1 & cpu_to_hc32(fotg210, QH_TOGGLE_CTL))) {
+ if (!(hw->hw_info1 & cpu_to_hc32(fhcd2xx, QH_TOGGLE_CTL))) {
unsigned is_out, epnum;

is_out = qh->is_out;
- epnum = (hc32_to_cpup(fotg210, &hw->hw_info1) >> 8) & 0x0f;
+ epnum = (hc32_to_cpup(fhcd2xx, &hw->hw_info1) >> 8) & 0x0f;
if (unlikely(!usb_gettoggle(qh->dev, epnum, is_out))) {
- hw->hw_token &= ~cpu_to_hc32(fotg210, QTD_TOGGLE);
+ hw->hw_token &= ~cpu_to_hc32(fhcd2xx, QTD_TOGGLE);
usb_settoggle(qh->dev, epnum, is_out, 1);
}
}

- hw->hw_token &= cpu_to_hc32(fotg210, QTD_TOGGLE | QTD_STS_PING);
+ hw->hw_token &= cpu_to_hc32(fhcd2xx, QTD_TOGGLE | QTD_STS_PING);
}

/* if it weren't for a common silicon quirk (writing the dummy into the qh
* overlay, so qh->hw_token wrongly becomes inactive/halted), only fault
* recovery (including urb dequeue) would need software changes to a QH...
*/
-static void qh_refresh(struct fotg210_hcd *fotg210, struct fotg210_qh *qh)
+static void qh_refresh(struct fhcd2xx_hcd *fhcd2xx, struct fhcd2xx_qh *qh)
{
- struct fotg210_qtd *qtd;
+ struct fhcd2xx_qtd *qtd;

if (list_empty(&qh->qtd_list))
qtd = qh->dummy;
else {
qtd = list_entry(qh->qtd_list.next,
- struct fotg210_qtd, qtd_list);
+ struct fhcd2xx_qtd, qtd_list);
/*
* first qtd may already be partially processed.
* If we come here during unlink, the QH overlay region
@@ -2122,35 +2122,35 @@ static void qh_refresh(struct fotg210_hcd *fotg210, struct fotg210_qh *qh)
* qtd is updated in qh_completions(). Update the QH
* overlay here.
*/
- if (cpu_to_hc32(fotg210, qtd->qtd_dma) == qh->hw->hw_current) {
+ if (cpu_to_hc32(fhcd2xx, qtd->qtd_dma) == qh->hw->hw_current) {
qh->hw->hw_qtd_next = qtd->hw_next;
qtd = NULL;
}
}

if (qtd)
- qh_update(fotg210, qh, qtd);
+ qh_update(fhcd2xx, qh, qtd);
}

-static void qh_link_async(struct fotg210_hcd *fotg210, struct fotg210_qh *qh);
+static void qh_link_async(struct fhcd2xx_hcd *fhcd2xx, struct fhcd2xx_qh *qh);

-static void fotg210_clear_tt_buffer_complete(struct usb_hcd *hcd,
+static void fhcd2xx_clear_tt_buffer_complete(struct usb_hcd *hcd,
struct usb_host_endpoint *ep)
{
- struct fotg210_hcd *fotg210 = hcd_to_fotg210(hcd);
- struct fotg210_qh *qh = ep->hcpriv;
+ struct fhcd2xx_hcd *fhcd2xx = hcd_to_fhcd2xx(hcd);
+ struct fhcd2xx_qh *qh = ep->hcpriv;
unsigned long flags;

- spin_lock_irqsave(&fotg210->lock, flags);
+ spin_lock_irqsave(&fhcd2xx->lock, flags);
qh->clearing_tt = 0;
if (qh->qh_state == QH_STATE_IDLE && !list_empty(&qh->qtd_list)
- && fotg210->rh_state == FOTG210_RH_RUNNING)
- qh_link_async(fotg210, qh);
- spin_unlock_irqrestore(&fotg210->lock, flags);
+ && fhcd2xx->rh_state == FHCD2XX_RH_RUNNING)
+ qh_link_async(fhcd2xx, qh);
+ spin_unlock_irqrestore(&fhcd2xx->lock, flags);
}

-static void fotg210_clear_tt_buffer(struct fotg210_hcd *fotg210,
- struct fotg210_qh *qh,
+static void fhcd2xx_clear_tt_buffer(struct fhcd2xx_hcd *fhcd2xx,
+ struct fhcd2xx_qh *qh,
struct urb *urb, u32 token)
{

@@ -2169,14 +2169,14 @@ static void fotg210_clear_tt_buffer(struct fotg210_hcd *fotg210,
usb_pipeendpoint(urb->pipe), token);

if (urb->dev->tt->hub !=
- fotg210_to_hcd(fotg210)->self.root_hub) {
+ fhcd2xx_to_hcd(fhcd2xx)->self.root_hub) {
if (usb_hub_clear_tt_buffer(urb) == 0)
qh->clearing_tt = 1;
}
}
}

-static int qtd_copy_status(struct fotg210_hcd *fotg210, struct urb *urb,
+static int qtd_copy_status(struct fhcd2xx_hcd *fhcd2xx, struct urb *urb,
size_t length, u32 token)
{
int status = -EINPROGRESS;
@@ -2215,7 +2215,7 @@ static int qtd_copy_status(struct fotg210_hcd *fotg210, struct urb *urb,
: -ECOMM; /* hc couldn't write data */
} else if (token & QTD_STS_XACT) {
/* timeout, bad CRC, wrong PID, etc */
- fotg210_dbg(fotg210, "devpath %s ep%d%s 3strikes\n",
+ fhcd2xx_dbg(fhcd2xx, "devpath %s ep%d%s 3strikes\n",
urb->dev->devpath,
usb_pipeendpoint(urb->pipe),
usb_pipein(urb->pipe) ? "in" : "out");
@@ -2224,7 +2224,7 @@ static int qtd_copy_status(struct fotg210_hcd *fotg210, struct urb *urb,
status = -EPROTO;
}

- fotg210_dbg(fotg210,
+ fhcd2xx_dbg(fhcd2xx,
"dev%d ep%d%s qtd token %08x --> status %d\n",
usb_pipedevice(urb->pipe),
usb_pipeendpoint(urb->pipe),
@@ -2235,33 +2235,33 @@ static int qtd_copy_status(struct fotg210_hcd *fotg210, struct urb *urb,
return status;
}

-static void fotg210_urb_done(struct fotg210_hcd *fotg210, struct urb *urb,
+static void fhcd2xx_urb_done(struct fhcd2xx_hcd *fhcd2xx, struct urb *urb,
int status)
-__releases(fotg210->lock)
-__acquires(fotg210->lock)
+__releases(fhcd2xx->lock)
+__acquires(fhcd2xx->lock)
{
if (likely(urb->hcpriv != NULL)) {
- struct fotg210_qh *qh = (struct fotg210_qh *) urb->hcpriv;
+ struct fhcd2xx_qh *qh = (struct fhcd2xx_qh *) urb->hcpriv;

/* S-mask in a QH means it's an interrupt urb */
- if ((qh->hw->hw_info2 & cpu_to_hc32(fotg210, QH_SMASK)) != 0) {
+ if ((qh->hw->hw_info2 & cpu_to_hc32(fhcd2xx, QH_SMASK)) != 0) {

/* ... update hc-wide periodic stats (for usbfs) */
- fotg210_to_hcd(fotg210)->self.bandwidth_int_reqs--;
+ fhcd2xx_to_hcd(fhcd2xx)->self.bandwidth_int_reqs--;
}
}

if (unlikely(urb->unlinked)) {
- COUNT(fotg210->stats.unlink);
+ COUNT(fhcd2xx->stats.unlink);
} else {
/* report non-error and short read status as zero */
if (status == -EINPROGRESS || status == -EREMOTEIO)
status = 0;
- COUNT(fotg210->stats.complete);
+ COUNT(fhcd2xx->stats.complete);
}

-#ifdef FOTG210_URB_TRACE
- fotg210_dbg(fotg210,
+#ifdef FHCD2XX_URB_TRACE
+ fhcd2xx_dbg(fhcd2xx,
"%s %s urb %p ep%d%s status %d len %d/%d\n",
__func__, urb->dev->devpath, urb,
usb_pipeendpoint(urb->pipe),
@@ -2271,29 +2271,29 @@ __acquires(fotg210->lock)
#endif

/* complete() can reenter this HCD */
- usb_hcd_unlink_urb_from_ep(fotg210_to_hcd(fotg210), urb);
- spin_unlock(&fotg210->lock);
- usb_hcd_giveback_urb(fotg210_to_hcd(fotg210), urb, status);
- spin_lock(&fotg210->lock);
+ usb_hcd_unlink_urb_from_ep(fhcd2xx_to_hcd(fhcd2xx), urb);
+ spin_unlock(&fhcd2xx->lock);
+ usb_hcd_giveback_urb(fhcd2xx_to_hcd(fhcd2xx), urb, status);
+ spin_lock(&fhcd2xx->lock);
}

-static int qh_schedule(struct fotg210_hcd *fotg210, struct fotg210_qh *qh);
+static int qh_schedule(struct fhcd2xx_hcd *fhcd2xx, struct fhcd2xx_qh *qh);

/*
* Process and free completed qtds for a qh, returning URBs to drivers.
* Chases up to qh->hw_current. Returns number of completions called,
* indicating how much "real" work we did.
*/
-static unsigned qh_completions(struct fotg210_hcd *fotg210,
- struct fotg210_qh *qh)
+static unsigned qh_completions(struct fhcd2xx_hcd *fhcd2xx,
+ struct fhcd2xx_qh *qh)
{
- struct fotg210_qtd *last, *end = qh->dummy;
+ struct fhcd2xx_qtd *last, *end = qh->dummy;
struct list_head *entry, *tmp;
int last_status;
int stopped;
unsigned count = 0;
u8 state;
- struct fotg210_qh_hw *hw = qh->hw;
+ struct fhcd2xx_qh_hw *hw = qh->hw;

if (unlikely(list_empty(&qh->qtd_list)))
return count;
@@ -2323,22 +2323,22 @@ rescan:
* if queue is stopped, handles unlinks.
*/
list_for_each_safe(entry, tmp, &qh->qtd_list) {
- struct fotg210_qtd *qtd;
+ struct fhcd2xx_qtd *qtd;
struct urb *urb;
u32 token = 0;

- qtd = list_entry(entry, struct fotg210_qtd, qtd_list);
+ qtd = list_entry(entry, struct fhcd2xx_qtd, qtd_list);
urb = qtd->urb;

/* clean up any state from previous QTD ...*/
if (last) {
if (likely(last->urb != urb)) {
- fotg210_urb_done(fotg210, last->urb,
+ fhcd2xx_urb_done(fhcd2xx, last->urb,
last_status);
count++;
last_status = -EINPROGRESS;
}
- fotg210_qtd_free(fotg210, last);
+ fhcd2xx_qtd_free(fhcd2xx, last);
last = NULL;
}

@@ -2348,7 +2348,7 @@ rescan:

/* hardware copies qtd out of qh overlay */
rmb();
- token = hc32_to_cpu(fotg210, qtd->hw_token);
+ token = hc32_to_cpu(fhcd2xx, qtd->hw_token);

/* always clean up qtds the hc de-activated */
retry_xacterr:
@@ -2356,7 +2356,7 @@ retry_xacterr:

/* Report Data Buffer Error: non-fatal but useful */
if (token & QTD_STS_DBE)
- fotg210_dbg(fotg210,
+ fhcd2xx_dbg(fhcd2xx,
"detected DataBufferErr for urb %p ep%d%s len %d, qtd %p [qh %p]\n",
urb,
usb_endpoint_num(&urb->ep->desc),
@@ -2378,7 +2378,7 @@ retry_xacterr:
QTD_CERR(token) == 0 &&
++qh->xacterrs < QH_XACTERR_MAX &&
!urb->unlinked) {
- fotg210_dbg(fotg210,
+ fhcd2xx_dbg(fhcd2xx,
"detected XactErr len %zu/%zu retry %d\n",
qtd->length - QTD_LENGTH(token), qtd->length, qh->xacterrs);

@@ -2389,11 +2389,11 @@ retry_xacterr:
*/
token &= ~QTD_STS_HALT;
token |= QTD_STS_ACTIVE |
- (FOTG210_TUNE_CERR << 10);
- qtd->hw_token = cpu_to_hc32(fotg210,
+ (FHCD2XX_TUNE_CERR << 10);
+ qtd->hw_token = cpu_to_hc32(fhcd2xx,
token);
wmb();
- hw->hw_token = cpu_to_hc32(fotg210,
+ hw->hw_token = cpu_to_hc32(fhcd2xx,
token);
goto retry_xacterr;
}
@@ -2410,13 +2410,13 @@ retry_xacterr:
*/
} else if (IS_SHORT_READ(token)
&& !(qtd->hw_alt_next
- & FOTG210_LIST_END(fotg210))) {
+ & FHCD2XX_LIST_END(fhcd2xx))) {
stopped = 1;
}

/* stop scanning when we reach qtds the hc is using */
} else if (likely(!stopped
- && fotg210->rh_state >= FOTG210_RH_RUNNING)) {
+ && fhcd2xx->rh_state >= FHCD2XX_RH_RUNNING)) {
break;

/* scan the whole queue for unlinks whenever it stops */
@@ -2424,7 +2424,7 @@ retry_xacterr:
stopped = 1;

/* cancel everything if we halt, suspend, etc */
- if (fotg210->rh_state < FOTG210_RH_RUNNING)
+ if (fhcd2xx->rh_state < FHCD2XX_RH_RUNNING)
last_status = -ESHUTDOWN;

/* this qtd is active; skip it unless a previous qtd
@@ -2435,15 +2435,15 @@ retry_xacterr:

/* qh unlinked; token in overlay may be most current */
if (state == QH_STATE_IDLE
- && cpu_to_hc32(fotg210, qtd->qtd_dma)
+ && cpu_to_hc32(fhcd2xx, qtd->qtd_dma)
== hw->hw_current) {
- token = hc32_to_cpu(fotg210, hw->hw_token);
+ token = hc32_to_cpu(fhcd2xx, hw->hw_token);

/* An unlink may leave an incomplete
* async transaction in the TT buffer.
* We have to clear it.
*/
- fotg210_clear_tt_buffer(fotg210, qh, urb,
+ fhcd2xx_clear_tt_buffer(fhcd2xx, qh, urb,
token);
}
}
@@ -2456,11 +2456,11 @@ retry_xacterr:
* short read the second must be removed by hand.
*/
if (last_status == -EINPROGRESS) {
- last_status = qtd_copy_status(fotg210, urb,
+ last_status = qtd_copy_status(fhcd2xx, urb,
qtd->length, token);
if (last_status == -EREMOTEIO
&& (qtd->hw_alt_next
- & FOTG210_LIST_END(fotg210)))
+ & FHCD2XX_LIST_END(fhcd2xx)))
last_status = -EINPROGRESS;

/* As part of low/full-speed endpoint-halt processing
@@ -2478,7 +2478,7 @@ retry_xacterr:
* is a violation of the spec.
*/
if (last_status != -EPIPE)
- fotg210_clear_tt_buffer(fotg210, qh,
+ fhcd2xx_clear_tt_buffer(fhcd2xx, qh,
urb, token);
}
}
@@ -2488,7 +2488,7 @@ retry_xacterr:
*/
if (stopped && qtd->qtd_list.prev != &qh->qtd_list) {
last = list_entry(qtd->qtd_list.prev,
- struct fotg210_qtd, qtd_list);
+ struct fhcd2xx_qtd, qtd_list);
last->hw_next = qtd->hw_next;
}

@@ -2502,9 +2502,9 @@ retry_xacterr:

/* last urb's completion might still need calling */
if (likely(last != NULL)) {
- fotg210_urb_done(fotg210, last->urb, last_status);
+ fhcd2xx_urb_done(fhcd2xx, last->urb, last_status);
count++;
- fotg210_qtd_free(fotg210, last);
+ fhcd2xx_qtd_free(fhcd2xx, last);
}

/* Do we need to rescan for URBs dequeued during a giveback? */
@@ -2529,10 +2529,10 @@ retry_xacterr:
* it after fault cleanup, or recovering from silicon wrongly
* overlaying the dummy qtd (which reduces DMA chatter).
*/
- if (stopped != 0 || hw->hw_qtd_next == FOTG210_LIST_END(fotg210)) {
+ if (stopped != 0 || hw->hw_qtd_next == FHCD2XX_LIST_END(fhcd2xx)) {
switch (state) {
case QH_STATE_IDLE:
- qh_refresh(fotg210, qh);
+ qh_refresh(fhcd2xx, qh);
break;
case QH_STATE_LINKED:
/* We won't refresh a QH that's linked (after the HC
@@ -2566,29 +2566,29 @@ retry_xacterr:
* reverse of qh_urb_transaction: free a list of TDs.
* used for cleanup after errors, before HC sees an URB's TDs.
*/
-static void qtd_list_free(struct fotg210_hcd *fotg210, struct urb *urb,
+static void qtd_list_free(struct fhcd2xx_hcd *fhcd2xx, struct urb *urb,
struct list_head *qtd_list)
{
struct list_head *entry, *temp;

list_for_each_safe(entry, temp, qtd_list) {
- struct fotg210_qtd *qtd;
+ struct fhcd2xx_qtd *qtd;

- qtd = list_entry(entry, struct fotg210_qtd, qtd_list);
+ qtd = list_entry(entry, struct fhcd2xx_qtd, qtd_list);
list_del(&qtd->qtd_list);
- fotg210_qtd_free(fotg210, qtd);
+ fhcd2xx_qtd_free(fhcd2xx, qtd);
}
}

/*
* create a list of filled qtds for this URB; won't link into qh.
*/
-static struct list_head *qh_urb_transaction(struct fotg210_hcd *fotg210,
+static struct list_head *qh_urb_transaction(struct fhcd2xx_hcd *fhcd2xx,
struct urb *urb,
struct list_head *head,
gfp_t flags)
{
- struct fotg210_qtd *qtd, *qtd_prev;
+ struct fhcd2xx_qtd *qtd, *qtd_prev;
dma_addr_t buf;
int len, this_sg_len, maxpacket;
int is_input;
@@ -2599,32 +2599,32 @@ static struct list_head *qh_urb_transaction(struct fotg210_hcd *fotg210,
/*
* URBs map to sequences of QTDs: one logical transaction
*/
- qtd = fotg210_qtd_alloc(fotg210, flags);
+ qtd = fhcd2xx_qtd_alloc(fhcd2xx, flags);
if (unlikely(!qtd))
return NULL;
list_add_tail(&qtd->qtd_list, head);
qtd->urb = urb;

token = QTD_STS_ACTIVE;
- token |= (FOTG210_TUNE_CERR << 10);
+ token |= (FHCD2XX_TUNE_CERR << 10);
/* for split transactions, SplitXState initialized to zero */

len = urb->transfer_buffer_length;
is_input = usb_pipein(urb->pipe);
if (usb_pipecontrol(urb->pipe)) {
/* SETUP pid */
- qtd_fill(fotg210, qtd, urb->setup_dma,
+ qtd_fill(fhcd2xx, qtd, urb->setup_dma,
sizeof(struct usb_ctrlrequest),
token | (2 /* "setup" */ << 8), 8);

/* ... and always at least one more pid */
token ^= QTD_TOGGLE;
qtd_prev = qtd;
- qtd = fotg210_qtd_alloc(fotg210, flags);
+ qtd = fhcd2xx_qtd_alloc(fhcd2xx, flags);
if (unlikely(!qtd))
goto cleanup;
qtd->urb = urb;
- qtd_prev->hw_next = QTD_NEXT(fotg210, qtd->qtd_dma);
+ qtd_prev->hw_next = QTD_NEXT(fhcd2xx, qtd->qtd_dma);
list_add_tail(&qtd->qtd_list, head);

/* for zero length DATA stages, STATUS is always IN */
@@ -2664,7 +2664,7 @@ static struct list_head *qh_urb_transaction(struct fotg210_hcd *fotg210,
for (;;) {
int this_qtd_len;

- this_qtd_len = qtd_fill(fotg210, qtd, buf, this_sg_len, token,
+ this_qtd_len = qtd_fill(fhcd2xx, qtd, buf, this_sg_len, token,
maxpacket);
this_sg_len -= this_qtd_len;
len -= this_qtd_len;
@@ -2676,7 +2676,7 @@ static struct list_head *qh_urb_transaction(struct fotg210_hcd *fotg210,
* (this will usually be overridden later.)
*/
if (is_input)
- qtd->hw_alt_next = fotg210->async->hw->hw_alt_next;
+ qtd->hw_alt_next = fhcd2xx->async->hw->hw_alt_next;

/* qh makes control packets use qtd toggle; maybe switch it */
if ((maxpacket & (this_qtd_len + (maxpacket - 1))) == 0)
@@ -2691,11 +2691,11 @@ static struct list_head *qh_urb_transaction(struct fotg210_hcd *fotg210,
}

qtd_prev = qtd;
- qtd = fotg210_qtd_alloc(fotg210, flags);
+ qtd = fhcd2xx_qtd_alloc(fhcd2xx, flags);
if (unlikely(!qtd))
goto cleanup;
qtd->urb = urb;
- qtd_prev->hw_next = QTD_NEXT(fotg210, qtd->qtd_dma);
+ qtd_prev->hw_next = QTD_NEXT(fhcd2xx, qtd->qtd_dma);
list_add_tail(&qtd->qtd_list, head);
}

@@ -2706,7 +2706,7 @@ static struct list_head *qh_urb_transaction(struct fotg210_hcd *fotg210,
*/
if (likely((urb->transfer_flags & URB_SHORT_NOT_OK) == 0
|| usb_pipecontrol(urb->pipe)))
- qtd->hw_alt_next = FOTG210_LIST_END(fotg210);
+ qtd->hw_alt_next = FHCD2XX_LIST_END(fhcd2xx);

/*
* control requests may need a terminating data "status" ack;
@@ -2727,25 +2727,25 @@ static struct list_head *qh_urb_transaction(struct fotg210_hcd *fotg210,
}
if (one_more) {
qtd_prev = qtd;
- qtd = fotg210_qtd_alloc(fotg210, flags);
+ qtd = fhcd2xx_qtd_alloc(fhcd2xx, flags);
if (unlikely(!qtd))
goto cleanup;
qtd->urb = urb;
- qtd_prev->hw_next = QTD_NEXT(fotg210, qtd->qtd_dma);
+ qtd_prev->hw_next = QTD_NEXT(fhcd2xx, qtd->qtd_dma);
list_add_tail(&qtd->qtd_list, head);

/* never any data in such packets */
- qtd_fill(fotg210, qtd, 0, 0, token, 0);
+ qtd_fill(fhcd2xx, qtd, 0, 0, token, 0);
}
}

/* by default, enable interrupt on urb completion */
if (likely(!(urb->transfer_flags & URB_NO_INTERRUPT)))
- qtd->hw_token |= cpu_to_hc32(fotg210, QTD_IOC);
+ qtd->hw_token |= cpu_to_hc32(fhcd2xx, QTD_IOC);
return head;

cleanup:
- qtd_list_free(fotg210, urb, head);
+ qtd_list_free(fhcd2xx, urb, head);
return NULL;
}

@@ -2766,15 +2766,15 @@ cleanup:
* just one microframe in the s-mask. For split interrupt transactions
* there are additional complications: c-mask, maybe FSTNs.
*/
-static struct fotg210_qh *qh_make(struct fotg210_hcd *fotg210, struct urb *urb,
+static struct fhcd2xx_qh *qh_make(struct fhcd2xx_hcd *fhcd2xx, struct urb *urb,
gfp_t flags)
{
- struct fotg210_qh *qh = fotg210_qh_alloc(fotg210, flags);
+ struct fhcd2xx_qh *qh = fhcd2xx_qh_alloc(fhcd2xx, flags);
u32 info1 = 0, info2 = 0;
int is_input, type;
int maxp = 0;
struct usb_tt *tt = urb->dev->tt;
- struct fotg210_qh_hw *hw;
+ struct fhcd2xx_qh_hw *hw;

if (!qh)
return qh;
@@ -2793,7 +2793,7 @@ static struct fotg210_qh *qh_make(struct fotg210_hcd *fotg210, struct urb *urb,
* acts like up to 3KB, but is built from smaller packets.
*/
if (max_packet(maxp) > 1024) {
- fotg210_dbg(fotg210, "bogus qh maxpacket %d\n",
+ fhcd2xx_dbg(fhcd2xx, "bogus qh maxpacket %d\n",
max_packet(maxp));
goto done;
}
@@ -2823,8 +2823,8 @@ static struct fotg210_qh *qh_make(struct fotg210_hcd *fotg210, struct urb *urb,
* includes high bandwidth.
*/
urb->interval = 1;
- } else if (qh->period > fotg210->periodic_size) {
- qh->period = fotg210->periodic_size;
+ } else if (qh->period > fhcd2xx->periodic_size) {
+ qh->period = fhcd2xx->periodic_size;
urb->interval = qh->period << 3;
}
} else {
@@ -2848,8 +2848,8 @@ static struct fotg210_qh *qh_make(struct fotg210_hcd *fotg210, struct urb *urb,
usb_calc_bus_time(urb->dev->speed,
is_input, 0, max_packet(maxp)));
qh->period = urb->interval;
- if (qh->period > fotg210->periodic_size) {
- qh->period = fotg210->periodic_size;
+ if (qh->period > fhcd2xx->periodic_size) {
+ qh->period = fhcd2xx->periodic_size;
urb->interval = qh->period;
}
}
@@ -2867,19 +2867,19 @@ static struct fotg210_qh *qh_make(struct fotg210_hcd *fotg210, struct urb *urb,
case USB_SPEED_FULL:
/* EPS 0 means "full" */
if (type != PIPE_INTERRUPT)
- info1 |= (FOTG210_TUNE_RL_TT << 28);
+ info1 |= (FHCD2XX_TUNE_RL_TT << 28);
if (type == PIPE_CONTROL) {
info1 |= QH_CONTROL_EP; /* for TT */
info1 |= QH_TOGGLE_CTL; /* toggle from qtd */
}
info1 |= maxp << 16;

- info2 |= (FOTG210_TUNE_MULT_TT << 30);
+ info2 |= (FHCD2XX_TUNE_MULT_TT << 30);

/* Some Freescale processors have an erratum in which the
* port number in the queue head was 0..N-1 instead of 1..N.
*/
- if (fotg210_has_fsl_portno_bug(fotg210))
+ if (fhcd2xx_has_fsl_portno_bug(fhcd2xx))
info2 |= (urb->dev->ttport-1) << 23;
else
info2 |= urb->dev->ttport << 23;
@@ -2887,7 +2887,7 @@ static struct fotg210_qh *qh_make(struct fotg210_hcd *fotg210, struct urb *urb,
/* set the address of the TT; for TDI's integrated
* root hub tt, leave it zeroed.
*/
- if (tt && tt->hub != fotg210_to_hcd(fotg210)->self.root_hub)
+ if (tt && tt->hub != fhcd2xx_to_hcd(fhcd2xx)->self.root_hub)
info2 |= tt->hub->devnum << 16;

/* NOTE: if (PIPE_INTERRUPT) { scheduler sets c-mask } */
@@ -2897,12 +2897,12 @@ static struct fotg210_qh *qh_make(struct fotg210_hcd *fotg210, struct urb *urb,
case USB_SPEED_HIGH: /* no TT involved */
info1 |= QH_HIGH_SPEED;
if (type == PIPE_CONTROL) {
- info1 |= (FOTG210_TUNE_RL_HS << 28);
+ info1 |= (FHCD2XX_TUNE_RL_HS << 28);
info1 |= 64 << 16; /* usb2 fixed maxpacket */
info1 |= QH_TOGGLE_CTL; /* toggle from qtd */
- info2 |= (FOTG210_TUNE_MULT_HS << 30);
+ info2 |= (FHCD2XX_TUNE_MULT_HS << 30);
} else if (type == PIPE_BULK) {
- info1 |= (FOTG210_TUNE_RL_HS << 28);
+ info1 |= (FHCD2XX_TUNE_RL_HS << 28);
/* The USB spec says that high speed bulk endpoints
* always use 512 byte maxpacket. But some device
* vendors decided to ignore that, and MSFT is happy
@@ -2910,17 +2910,17 @@ static struct fotg210_qh *qh_make(struct fotg210_hcd *fotg210, struct urb *urb,
* such nonconformant devices with Linux too; sigh.
*/
info1 |= max_packet(maxp) << 16;
- info2 |= (FOTG210_TUNE_MULT_HS << 30);
+ info2 |= (FHCD2XX_TUNE_MULT_HS << 30);
} else { /* PIPE_INTERRUPT */
info1 |= max_packet(maxp) << 16;
info2 |= hb_mult(maxp) << 30;
}
break;
default:
- fotg210_dbg(fotg210, "bogus dev %p speed %d\n", urb->dev,
+ fhcd2xx_dbg(fhcd2xx, "bogus dev %p speed %d\n", urb->dev,
urb->dev->speed);
done:
- qh_destroy(fotg210, qh);
+ qh_destroy(fhcd2xx, qh);
return NULL;
}

@@ -2929,45 +2929,45 @@ done:
/* init as live, toggle clear, advance to dummy */
qh->qh_state = QH_STATE_IDLE;
hw = qh->hw;
- hw->hw_info1 = cpu_to_hc32(fotg210, info1);
- hw->hw_info2 = cpu_to_hc32(fotg210, info2);
+ hw->hw_info1 = cpu_to_hc32(fhcd2xx, info1);
+ hw->hw_info2 = cpu_to_hc32(fhcd2xx, info2);
qh->is_out = !is_input;
usb_settoggle(urb->dev, usb_pipeendpoint(urb->pipe), !is_input, 1);
- qh_refresh(fotg210, qh);
+ qh_refresh(fhcd2xx, qh);
return qh;
}

-static void enable_async(struct fotg210_hcd *fotg210)
+static void enable_async(struct fhcd2xx_hcd *fhcd2xx)
{
- if (fotg210->async_count++)
+ if (fhcd2xx->async_count++)
return;

/* Stop waiting to turn off the async schedule */
- fotg210->enabled_hrtimer_events &= ~BIT(FOTG210_HRTIMER_DISABLE_ASYNC);
+ fhcd2xx->enabled_hrtimer_events &= ~BIT(FHCD2XX_HRTIMER_DISABLE_ASYNC);

/* Don't start the schedule until ASS is 0 */
- fotg210_poll_ASS(fotg210);
- turn_on_io_watchdog(fotg210);
+ fhcd2xx_poll_ASS(fhcd2xx);
+ turn_on_io_watchdog(fhcd2xx);
}

-static void disable_async(struct fotg210_hcd *fotg210)
+static void disable_async(struct fhcd2xx_hcd *fhcd2xx)
{
- if (--fotg210->async_count)
+ if (--fhcd2xx->async_count)
return;

/* The async schedule and async_unlink list are supposed to be empty */
- WARN_ON(fotg210->async->qh_next.qh || fotg210->async_unlink);
+ WARN_ON(fhcd2xx->async->qh_next.qh || fhcd2xx->async_unlink);

/* Don't turn off the schedule until ASS is 1 */
- fotg210_poll_ASS(fotg210);
+ fhcd2xx_poll_ASS(fhcd2xx);
}

/* move qh (and its qtds) onto async queue; maybe enable queue. */

-static void qh_link_async(struct fotg210_hcd *fotg210, struct fotg210_qh *qh)
+static void qh_link_async(struct fhcd2xx_hcd *fhcd2xx, struct fhcd2xx_qh *qh)
{
- __hc32 dma = QH_NEXT(fotg210, qh->qh_dma);
- struct fotg210_qh *head;
+ __hc32 dma = QH_NEXT(fhcd2xx, qh->qh_dma);
+ struct fhcd2xx_qh *head;

/* Don't link a QH if there's a Clear-TT-Buffer pending */
if (unlikely(qh->clearing_tt))
@@ -2976,10 +2976,10 @@ static void qh_link_async(struct fotg210_hcd *fotg210, struct fotg210_qh *qh)
WARN_ON(qh->qh_state != QH_STATE_IDLE);

/* clear halt and/or toggle; and maybe recover from silicon quirk */
- qh_refresh(fotg210, qh);
+ qh_refresh(fhcd2xx, qh);

/* splice right after start */
- head = fotg210->async;
+ head = fhcd2xx->async;
qh->qh_next = head->qh_next;
qh->hw->hw_next = head->hw->hw_next;
wmb();
@@ -2991,7 +2991,7 @@ static void qh_link_async(struct fotg210_hcd *fotg210, struct fotg210_qh *qh)
qh->qh_state = QH_STATE_LINKED;
/* qtd completions reported later by interrupt */

- enable_async(fotg210);
+ enable_async(fhcd2xx);
}

/*
@@ -3000,27 +3000,27 @@ static void qh_link_async(struct fotg210_hcd *fotg210, struct fotg210_qh *qh)
* Returns null if it can't allocate a QH it needs to.
* If the QH has TDs (urbs) already, that's great.
*/
-static struct fotg210_qh *qh_append_tds(struct fotg210_hcd *fotg210,
+static struct fhcd2xx_qh *qh_append_tds(struct fhcd2xx_hcd *fhcd2xx,
struct urb *urb,
struct list_head *qtd_list, int epnum,
void **ptr)
{
- struct fotg210_qh *qh = NULL;
- __hc32 qh_addr_mask = cpu_to_hc32(fotg210, 0x7f);
+ struct fhcd2xx_qh *qh = NULL;
+ __hc32 qh_addr_mask = cpu_to_hc32(fhcd2xx, 0x7f);

- qh = (struct fotg210_qh *) *ptr;
+ qh = (struct fhcd2xx_qh *) *ptr;
if (unlikely(qh == NULL)) {
- /* can't sleep here, we have fotg210->lock... */
- qh = qh_make(fotg210, urb, GFP_ATOMIC);
+ /* can't sleep here, we have fhcd2xx->lock... */
+ qh = qh_make(fhcd2xx, urb, GFP_ATOMIC);
*ptr = qh;
}
if (likely(qh != NULL)) {
- struct fotg210_qtd *qtd;
+ struct fhcd2xx_qtd *qtd;

if (unlikely(list_empty(qtd_list)))
qtd = NULL;
else
- qtd = list_entry(qtd_list->next, struct fotg210_qtd,
+ qtd = list_entry(qtd_list->next, struct fhcd2xx_qtd,
qtd_list);

/* control qh may need patching ... */
@@ -3034,7 +3034,7 @@ static struct fotg210_qh *qh_append_tds(struct fotg210_hcd *fotg210,
* only hc or qh_refresh() ever modify the overlay.
*/
if (likely(qtd != NULL)) {
- struct fotg210_qtd *dummy;
+ struct fhcd2xx_qtd *dummy;
dma_addr_t dma;
__hc32 token;

@@ -3044,7 +3044,7 @@ static struct fotg210_qh *qh_append_tds(struct fotg210_hcd *fotg210,
* HC is allowed to fetch the old dummy (4.10.2).
*/
token = qtd->hw_token;
- qtd->hw_token = HALT_BIT(fotg210);
+ qtd->hw_token = HALT_BIT(fhcd2xx);

dummy = qh->dummy;

@@ -3056,14 +3056,14 @@ static struct fotg210_qh *qh_append_tds(struct fotg210_hcd *fotg210,
list_add(&dummy->qtd_list, qtd_list);
list_splice_tail(qtd_list, &qh->qtd_list);

- fotg210_qtd_init(fotg210, qtd, qtd->qtd_dma);
+ fhcd2xx_qtd_init(fhcd2xx, qtd, qtd->qtd_dma);
qh->dummy = qtd;

/* hc must see the new dummy at list end */
dma = qtd->qtd_dma;
qtd = list_entry(qh->qtd_list.prev,
- struct fotg210_qtd, qtd_list);
- qtd->hw_next = QTD_NEXT(fotg210, dma);
+ struct fhcd2xx_qtd, qtd_list);
+ qtd->hw_next = QTD_NEXT(fhcd2xx, dma);

/* let the hc process these next qtds */
wmb();
@@ -3075,22 +3075,22 @@ static struct fotg210_qh *qh_append_tds(struct fotg210_hcd *fotg210,
return qh;
}

-static int submit_async(struct fotg210_hcd *fotg210, struct urb *urb,
+static int submit_async(struct fhcd2xx_hcd *fhcd2xx, struct urb *urb,
struct list_head *qtd_list, gfp_t mem_flags)
{
int epnum;
unsigned long flags;
- struct fotg210_qh *qh = NULL;
+ struct fhcd2xx_qh *qh = NULL;
int rc;

epnum = urb->ep->desc.bEndpointAddress;

-#ifdef FOTG210_URB_TRACE
+#ifdef FHCD2XX_URB_TRACE
{
- struct fotg210_qtd *qtd;
+ struct fhcd2xx_qtd *qtd;

- qtd = list_entry(qtd_list->next, struct fotg210_qtd, qtd_list);
- fotg210_dbg(fotg210,
+ qtd = list_entry(qtd_list->next, struct fhcd2xx_qtd, qtd_list);
+ fhcd2xx_dbg(fhcd2xx,
"%s %s urb %p ep%d%s len %d, qtd %p [qh %p]\n",
__func__, urb->dev->devpath, urb,
epnum & 0x0f, (epnum & USB_DIR_IN) ? "in" : "out",
@@ -3099,18 +3099,18 @@ static int submit_async(struct fotg210_hcd *fotg210, struct urb *urb,
}
#endif

- spin_lock_irqsave(&fotg210->lock, flags);
- if (unlikely(!HCD_HW_ACCESSIBLE(fotg210_to_hcd(fotg210)))) {
+ spin_lock_irqsave(&fhcd2xx->lock, flags);
+ if (unlikely(!HCD_HW_ACCESSIBLE(fhcd2xx_to_hcd(fhcd2xx)))) {
rc = -ESHUTDOWN;
goto done;
}
- rc = usb_hcd_link_urb_to_ep(fotg210_to_hcd(fotg210), urb);
+ rc = usb_hcd_link_urb_to_ep(fhcd2xx_to_hcd(fhcd2xx), urb);
if (unlikely(rc))
goto done;

- qh = qh_append_tds(fotg210, urb, qtd_list, epnum, &urb->ep->hcpriv);
+ qh = qh_append_tds(fhcd2xx, urb, qtd_list, epnum, &urb->ep->hcpriv);
if (unlikely(qh == NULL)) {
- usb_hcd_unlink_urb_from_ep(fotg210_to_hcd(fotg210), urb);
+ usb_hcd_unlink_urb_from_ep(fhcd2xx_to_hcd(fhcd2xx), urb);
rc = -ENOMEM;
goto done;
}
@@ -3119,110 +3119,110 @@ static int submit_async(struct fotg210_hcd *fotg210, struct urb *urb,
* the HC and TT handle it when the TT has a buffer ready.
*/
if (likely(qh->qh_state == QH_STATE_IDLE))
- qh_link_async(fotg210, qh);
+ qh_link_async(fhcd2xx, qh);
done:
- spin_unlock_irqrestore(&fotg210->lock, flags);
+ spin_unlock_irqrestore(&fhcd2xx->lock, flags);
if (unlikely(qh == NULL))
- qtd_list_free(fotg210, urb, qtd_list);
+ qtd_list_free(fhcd2xx, urb, qtd_list);
return rc;
}

-static void single_unlink_async(struct fotg210_hcd *fotg210,
- struct fotg210_qh *qh)
+static void single_unlink_async(struct fhcd2xx_hcd *fhcd2xx,
+ struct fhcd2xx_qh *qh)
{
- struct fotg210_qh *prev;
+ struct fhcd2xx_qh *prev;

/* Add to the end of the list of QHs waiting for the next IAAD */
qh->qh_state = QH_STATE_UNLINK;
- if (fotg210->async_unlink)
- fotg210->async_unlink_last->unlink_next = qh;
+ if (fhcd2xx->async_unlink)
+ fhcd2xx->async_unlink_last->unlink_next = qh;
else
- fotg210->async_unlink = qh;
- fotg210->async_unlink_last = qh;
+ fhcd2xx->async_unlink = qh;
+ fhcd2xx->async_unlink_last = qh;

/* Unlink it from the schedule */
- prev = fotg210->async;
+ prev = fhcd2xx->async;
while (prev->qh_next.qh != qh)
prev = prev->qh_next.qh;

prev->hw->hw_next = qh->hw->hw_next;
prev->qh_next = qh->qh_next;
- if (fotg210->qh_scan_next == qh)
- fotg210->qh_scan_next = qh->qh_next.qh;
+ if (fhcd2xx->qh_scan_next == qh)
+ fhcd2xx->qh_scan_next = qh->qh_next.qh;
}

-static void start_iaa_cycle(struct fotg210_hcd *fotg210, bool nested)
+static void start_iaa_cycle(struct fhcd2xx_hcd *fhcd2xx, bool nested)
{
/*
* Do nothing if an IAA cycle is already running or
* if one will be started shortly.
*/
- if (fotg210->async_iaa || fotg210->async_unlinking)
+ if (fhcd2xx->async_iaa || fhcd2xx->async_unlinking)
return;

/* Do all the waiting QHs at once */
- fotg210->async_iaa = fotg210->async_unlink;
- fotg210->async_unlink = NULL;
+ fhcd2xx->async_iaa = fhcd2xx->async_unlink;
+ fhcd2xx->async_unlink = NULL;

/* If the controller isn't running, we don't have to wait for it */
- if (unlikely(fotg210->rh_state < FOTG210_RH_RUNNING)) {
+ if (unlikely(fhcd2xx->rh_state < FHCD2XX_RH_RUNNING)) {
if (!nested) /* Avoid recursion */
- end_unlink_async(fotg210);
+ end_unlink_async(fhcd2xx);

/* Otherwise start a new IAA cycle */
- } else if (likely(fotg210->rh_state == FOTG210_RH_RUNNING)) {
+ } else if (likely(fhcd2xx->rh_state == FHCD2XX_RH_RUNNING)) {
/* Make sure the unlinks are all visible to the hardware */
wmb();

- fotg210_writel(fotg210, fotg210->command | CMD_IAAD,
- &fotg210->regs->command);
- fotg210_readl(fotg210, &fotg210->regs->command);
- fotg210_enable_event(fotg210, FOTG210_HRTIMER_IAA_WATCHDOG,
+ fhcd2xx_writel(fhcd2xx, fhcd2xx->command | CMD_IAAD,
+ &fhcd2xx->regs->command);
+ fhcd2xx_readl(fhcd2xx, &fhcd2xx->regs->command);
+ fhcd2xx_enable_event(fhcd2xx, FHCD2XX_HRTIMER_IAA_WATCHDOG,
true);
}
}

/* the async qh for the qtds being unlinked are now gone from the HC */

-static void end_unlink_async(struct fotg210_hcd *fotg210)
+static void end_unlink_async(struct fhcd2xx_hcd *fhcd2xx)
{
- struct fotg210_qh *qh;
+ struct fhcd2xx_qh *qh;

/* Process the idle QHs */
restart:
- fotg210->async_unlinking = true;
- while (fotg210->async_iaa) {
- qh = fotg210->async_iaa;
- fotg210->async_iaa = qh->unlink_next;
+ fhcd2xx->async_unlinking = true;
+ while (fhcd2xx->async_iaa) {
+ qh = fhcd2xx->async_iaa;
+ fhcd2xx->async_iaa = qh->unlink_next;
qh->unlink_next = NULL;

qh->qh_state = QH_STATE_IDLE;
qh->qh_next.qh = NULL;

- qh_completions(fotg210, qh);
+ qh_completions(fhcd2xx, qh);
if (!list_empty(&qh->qtd_list) &&
- fotg210->rh_state == FOTG210_RH_RUNNING)
- qh_link_async(fotg210, qh);
- disable_async(fotg210);
+ fhcd2xx->rh_state == FHCD2XX_RH_RUNNING)
+ qh_link_async(fhcd2xx, qh);
+ disable_async(fhcd2xx);
}
- fotg210->async_unlinking = false;
+ fhcd2xx->async_unlinking = false;

/* Start a new IAA cycle if any QHs are waiting for it */
- if (fotg210->async_unlink) {
- start_iaa_cycle(fotg210, true);
- if (unlikely(fotg210->rh_state < FOTG210_RH_RUNNING))
+ if (fhcd2xx->async_unlink) {
+ start_iaa_cycle(fhcd2xx, true);
+ if (unlikely(fhcd2xx->rh_state < FHCD2XX_RH_RUNNING))
goto restart;
}
}

-static void unlink_empty_async(struct fotg210_hcd *fotg210)
+static void unlink_empty_async(struct fhcd2xx_hcd *fhcd2xx)
{
- struct fotg210_qh *qh, *next;
- bool stopped = (fotg210->rh_state < FOTG210_RH_RUNNING);
+ struct fhcd2xx_qh *qh, *next;
+ bool stopped = (fhcd2xx->rh_state < FHCD2XX_RH_RUNNING);
bool check_unlinks_later = false;

/* Unlink all the async QHs that have been empty for a timer cycle */
- next = fotg210->async->qh_next.qh;
+ next = fhcd2xx->async->qh_next.qh;
while (next) {
qh = next;
next = qh->qh_next.qh;
@@ -3230,30 +3230,30 @@ static void unlink_empty_async(struct fotg210_hcd *fotg210)
if (list_empty(&qh->qtd_list) &&
qh->qh_state == QH_STATE_LINKED) {
if (!stopped && qh->unlink_cycle ==
- fotg210->async_unlink_cycle)
+ fhcd2xx->async_unlink_cycle)
check_unlinks_later = true;
else
- single_unlink_async(fotg210, qh);
+ single_unlink_async(fhcd2xx, qh);
}
}

/* Start a new IAA cycle if any QHs are waiting for it */
- if (fotg210->async_unlink)
- start_iaa_cycle(fotg210, false);
+ if (fhcd2xx->async_unlink)
+ start_iaa_cycle(fhcd2xx, false);

/* QHs that haven't been empty for long enough will be handled later */
if (check_unlinks_later) {
- fotg210_enable_event(fotg210, FOTG210_HRTIMER_ASYNC_UNLINKS,
+ fhcd2xx_enable_event(fhcd2xx, FHCD2XX_HRTIMER_ASYNC_UNLINKS,
true);
- ++fotg210->async_unlink_cycle;
+ ++fhcd2xx->async_unlink_cycle;
}
}

/* makes sure the async qh will become idle */
-/* caller must own fotg210->lock */
+/* caller must own fhcd2xx->lock */

-static void start_unlink_async(struct fotg210_hcd *fotg210,
- struct fotg210_qh *qh)
+static void start_unlink_async(struct fhcd2xx_hcd *fhcd2xx,
+ struct fhcd2xx_qh *qh)
{
/*
* If the QH isn't linked then there's nothing we can do
@@ -3266,19 +3266,19 @@ static void start_unlink_async(struct fotg210_hcd *fotg210,
return;
}

- single_unlink_async(fotg210, qh);
- start_iaa_cycle(fotg210, false);
+ single_unlink_async(fhcd2xx, qh);
+ start_iaa_cycle(fhcd2xx, false);
}

-static void scan_async(struct fotg210_hcd *fotg210)
+static void scan_async(struct fhcd2xx_hcd *fhcd2xx)
{
- struct fotg210_qh *qh;
+ struct fhcd2xx_qh *qh;
bool check_unlinks_later = false;

- fotg210->qh_scan_next = fotg210->async->qh_next.qh;
- while (fotg210->qh_scan_next) {
- qh = fotg210->qh_scan_next;
- fotg210->qh_scan_next = qh->qh_next.qh;
+ fhcd2xx->qh_scan_next = fhcd2xx->async->qh_next.qh;
+ while (fhcd2xx->qh_scan_next) {
+ qh = fhcd2xx->qh_scan_next;
+ fhcd2xx->qh_scan_next = qh->qh_next.qh;
rescan:
/* clean any finished work for this qh */
if (!list_empty(&qh->qtd_list)) {
@@ -3286,17 +3286,17 @@ rescan:

/*
* Unlinks could happen here; completion reporting
- * drops the lock. That's why fotg210->qh_scan_next
+ * drops the lock. That's why fhcd2xx->qh_scan_next
* always holds the next qh to scan; if the next qh
- * gets unlinked then fotg210->qh_scan_next is adjusted
+ * gets unlinked then fhcd2xx->qh_scan_next is adjusted
* in single_unlink_async().
*/
- temp = qh_completions(fotg210, qh);
+ temp = qh_completions(fhcd2xx, qh);
if (qh->needs_rescan) {
- start_unlink_async(fotg210, qh);
+ start_unlink_async(fhcd2xx, qh);
} else if (list_empty(&qh->qtd_list)
&& qh->qh_state == QH_STATE_LINKED) {
- qh->unlink_cycle = fotg210->async_unlink_cycle;
+ qh->unlink_cycle = fhcd2xx->async_unlink_cycle;
check_unlinks_later = true;
} else if (temp != 0)
goto rescan;
@@ -3309,12 +3309,12 @@ rescan:
* we just scanned, there's a not-unusual case that it
* doesn't stay idle for long.
*/
- if (check_unlinks_later && fotg210->rh_state == FOTG210_RH_RUNNING &&
- !(fotg210->enabled_hrtimer_events &
- BIT(FOTG210_HRTIMER_ASYNC_UNLINKS))) {
- fotg210_enable_event(fotg210,
- FOTG210_HRTIMER_ASYNC_UNLINKS, true);
- ++fotg210->async_unlink_cycle;
+ if (check_unlinks_later && fhcd2xx->rh_state == FHCD2XX_RH_RUNNING &&
+ !(fhcd2xx->enabled_hrtimer_events &
+ BIT(FHCD2XX_HRTIMER_ASYNC_UNLINKS))) {
+ fhcd2xx_enable_event(fhcd2xx,
+ FHCD2XX_HRTIMER_ASYNC_UNLINKS, true);
+ ++fhcd2xx->async_unlink_cycle;
}
}
/*
@@ -3329,18 +3329,18 @@ rescan:
* It keeps track of every ITD (or SITD) that's linked, and holds enough
* pre-calculated schedule data to make appending to the queue be quick.
*/
-static int fotg210_get_frame(struct usb_hcd *hcd);
+static int fhcd2xx_get_frame(struct usb_hcd *hcd);

/*
* periodic_next_shadow - return "next" pointer on shadow list
* @periodic: host pointer to qh/itd
* @tag: hardware tag for type of this record
*/
-static union fotg210_shadow *periodic_next_shadow(struct fotg210_hcd *fotg210,
- union fotg210_shadow *periodic,
+static union fhcd2xx_shadow *periodic_next_shadow(struct fhcd2xx_hcd *fhcd2xx,
+ union fhcd2xx_shadow *periodic,
__hc32 tag)
{
- switch (hc32_to_cpu(fotg210, tag)) {
+ switch (hc32_to_cpu(fhcd2xx, tag)) {
case Q_TYPE_QH:
return &periodic->qh->qh_next;
case Q_TYPE_FSTN:
@@ -3350,11 +3350,11 @@ static union fotg210_shadow *periodic_next_shadow(struct fotg210_hcd *fotg210,
}
}

-static __hc32 *shadow_next_periodic(struct fotg210_hcd *fotg210,
- union fotg210_shadow *periodic, __hc32 tag)
+static __hc32 *shadow_next_periodic(struct fhcd2xx_hcd *fhcd2xx,
+ union fhcd2xx_shadow *periodic, __hc32 tag)
{
- switch (hc32_to_cpu(fotg210, tag)) {
- /* our fotg210_shadow.qh is actually software part */
+ switch (hc32_to_cpu(fhcd2xx, tag)) {
+ /* our fhcd2xx_shadow.qh is actually software part */
case Q_TYPE_QH:
return &periodic->qh->hw->hw_next;
/* others are hw parts */
@@ -3363,20 +3363,20 @@ static __hc32 *shadow_next_periodic(struct fotg210_hcd *fotg210,
}
}

-/* caller must hold fotg210->lock */
-static void periodic_unlink(struct fotg210_hcd *fotg210, unsigned frame,
+/* caller must hold fhcd2xx->lock */
+static void periodic_unlink(struct fhcd2xx_hcd *fhcd2xx, unsigned frame,
void *ptr)
{
- union fotg210_shadow *prev_p = &fotg210->pshadow[frame];
- __hc32 *hw_p = &fotg210->periodic[frame];
- union fotg210_shadow here = *prev_p;
+ union fhcd2xx_shadow *prev_p = &fhcd2xx->pshadow[frame];
+ __hc32 *hw_p = &fhcd2xx->periodic[frame];
+ union fhcd2xx_shadow here = *prev_p;

/* find predecessor of "ptr"; hw and shadow lists are in sync */
while (here.ptr && here.ptr != ptr) {
- prev_p = periodic_next_shadow(fotg210, prev_p,
- Q_NEXT_TYPE(fotg210, *hw_p));
- hw_p = shadow_next_periodic(fotg210, &here,
- Q_NEXT_TYPE(fotg210, *hw_p));
+ prev_p = periodic_next_shadow(fhcd2xx, prev_p,
+ Q_NEXT_TYPE(fhcd2xx, *hw_p));
+ hw_p = shadow_next_periodic(fhcd2xx, &here,
+ Q_NEXT_TYPE(fhcd2xx, *hw_p));
here = *prev_p;
}
/* an interrupt entry (at list end) could have been shared */
@@ -3386,31 +3386,31 @@ static void periodic_unlink(struct fotg210_hcd *fotg210, unsigned frame,
/* update shadow and hardware lists ... the old "next" pointers
* from ptr may still be in use, the caller updates them.
*/
- *prev_p = *periodic_next_shadow(fotg210, &here,
- Q_NEXT_TYPE(fotg210, *hw_p));
+ *prev_p = *periodic_next_shadow(fhcd2xx, &here,
+ Q_NEXT_TYPE(fhcd2xx, *hw_p));

- *hw_p = *shadow_next_periodic(fotg210, &here,
- Q_NEXT_TYPE(fotg210, *hw_p));
+ *hw_p = *shadow_next_periodic(fhcd2xx, &here,
+ Q_NEXT_TYPE(fhcd2xx, *hw_p));
}

/* how many of the uframe's 125 usecs are allocated? */
-static unsigned short periodic_usecs(struct fotg210_hcd *fotg210,
+static unsigned short periodic_usecs(struct fhcd2xx_hcd *fhcd2xx,
unsigned frame, unsigned uframe)
{
- __hc32 *hw_p = &fotg210->periodic[frame];
- union fotg210_shadow *q = &fotg210->pshadow[frame];
+ __hc32 *hw_p = &fhcd2xx->periodic[frame];
+ union fhcd2xx_shadow *q = &fhcd2xx->pshadow[frame];
unsigned usecs = 0;
- struct fotg210_qh_hw *hw;
+ struct fhcd2xx_qh_hw *hw;

while (q->ptr) {
- switch (hc32_to_cpu(fotg210, Q_NEXT_TYPE(fotg210, *hw_p))) {
+ switch (hc32_to_cpu(fhcd2xx, Q_NEXT_TYPE(fhcd2xx, *hw_p))) {
case Q_TYPE_QH:
hw = q->qh->hw;
/* is it in the S-mask? */
- if (hw->hw_info2 & cpu_to_hc32(fotg210, 1 << uframe))
+ if (hw->hw_info2 & cpu_to_hc32(fhcd2xx, 1 << uframe))
usecs += q->qh->usecs;
/* ... or C-mask? */
- if (hw->hw_info2 & cpu_to_hc32(fotg210,
+ if (hw->hw_info2 & cpu_to_hc32(fhcd2xx,
1 << (8 + uframe)))
usecs += q->qh->c_usecs;
hw_p = &hw->hw_next;
@@ -3421,8 +3421,8 @@ static unsigned short periodic_usecs(struct fotg210_hcd *fotg210,
/* for "save place" FSTNs, count the relevant INTR
* bandwidth from the previous frame
*/
- if (q->fstn->hw_prev != FOTG210_LIST_END(fotg210))
- fotg210_dbg(fotg210, "ignoring FSTN cost ...\n");
+ if (q->fstn->hw_prev != FHCD2XX_LIST_END(fhcd2xx))
+ fhcd2xx_dbg(fhcd2xx, "ignoring FSTN cost ...\n");

hw_p = &q->fstn->hw_next;
q = &q->fstn->fstn_next;
@@ -3435,8 +3435,8 @@ static unsigned short periodic_usecs(struct fotg210_hcd *fotg210,
break;
}
}
- if (usecs > fotg210->uframe_periodic_max)
- fotg210_err(fotg210, "uframe %d sched overrun: %d usecs\n",
+ if (usecs > fhcd2xx->uframe_periodic_max)
+ fhcd2xx_err(fhcd2xx, "uframe %d sched overrun: %d usecs\n",
frame * 8 + uframe, usecs);
return usecs;
}
@@ -3457,7 +3457,7 @@ static int same_tt(struct usb_device *dev1, struct usb_device *dev2)
* for a periodic transfer starting at the specified frame, using
* all the uframes in the mask.
*/
-static int tt_no_collision(struct fotg210_hcd *fotg210, unsigned period,
+static int tt_no_collision(struct fhcd2xx_hcd *fhcd2xx, unsigned period,
struct usb_device *dev, unsigned frame, u32 uf_mask)
{
if (period == 0) /* error */
@@ -3467,17 +3467,17 @@ static int tt_no_collision(struct fotg210_hcd *fotg210, unsigned period,
* (different dev or endpoint) until the next uframe.
* calling convention doesn't make that distinction.
*/
- for (; frame < fotg210->periodic_size; frame += period) {
- union fotg210_shadow here;
+ for (; frame < fhcd2xx->periodic_size; frame += period) {
+ union fhcd2xx_shadow here;
__hc32 type;
- struct fotg210_qh_hw *hw;
+ struct fhcd2xx_qh_hw *hw;

- here = fotg210->pshadow[frame];
- type = Q_NEXT_TYPE(fotg210, fotg210->periodic[frame]);
+ here = fhcd2xx->pshadow[frame];
+ type = Q_NEXT_TYPE(fhcd2xx, fhcd2xx->periodic[frame]);
while (here.ptr) {
- switch (hc32_to_cpu(fotg210, type)) {
+ switch (hc32_to_cpu(fhcd2xx, type)) {
case Q_TYPE_ITD:
- type = Q_NEXT_TYPE(fotg210, here.itd->hw_next);
+ type = Q_NEXT_TYPE(fhcd2xx, here.itd->hw_next);
here = here.itd->itd_next;
continue;
case Q_TYPE_QH:
@@ -3485,19 +3485,19 @@ static int tt_no_collision(struct fotg210_hcd *fotg210, unsigned period,
if (same_tt(dev, here.qh->dev)) {
u32 mask;

- mask = hc32_to_cpu(fotg210,
+ mask = hc32_to_cpu(fhcd2xx,
hw->hw_info2);
/* "knows" no gap is needed */
mask |= mask >> 8;
if (mask & uf_mask)
break;
}
- type = Q_NEXT_TYPE(fotg210, hw->hw_next);
+ type = Q_NEXT_TYPE(fhcd2xx, hw->hw_next);
here = here.qh->qh_next;
continue;
/* case Q_TYPE_FSTN: */
default:
- fotg210_dbg(fotg210,
+ fhcd2xx_dbg(fhcd2xx,
"periodic frame %d bogus type %d\n",
frame, type);
}
@@ -3511,43 +3511,43 @@ static int tt_no_collision(struct fotg210_hcd *fotg210, unsigned period,
return 1;
}

-static void enable_periodic(struct fotg210_hcd *fotg210)
+static void enable_periodic(struct fhcd2xx_hcd *fhcd2xx)
{
- if (fotg210->periodic_count++)
+ if (fhcd2xx->periodic_count++)
return;

/* Stop waiting to turn off the periodic schedule */
- fotg210->enabled_hrtimer_events &=
- ~BIT(FOTG210_HRTIMER_DISABLE_PERIODIC);
+ fhcd2xx->enabled_hrtimer_events &=
+ ~BIT(FHCD2XX_HRTIMER_DISABLE_PERIODIC);

/* Don't start the schedule until PSS is 0 */
- fotg210_poll_PSS(fotg210);
- turn_on_io_watchdog(fotg210);
+ fhcd2xx_poll_PSS(fhcd2xx);
+ turn_on_io_watchdog(fhcd2xx);
}

-static void disable_periodic(struct fotg210_hcd *fotg210)
+static void disable_periodic(struct fhcd2xx_hcd *fhcd2xx)
{
- if (--fotg210->periodic_count)
+ if (--fhcd2xx->periodic_count)
return;

/* Don't turn off the schedule until PSS is 1 */
- fotg210_poll_PSS(fotg210);
+ fhcd2xx_poll_PSS(fhcd2xx);
}

/* periodic schedule slots have iso tds (normal or split) first, then a
* sparse tree for active interrupt transfers.
*
* this just links in a qh; caller guarantees uframe masks are set right.
- * no FSTN support (yet; fotg210 0.96+)
+ * no FSTN support (yet; fhcd2xx 0.96+)
*/
-static void qh_link_periodic(struct fotg210_hcd *fotg210, struct fotg210_qh *qh)
+static void qh_link_periodic(struct fhcd2xx_hcd *fhcd2xx, struct fhcd2xx_qh *qh)
{
unsigned i;
unsigned period = qh->period;

dev_dbg(&qh->dev->dev,
"link qh%d-%04x/%p start %d [%d/%d us]\n",
- period, hc32_to_cpup(fotg210, &qh->hw->hw_info2)
+ period, hc32_to_cpup(fhcd2xx, &qh->hw->hw_info2)
& (QH_CMASK | QH_SMASK),
qh, qh->start, qh->usecs, qh->c_usecs);

@@ -3555,19 +3555,19 @@ static void qh_link_periodic(struct fotg210_hcd *fotg210, struct fotg210_qh *qh)
if (period == 0)
period = 1;

- for (i = qh->start; i < fotg210->periodic_size; i += period) {
- union fotg210_shadow *prev = &fotg210->pshadow[i];
- __hc32 *hw_p = &fotg210->periodic[i];
- union fotg210_shadow here = *prev;
+ for (i = qh->start; i < fhcd2xx->periodic_size; i += period) {
+ union fhcd2xx_shadow *prev = &fhcd2xx->pshadow[i];
+ __hc32 *hw_p = &fhcd2xx->periodic[i];
+ union fhcd2xx_shadow here = *prev;
__hc32 type = 0;

/* skip the iso nodes at list head */
while (here.ptr) {
- type = Q_NEXT_TYPE(fotg210, *hw_p);
- if (type == cpu_to_hc32(fotg210, Q_TYPE_QH))
+ type = Q_NEXT_TYPE(fhcd2xx, *hw_p);
+ if (type == cpu_to_hc32(fhcd2xx, Q_TYPE_QH))
break;
- prev = periodic_next_shadow(fotg210, prev, type);
- hw_p = shadow_next_periodic(fotg210, &here, type);
+ prev = periodic_next_shadow(fhcd2xx, prev, type);
+ hw_p = shadow_next_periodic(fhcd2xx, &here, type);
here = *prev;
}

@@ -3588,26 +3588,26 @@ static void qh_link_periodic(struct fotg210_hcd *fotg210, struct fotg210_qh *qh)
qh->hw->hw_next = *hw_p;
wmb();
prev->qh = qh;
- *hw_p = QH_NEXT(fotg210, qh->qh_dma);
+ *hw_p = QH_NEXT(fhcd2xx, qh->qh_dma);
}
}
qh->qh_state = QH_STATE_LINKED;
qh->xacterrs = 0;

/* update per-qh bandwidth for usbfs */
- fotg210_to_hcd(fotg210)->self.bandwidth_allocated += qh->period
+ fhcd2xx_to_hcd(fhcd2xx)->self.bandwidth_allocated += qh->period
? ((qh->usecs + qh->c_usecs) / qh->period)
: (qh->usecs * 8);

- list_add(&qh->intr_node, &fotg210->intr_qh_list);
+ list_add(&qh->intr_node, &fhcd2xx->intr_qh_list);

/* maybe enable periodic schedule processing */
- ++fotg210->intr_count;
- enable_periodic(fotg210);
+ ++fhcd2xx->intr_count;
+ enable_periodic(fhcd2xx);
}

-static void qh_unlink_periodic(struct fotg210_hcd *fotg210,
- struct fotg210_qh *qh)
+static void qh_unlink_periodic(struct fhcd2xx_hcd *fhcd2xx,
+ struct fhcd2xx_qh *qh)
{
unsigned i;
unsigned period;
@@ -3632,32 +3632,32 @@ static void qh_unlink_periodic(struct fotg210_hcd *fotg210,
if (!period)
period = 1;

- for (i = qh->start; i < fotg210->periodic_size; i += period)
- periodic_unlink(fotg210, i, qh);
+ for (i = qh->start; i < fhcd2xx->periodic_size; i += period)
+ periodic_unlink(fhcd2xx, i, qh);

/* update per-qh bandwidth for usbfs */
- fotg210_to_hcd(fotg210)->self.bandwidth_allocated -= qh->period
+ fhcd2xx_to_hcd(fhcd2xx)->self.bandwidth_allocated -= qh->period
? ((qh->usecs + qh->c_usecs) / qh->period)
: (qh->usecs * 8);

dev_dbg(&qh->dev->dev,
"unlink qh%d-%04x/%p start %d [%d/%d us]\n",
qh->period,
- hc32_to_cpup(fotg210, &qh->hw->hw_info2) &
+ hc32_to_cpup(fhcd2xx, &qh->hw->hw_info2) &
(QH_CMASK | QH_SMASK), qh, qh->start, qh->usecs, qh->c_usecs);

/* qh->qh_next still "live" to HC */
qh->qh_state = QH_STATE_UNLINK;
qh->qh_next.ptr = NULL;

- if (fotg210->qh_scan_next == qh)
- fotg210->qh_scan_next = list_entry(qh->intr_node.next,
- struct fotg210_qh, intr_node);
+ if (fhcd2xx->qh_scan_next == qh)
+ fhcd2xx->qh_scan_next = list_entry(qh->intr_node.next,
+ struct fhcd2xx_qh, intr_node);
list_del(&qh->intr_node);
}

-static void start_unlink_intr(struct fotg210_hcd *fotg210,
- struct fotg210_qh *qh)
+static void start_unlink_intr(struct fhcd2xx_hcd *fhcd2xx,
+ struct fhcd2xx_qh *qh)
{
/* If the QH isn't linked then there's nothing we can do
* unless we were called during a giveback, in which case
@@ -3669,7 +3669,7 @@ static void start_unlink_intr(struct fotg210_hcd *fotg210,
return;
}

- qh_unlink_periodic(fotg210, qh);
+ qh_unlink_periodic(fhcd2xx, qh);

/* Make sure the unlinks are visible before starting the timer */
wmb();
@@ -3679,40 +3679,40 @@ static void start_unlink_intr(struct fotg210_hcd *fotg210,
* stop accessing an unlinked interrupt QH. The timer delay is
* 9 uframes; presumably that will be long enough.
*/
- qh->unlink_cycle = fotg210->intr_unlink_cycle;
+ qh->unlink_cycle = fhcd2xx->intr_unlink_cycle;

/* New entries go at the end of the intr_unlink list */
- if (fotg210->intr_unlink)
- fotg210->intr_unlink_last->unlink_next = qh;
+ if (fhcd2xx->intr_unlink)
+ fhcd2xx->intr_unlink_last->unlink_next = qh;
else
- fotg210->intr_unlink = qh;
- fotg210->intr_unlink_last = qh;
+ fhcd2xx->intr_unlink = qh;
+ fhcd2xx->intr_unlink_last = qh;

- if (fotg210->intr_unlinking)
+ if (fhcd2xx->intr_unlinking)
; /* Avoid recursive calls */
- else if (fotg210->rh_state < FOTG210_RH_RUNNING)
- fotg210_handle_intr_unlinks(fotg210);
- else if (fotg210->intr_unlink == qh) {
- fotg210_enable_event(fotg210, FOTG210_HRTIMER_UNLINK_INTR,
+ else if (fhcd2xx->rh_state < FHCD2XX_RH_RUNNING)
+ fhcd2xx_handle_intr_unlinks(fhcd2xx);
+ else if (fhcd2xx->intr_unlink == qh) {
+ fhcd2xx_enable_event(fhcd2xx, FHCD2XX_HRTIMER_UNLINK_INTR,
true);
- ++fotg210->intr_unlink_cycle;
+ ++fhcd2xx->intr_unlink_cycle;
}
}

-static void end_unlink_intr(struct fotg210_hcd *fotg210, struct fotg210_qh *qh)
+static void end_unlink_intr(struct fhcd2xx_hcd *fhcd2xx, struct fhcd2xx_qh *qh)
{
- struct fotg210_qh_hw *hw = qh->hw;
+ struct fhcd2xx_qh_hw *hw = qh->hw;
int rc;

qh->qh_state = QH_STATE_IDLE;
- hw->hw_next = FOTG210_LIST_END(fotg210);
+ hw->hw_next = FHCD2XX_LIST_END(fhcd2xx);

- qh_completions(fotg210, qh);
+ qh_completions(fhcd2xx, qh);

/* reschedule QH iff another request is queued */
if (!list_empty(&qh->qtd_list) &&
- fotg210->rh_state == FOTG210_RH_RUNNING) {
- rc = qh_schedule(fotg210, qh);
+ fhcd2xx->rh_state == FHCD2XX_RH_RUNNING) {
+ rc = qh_schedule(fhcd2xx, qh);

/* An error here likely indicates handshake failure
* or no space left in the schedule. Neither fault
@@ -3721,16 +3721,16 @@ static void end_unlink_intr(struct fotg210_hcd *fotg210, struct fotg210_qh *qh)
* FIXME kill the now-dysfunctional queued urbs
*/
if (rc != 0)
- fotg210_err(fotg210, "can't reschedule qh %p, err %d\n",
+ fhcd2xx_err(fhcd2xx, "can't reschedule qh %p, err %d\n",
qh, rc);
}

/* maybe turn off periodic schedule */
- --fotg210->intr_count;
- disable_periodic(fotg210);
+ --fhcd2xx->intr_count;
+ disable_periodic(fhcd2xx);
}

-static int check_period(struct fotg210_hcd *fotg210, unsigned frame,
+static int check_period(struct fhcd2xx_hcd *fhcd2xx, unsigned frame,
unsigned uframe, unsigned period, unsigned usecs)
{
int claimed;
@@ -3742,7 +3742,7 @@ static int check_period(struct fotg210_hcd *fotg210, unsigned frame,
return 0;

/* convert "usecs we need" to "max already claimed" */
- usecs = fotg210->uframe_periodic_max - usecs;
+ usecs = fhcd2xx->uframe_periodic_max - usecs;

/* we "know" 2 and 4 uframe intervals were rejected; so
* for period 0, check _every_ microframe in the schedule.
@@ -3750,28 +3750,28 @@ static int check_period(struct fotg210_hcd *fotg210, unsigned frame,
if (unlikely(period == 0)) {
do {
for (uframe = 0; uframe < 7; uframe++) {
- claimed = periodic_usecs(fotg210, frame,
+ claimed = periodic_usecs(fhcd2xx, frame,
uframe);
if (claimed > usecs)
return 0;
}
- } while ((frame += 1) < fotg210->periodic_size);
+ } while ((frame += 1) < fhcd2xx->periodic_size);

/* just check the specified uframe, at that period */
} else {
do {
- claimed = periodic_usecs(fotg210, frame, uframe);
+ claimed = periodic_usecs(fhcd2xx, frame, uframe);
if (claimed > usecs)
return 0;
- } while ((frame += period) < fotg210->periodic_size);
+ } while ((frame += period) < fhcd2xx->periodic_size);
}

/* success! */
return 1;
}

-static int check_intr_schedule(struct fotg210_hcd *fotg210, unsigned frame,
- unsigned uframe, const struct fotg210_qh *qh,
+static int check_intr_schedule(struct fhcd2xx_hcd *fhcd2xx, unsigned frame,
+ unsigned uframe, const struct fhcd2xx_qh *qh,
__hc32 *c_maskp)
{
int retval = -ENOSPC;
@@ -3780,7 +3780,7 @@ static int check_intr_schedule(struct fotg210_hcd *fotg210, unsigned frame,
if (qh->c_usecs && uframe >= 6) /* FSTN territory? */
goto done;

- if (!check_period(fotg210, frame, uframe, qh->period, qh->usecs))
+ if (!check_period(fhcd2xx, frame, uframe, qh->period, qh->usecs))
goto done;
if (!qh->c_usecs) {
retval = 0;
@@ -3796,14 +3796,14 @@ static int check_intr_schedule(struct fotg210_hcd *fotg210, unsigned frame,
* one smart pass...
*/
mask = 0x03 << (uframe + qh->gap_uf);
- *c_maskp = cpu_to_hc32(fotg210, mask << 8);
+ *c_maskp = cpu_to_hc32(fhcd2xx, mask << 8);

mask |= 1 << uframe;
- if (tt_no_collision(fotg210, qh->period, qh->dev, frame, mask)) {
- if (!check_period(fotg210, frame, uframe + qh->gap_uf + 1,
+ if (tt_no_collision(fhcd2xx, qh->period, qh->dev, frame, mask)) {
+ if (!check_period(fhcd2xx, frame, uframe + qh->gap_uf + 1,
qh->period, qh->c_usecs))
goto done;
- if (!check_period(fotg210, frame, uframe + qh->gap_uf,
+ if (!check_period(fhcd2xx, frame, uframe + qh->gap_uf,
qh->period, qh->c_usecs))
goto done;
retval = 0;
@@ -3815,22 +3815,22 @@ done:
/* "first fit" scheduling policy used the first time through,
* or when the previous schedule slot can't be re-used.
*/
-static int qh_schedule(struct fotg210_hcd *fotg210, struct fotg210_qh *qh)
+static int qh_schedule(struct fhcd2xx_hcd *fhcd2xx, struct fhcd2xx_qh *qh)
{
int status;
unsigned uframe;
__hc32 c_mask;
unsigned frame; /* 0..(qh->period - 1), or NO_FRAME */
- struct fotg210_qh_hw *hw = qh->hw;
+ struct fhcd2xx_qh_hw *hw = qh->hw;

- qh_refresh(fotg210, qh);
- hw->hw_next = FOTG210_LIST_END(fotg210);
+ qh_refresh(fhcd2xx, qh);
+ hw->hw_next = FHCD2XX_LIST_END(fhcd2xx);
frame = qh->start;

/* reuse the previous schedule slots, if we can */
if (frame < qh->period) {
- uframe = ffs(hc32_to_cpup(fotg210, &hw->hw_info2) & QH_SMASK);
- status = check_intr_schedule(fotg210, frame, --uframe,
+ uframe = ffs(hc32_to_cpup(fhcd2xx, &hw->hw_info2) & QH_SMASK);
+ status = check_intr_schedule(fhcd2xx, frame, --uframe,
qh, &c_mask);
} else {
uframe = 0;
@@ -3847,9 +3847,9 @@ static int qh_schedule(struct fotg210_hcd *fotg210, struct fotg210_qh *qh)
int i;

for (i = qh->period; status && i > 0; --i) {
- frame = ++fotg210->random_frame % qh->period;
+ frame = ++fhcd2xx->random_frame % qh->period;
for (uframe = 0; uframe < 8; uframe++) {
- status = check_intr_schedule(fotg210,
+ status = check_intr_schedule(fhcd2xx,
frame, uframe, qh,
&c_mask);
if (status == 0)
@@ -3860,7 +3860,7 @@ static int qh_schedule(struct fotg210_hcd *fotg210, struct fotg210_qh *qh)
/* qh->period == 0 means every uframe */
} else {
frame = 0;
- status = check_intr_schedule(fotg210, 0, 0, qh,
+ status = check_intr_schedule(fhcd2xx, 0, 0, qh,
&c_mask);
}
if (status)
@@ -3868,79 +3868,79 @@ static int qh_schedule(struct fotg210_hcd *fotg210, struct fotg210_qh *qh)
qh->start = frame;

/* reset S-frame and (maybe) C-frame masks */
- hw->hw_info2 &= cpu_to_hc32(fotg210, ~(QH_CMASK | QH_SMASK));
+ hw->hw_info2 &= cpu_to_hc32(fhcd2xx, ~(QH_CMASK | QH_SMASK));
hw->hw_info2 |= qh->period
- ? cpu_to_hc32(fotg210, 1 << uframe)
- : cpu_to_hc32(fotg210, QH_SMASK);
+ ? cpu_to_hc32(fhcd2xx, 1 << uframe)
+ : cpu_to_hc32(fhcd2xx, QH_SMASK);
hw->hw_info2 |= c_mask;
} else
- fotg210_dbg(fotg210, "reused qh %p schedule\n", qh);
+ fhcd2xx_dbg(fhcd2xx, "reused qh %p schedule\n", qh);

/* stuff into the periodic schedule */
- qh_link_periodic(fotg210, qh);
+ qh_link_periodic(fhcd2xx, qh);
done:
return status;
}

-static int intr_submit(struct fotg210_hcd *fotg210, struct urb *urb,
+static int intr_submit(struct fhcd2xx_hcd *fhcd2xx, struct urb *urb,
struct list_head *qtd_list, gfp_t mem_flags)
{
unsigned epnum;
unsigned long flags;
- struct fotg210_qh *qh;
+ struct fhcd2xx_qh *qh;
int status;
struct list_head empty;

/* get endpoint and transfer/schedule data */
epnum = urb->ep->desc.bEndpointAddress;

- spin_lock_irqsave(&fotg210->lock, flags);
+ spin_lock_irqsave(&fhcd2xx->lock, flags);

- if (unlikely(!HCD_HW_ACCESSIBLE(fotg210_to_hcd(fotg210)))) {
+ if (unlikely(!HCD_HW_ACCESSIBLE(fhcd2xx_to_hcd(fhcd2xx)))) {
status = -ESHUTDOWN;
goto done_not_linked;
}
- status = usb_hcd_link_urb_to_ep(fotg210_to_hcd(fotg210), urb);
+ status = usb_hcd_link_urb_to_ep(fhcd2xx_to_hcd(fhcd2xx), urb);
if (unlikely(status))
goto done_not_linked;

/* get qh and force any scheduling errors */
INIT_LIST_HEAD(&empty);
- qh = qh_append_tds(fotg210, urb, &empty, epnum, &urb->ep->hcpriv);
+ qh = qh_append_tds(fhcd2xx, urb, &empty, epnum, &urb->ep->hcpriv);
if (qh == NULL) {
status = -ENOMEM;
goto done;
}
if (qh->qh_state == QH_STATE_IDLE) {
- status = qh_schedule(fotg210, qh);
+ status = qh_schedule(fhcd2xx, qh);
if (status)
goto done;
}

/* then queue the urb's tds to the qh */
- qh = qh_append_tds(fotg210, urb, qtd_list, epnum, &urb->ep->hcpriv);
+ qh = qh_append_tds(fhcd2xx, urb, qtd_list, epnum, &urb->ep->hcpriv);
BUG_ON(qh == NULL);

/* ... update usbfs periodic stats */
- fotg210_to_hcd(fotg210)->self.bandwidth_int_reqs++;
+ fhcd2xx_to_hcd(fhcd2xx)->self.bandwidth_int_reqs++;

done:
if (unlikely(status))
- usb_hcd_unlink_urb_from_ep(fotg210_to_hcd(fotg210), urb);
+ usb_hcd_unlink_urb_from_ep(fhcd2xx_to_hcd(fhcd2xx), urb);
done_not_linked:
- spin_unlock_irqrestore(&fotg210->lock, flags);
+ spin_unlock_irqrestore(&fhcd2xx->lock, flags);
if (status)
- qtd_list_free(fotg210, urb, qtd_list);
+ qtd_list_free(fhcd2xx, urb, qtd_list);

return status;
}

-static void scan_intr(struct fotg210_hcd *fotg210)
+static void scan_intr(struct fhcd2xx_hcd *fhcd2xx)
{
- struct fotg210_qh *qh;
+ struct fhcd2xx_qh *qh;

- list_for_each_entry_safe(qh, fotg210->qh_scan_next,
- &fotg210->intr_qh_list, intr_node) {
+ list_for_each_entry_safe(qh, fhcd2xx->qh_scan_next,
+ &fhcd2xx->intr_qh_list, intr_node) {
rescan:
/* clean any finished work for this qh */
if (!list_empty(&qh->qtd_list)) {
@@ -3948,27 +3948,27 @@ rescan:

/*
* Unlinks could happen here; completion reporting
- * drops the lock. That's why fotg210->qh_scan_next
+ * drops the lock. That's why fhcd2xx->qh_scan_next
* always holds the next qh to scan; if the next qh
- * gets unlinked then fotg210->qh_scan_next is adjusted
+ * gets unlinked then fhcd2xx->qh_scan_next is adjusted
* in qh_unlink_periodic().
*/
- temp = qh_completions(fotg210, qh);
+ temp = qh_completions(fhcd2xx, qh);
if (unlikely(qh->needs_rescan ||
(list_empty(&qh->qtd_list) &&
qh->qh_state == QH_STATE_LINKED)))
- start_unlink_intr(fotg210, qh);
+ start_unlink_intr(fhcd2xx, qh);
else if (temp != 0)
goto rescan;
}
}
}

-/* fotg210_iso_stream ops work with both ITD and SITD */
+/* fhcd2xx_iso_stream ops work with both ITD and SITD */

-static struct fotg210_iso_stream *iso_stream_alloc(gfp_t mem_flags)
+static struct fhcd2xx_iso_stream *iso_stream_alloc(gfp_t mem_flags)
{
- struct fotg210_iso_stream *stream;
+ struct fhcd2xx_iso_stream *stream;

stream = kzalloc(sizeof(*stream), mem_flags);
if (likely(stream != NULL)) {
@@ -3979,8 +3979,8 @@ static struct fotg210_iso_stream *iso_stream_alloc(gfp_t mem_flags)
return stream;
}

-static void iso_stream_init(struct fotg210_hcd *fotg210,
- struct fotg210_iso_stream *stream,
+static void iso_stream_init(struct fhcd2xx_hcd *fhcd2xx,
+ struct fhcd2xx_iso_stream *stream,
struct usb_device *dev, int pipe,
unsigned interval)
{
@@ -4007,9 +4007,9 @@ static void iso_stream_init(struct fotg210_hcd *fotg210,
buf1 |= maxp;
maxp *= multi;

- stream->buf0 = cpu_to_hc32(fotg210, (epnum << 8) | dev->devnum);
- stream->buf1 = cpu_to_hc32(fotg210, buf1);
- stream->buf2 = cpu_to_hc32(fotg210, multi);
+ stream->buf0 = cpu_to_hc32(fhcd2xx, (epnum << 8) | dev->devnum);
+ stream->buf1 = cpu_to_hc32(fhcd2xx, buf1);
+ stream->buf2 = cpu_to_hc32(fhcd2xx, multi);

/* usbfs wants to report the average usecs per frame tied up
* when transfers on this endpoint are scheduled ...
@@ -4033,11 +4033,11 @@ static void iso_stream_init(struct fotg210_hcd *fotg210,
stream->maxp = maxp;
}

-static struct fotg210_iso_stream *iso_stream_find(struct fotg210_hcd *fotg210,
+static struct fhcd2xx_iso_stream *iso_stream_find(struct fhcd2xx_hcd *fhcd2xx,
struct urb *urb)
{
unsigned epnum;
- struct fotg210_iso_stream *stream;
+ struct fhcd2xx_iso_stream *stream;
struct usb_host_endpoint *ep;
unsigned long flags;

@@ -4047,7 +4047,7 @@ static struct fotg210_iso_stream *iso_stream_find(struct fotg210_hcd *fotg210,
else
ep = urb->dev->ep_out[epnum];

- spin_lock_irqsave(&fotg210->lock, flags);
+ spin_lock_irqsave(&fhcd2xx->lock, flags);
stream = ep->hcpriv;

if (unlikely(stream == NULL)) {
@@ -4055,31 +4055,31 @@ static struct fotg210_iso_stream *iso_stream_find(struct fotg210_hcd *fotg210,
if (likely(stream != NULL)) {
ep->hcpriv = stream;
stream->ep = ep;
- iso_stream_init(fotg210, stream, urb->dev, urb->pipe,
+ iso_stream_init(fhcd2xx, stream, urb->dev, urb->pipe,
urb->interval);
}

/* if dev->ep[epnum] is a QH, hw is set */
} else if (unlikely(stream->hw != NULL)) {
- fotg210_dbg(fotg210, "dev %s ep%d%s, not iso??\n",
+ fhcd2xx_dbg(fhcd2xx, "dev %s ep%d%s, not iso??\n",
urb->dev->devpath, epnum,
usb_pipein(urb->pipe) ? "in" : "out");
stream = NULL;
}

- spin_unlock_irqrestore(&fotg210->lock, flags);
+ spin_unlock_irqrestore(&fhcd2xx->lock, flags);
return stream;
}

-/* fotg210_iso_sched ops can be ITD-only or SITD-only */
+/* fhcd2xx_iso_sched ops can be ITD-only or SITD-only */

-static struct fotg210_iso_sched *iso_sched_alloc(unsigned packets,
+static struct fhcd2xx_iso_sched *iso_sched_alloc(unsigned packets,
gfp_t mem_flags)
{
- struct fotg210_iso_sched *iso_sched;
+ struct fhcd2xx_iso_sched *iso_sched;
int size = sizeof(*iso_sched);

- size += packets * sizeof(struct fotg210_iso_packet);
+ size += packets * sizeof(struct fhcd2xx_iso_packet);
iso_sched = kzalloc(size, mem_flags);
if (likely(iso_sched != NULL))
INIT_LIST_HEAD(&iso_sched->td_list);
@@ -4087,9 +4087,9 @@ static struct fotg210_iso_sched *iso_sched_alloc(unsigned packets,
return iso_sched;
}

-static inline void itd_sched_init(struct fotg210_hcd *fotg210,
- struct fotg210_iso_sched *iso_sched,
- struct fotg210_iso_stream *stream,
+static inline void itd_sched_init(struct fhcd2xx_hcd *fhcd2xx,
+ struct fhcd2xx_iso_sched *iso_sched,
+ struct fhcd2xx_iso_stream *stream,
struct urb *urb)
{
unsigned i;
@@ -4102,7 +4102,7 @@ static inline void itd_sched_init(struct fotg210_hcd *fotg210,
* when we fit new itds into the schedule.
*/
for (i = 0; i < urb->number_of_packets; i++) {
- struct fotg210_iso_packet *uframe = &iso_sched->packet[i];
+ struct fhcd2xx_iso_packet *uframe = &iso_sched->packet[i];
unsigned length;
dma_addr_t buf;
u32 trans;
@@ -4110,13 +4110,13 @@ static inline void itd_sched_init(struct fotg210_hcd *fotg210,
length = urb->iso_frame_desc[i].length;
buf = dma + urb->iso_frame_desc[i].offset;

- trans = FOTG210_ISOC_ACTIVE;
+ trans = FHCD2XX_ISOC_ACTIVE;
trans |= buf & 0x0fff;
if (unlikely(((i + 1) == urb->number_of_packets))
&& !(urb->transfer_flags & URB_NO_INTERRUPT))
- trans |= FOTG210_ITD_IOC;
+ trans |= FHCD2XX_ITD_IOC;
trans |= length << 16;
- uframe->transaction = cpu_to_hc32(fotg210, trans);
+ uframe->transaction = cpu_to_hc32(fhcd2xx, trans);

/* might need to cross a buffer page within a uframe */
uframe->bufp = (buf & ~(u64)0x0fff);
@@ -4126,32 +4126,32 @@ static inline void itd_sched_init(struct fotg210_hcd *fotg210,
}
}

-static void iso_sched_free(struct fotg210_iso_stream *stream,
- struct fotg210_iso_sched *iso_sched)
+static void iso_sched_free(struct fhcd2xx_iso_stream *stream,
+ struct fhcd2xx_iso_sched *iso_sched)
{
if (!iso_sched)
return;
- /* caller must hold fotg210->lock!*/
+ /* caller must hold fhcd2xx->lock!*/
list_splice(&iso_sched->td_list, &stream->free_list);
kfree(iso_sched);
}

-static int itd_urb_transaction(struct fotg210_iso_stream *stream,
- struct fotg210_hcd *fotg210,
+static int itd_urb_transaction(struct fhcd2xx_iso_stream *stream,
+ struct fhcd2xx_hcd *fhcd2xx,
struct urb *urb, gfp_t mem_flags)
{
- struct fotg210_itd *itd;
+ struct fhcd2xx_itd *itd;
dma_addr_t itd_dma;
int i;
unsigned num_itds;
- struct fotg210_iso_sched *sched;
+ struct fhcd2xx_iso_sched *sched;
unsigned long flags;

sched = iso_sched_alloc(urb->number_of_packets, mem_flags);
if (unlikely(sched == NULL))
return -ENOMEM;

- itd_sched_init(fotg210, sched, stream, urb);
+ itd_sched_init(fhcd2xx, sched, stream, urb);

if (urb->interval < 8)
num_itds = 1 + (sched->span + 7) / 8;
@@ -4159,7 +4159,7 @@ static int itd_urb_transaction(struct fotg210_iso_stream *stream,
num_itds = urb->number_of_packets;

/* allocate/init ITDs */
- spin_lock_irqsave(&fotg210->lock, flags);
+ spin_lock_irqsave(&fhcd2xx->lock, flags);
for (i = 0; i < num_itds; i++) {

/*
@@ -4168,20 +4168,20 @@ static int itd_urb_transaction(struct fotg210_iso_stream *stream,
*/
if (likely(!list_empty(&stream->free_list))) {
itd = list_first_entry(&stream->free_list,
- struct fotg210_itd, itd_list);
- if (itd->frame == fotg210->now_frame)
+ struct fhcd2xx_itd, itd_list);
+ if (itd->frame == fhcd2xx->now_frame)
goto alloc_itd;
list_del(&itd->itd_list);
itd_dma = itd->itd_dma;
} else {
alloc_itd:
- spin_unlock_irqrestore(&fotg210->lock, flags);
- itd = dma_pool_alloc(fotg210->itd_pool, mem_flags,
+ spin_unlock_irqrestore(&fhcd2xx->lock, flags);
+ itd = dma_pool_alloc(fhcd2xx->itd_pool, mem_flags,
&itd_dma);
- spin_lock_irqsave(&fotg210->lock, flags);
+ spin_lock_irqsave(&fhcd2xx->lock, flags);
if (!itd) {
iso_sched_free(stream, sched);
- spin_unlock_irqrestore(&fotg210->lock, flags);
+ spin_unlock_irqrestore(&fhcd2xx->lock, flags);
return -ENOMEM;
}
}
@@ -4190,7 +4190,7 @@ alloc_itd:
itd->itd_dma = itd_dma;
list_add(&itd->itd_list, &sched->td_list);
}
- spin_unlock_irqrestore(&fotg210->lock, flags);
+ spin_unlock_irqrestore(&fhcd2xx->lock, flags);

/* temporarily store schedule info in hcpriv */
urb->hcpriv = sched;
@@ -4198,14 +4198,14 @@ alloc_itd:
return 0;
}

-static inline int itd_slot_ok(struct fotg210_hcd *fotg210, u32 mod, u32 uframe,
+static inline int itd_slot_ok(struct fhcd2xx_hcd *fhcd2xx, u32 mod, u32 uframe,
u8 usecs, u32 period)
{
uframe %= period;
do {
/* can't commit more than uframe_periodic_max usec */
- if (periodic_usecs(fotg210, uframe >> 3, uframe & 0x7)
- > (fotg210->uframe_periodic_max - usecs))
+ if (periodic_usecs(fhcd2xx, uframe >> 3, uframe & 0x7)
+ > (fhcd2xx->uframe_periodic_max - usecs))
return 0;

/* we know urb->interval is 2^N uframes */
@@ -4219,32 +4219,32 @@ static inline int itd_slot_ok(struct fotg210_hcd *fotg210, u32 mod, u32 uframe,
* periodic schedule slots. (Affected by TUNE_FLS, which defaults to
* "as small as possible" to be cache-friendlier.) That limits the size
* transfers you can stream reliably; avoid more than 64 msec per urb.
- * Also avoid queue depths of less than fotg210's worst irq latency (affected
+ * Also avoid queue depths of less than fhcd2xx's worst irq latency (affected
* by the per-urb URB_NO_INTERRUPT hint, the log2_irq_thresh module parameter,
* and other factors); or more than about 230 msec total (for portability,
- * given FOTG210_TUNE_FLS and the slop). Or, write a smarter scheduler!
+ * given FHCD2XX_TUNE_FLS and the slop). Or, write a smarter scheduler!
*/

#define SCHEDULE_SLOP 80 /* microframes */

-static int iso_stream_schedule(struct fotg210_hcd *fotg210, struct urb *urb,
- struct fotg210_iso_stream *stream)
+static int iso_stream_schedule(struct fhcd2xx_hcd *fhcd2xx, struct urb *urb,
+ struct fhcd2xx_iso_stream *stream)
{
u32 now, next, start, period, span;
int status;
- unsigned mod = fotg210->periodic_size << 3;
- struct fotg210_iso_sched *sched = urb->hcpriv;
+ unsigned mod = fhcd2xx->periodic_size << 3;
+ struct fhcd2xx_iso_sched *sched = urb->hcpriv;

period = urb->interval;
span = sched->span;

if (span > mod - SCHEDULE_SLOP) {
- fotg210_dbg(fotg210, "iso request %p too long\n", urb);
+ fhcd2xx_dbg(fhcd2xx, "iso request %p too long\n", urb);
status = -EFBIG;
goto fail;
}

- now = fotg210_read_frame_index(fotg210) & (mod - 1);
+ now = fhcd2xx_read_frame_index(fhcd2xx) & (mod - 1);

/* Typical case: reuse current schedule, stream is still active.
* Hopefully there are no gaps from the host falling behind
@@ -4259,8 +4259,8 @@ static int iso_stream_schedule(struct fotg210_hcd *fotg210, struct urb *urb,
* and Intel PCI-based controllers, don't (work around for
* Intel ICH9 bug).
*/
- if (!stream->highspeed && fotg210->fs_i_thresh)
- next = now + fotg210->i_thresh;
+ if (!stream->highspeed && fhcd2xx->fs_i_thresh)
+ next = now + fhcd2xx->i_thresh;
else
next = now;

@@ -4275,7 +4275,7 @@ static int iso_stream_schedule(struct fotg210_hcd *fotg210, struct urb *urb,
else
start = next + excess + period;
if (start - now >= mod) {
- fotg210_dbg(fotg210, "request %p would overflow (%d+%d >= %d)\n",
+ fhcd2xx_dbg(fhcd2xx, "request %p would overflow (%d+%d >= %d)\n",
urb, start - now - period, period,
mod);
status = -EFBIG;
@@ -4284,7 +4284,7 @@ static int iso_stream_schedule(struct fotg210_hcd *fotg210, struct urb *urb,
}

/* need to schedule; when's the next (u)frame we could start?
- * this is bigger than fotg210->i_thresh allows; scheduling itself
+ * this is bigger than fhcd2xx->i_thresh allows; scheduling itself
* isn't free, the slop should handle reasonably slow cpus. it
* can also help high bandwidth if the dma and irq loads don't
* jump until after the queue is primed.
@@ -4306,14 +4306,14 @@ static int iso_stream_schedule(struct fotg210_hcd *fotg210, struct urb *urb,
do {
start--;
/* check schedule: enough space? */
- if (itd_slot_ok(fotg210, mod, start,
+ if (itd_slot_ok(fhcd2xx, mod, start,
stream->usecs, period))
done = 1;
} while (start > next && !done);

/* no room in the schedule */
if (!done) {
- fotg210_dbg(fotg210, "iso resched full %p (now %d max %d)\n",
+ fhcd2xx_dbg(fhcd2xx, "iso resched full %p (now %d max %d)\n",
urb, now, now + mod);
status = -ENOSPC;
goto fail;
@@ -4323,7 +4323,7 @@ static int iso_stream_schedule(struct fotg210_hcd *fotg210, struct urb *urb,
/* Tried to schedule too far into the future? */
if (unlikely(start - now + span - period
>= mod - 2 * SCHEDULE_SLOP)) {
- fotg210_dbg(fotg210, "request %p would overflow (%d+%d >= %d)\n",
+ fhcd2xx_dbg(fhcd2xx, "request %p would overflow (%d+%d >= %d)\n",
urb, start - now, span - period,
mod - 2 * SCHEDULE_SLOP);
status = -EFBIG;
@@ -4338,8 +4338,8 @@ static int iso_stream_schedule(struct fotg210_hcd *fotg210, struct urb *urb,
urb->start_frame >>= 3;

/* Make sure scan_isoc() sees these */
- if (fotg210->isoc_count == 0)
- fotg210->next_frame = now >> 3;
+ if (fhcd2xx->isoc_count == 0)
+ fhcd2xx->next_frame = now >> 3;
return 0;

fail:
@@ -4348,14 +4348,14 @@ fail:
return status;
}

-static inline void itd_init(struct fotg210_hcd *fotg210,
- struct fotg210_iso_stream *stream,
- struct fotg210_itd *itd)
+static inline void itd_init(struct fhcd2xx_hcd *fhcd2xx,
+ struct fhcd2xx_iso_stream *stream,
+ struct fhcd2xx_itd *itd)
{
int i;

/* it's been recently zeroed */
- itd->hw_next = FOTG210_LIST_END(fotg210);
+ itd->hw_next = FHCD2XX_LIST_END(fhcd2xx);
itd->hw_bufp[0] = stream->buf0;
itd->hw_bufp[1] = stream->buf1;
itd->hw_bufp[2] = stream->buf2;
@@ -4366,47 +4366,47 @@ static inline void itd_init(struct fotg210_hcd *fotg210,
/* All other fields are filled when scheduling */
}

-static inline void itd_patch(struct fotg210_hcd *fotg210,
- struct fotg210_itd *itd,
- struct fotg210_iso_sched *iso_sched,
+static inline void itd_patch(struct fhcd2xx_hcd *fhcd2xx,
+ struct fhcd2xx_itd *itd,
+ struct fhcd2xx_iso_sched *iso_sched,
unsigned index, u16 uframe)
{
- struct fotg210_iso_packet *uf = &iso_sched->packet[index];
+ struct fhcd2xx_iso_packet *uf = &iso_sched->packet[index];
unsigned pg = itd->pg;

uframe &= 0x07;
itd->index[uframe] = index;

itd->hw_transaction[uframe] = uf->transaction;
- itd->hw_transaction[uframe] |= cpu_to_hc32(fotg210, pg << 12);
- itd->hw_bufp[pg] |= cpu_to_hc32(fotg210, uf->bufp & ~(u32)0);
- itd->hw_bufp_hi[pg] |= cpu_to_hc32(fotg210, (u32)(uf->bufp >> 32));
+ itd->hw_transaction[uframe] |= cpu_to_hc32(fhcd2xx, pg << 12);
+ itd->hw_bufp[pg] |= cpu_to_hc32(fhcd2xx, uf->bufp & ~(u32)0);
+ itd->hw_bufp_hi[pg] |= cpu_to_hc32(fhcd2xx, (u32)(uf->bufp >> 32));

/* iso_frame_desc[].offset must be strictly increasing */
if (unlikely(uf->cross)) {
u64 bufp = uf->bufp + 4096;

itd->pg = ++pg;
- itd->hw_bufp[pg] |= cpu_to_hc32(fotg210, bufp & ~(u32)0);
- itd->hw_bufp_hi[pg] |= cpu_to_hc32(fotg210, (u32)(bufp >> 32));
+ itd->hw_bufp[pg] |= cpu_to_hc32(fhcd2xx, bufp & ~(u32)0);
+ itd->hw_bufp_hi[pg] |= cpu_to_hc32(fhcd2xx, (u32)(bufp >> 32));
}
}

-static inline void itd_link(struct fotg210_hcd *fotg210, unsigned frame,
- struct fotg210_itd *itd)
+static inline void itd_link(struct fhcd2xx_hcd *fhcd2xx, unsigned frame,
+ struct fhcd2xx_itd *itd)
{
- union fotg210_shadow *prev = &fotg210->pshadow[frame];
- __hc32 *hw_p = &fotg210->periodic[frame];
- union fotg210_shadow here = *prev;
+ union fhcd2xx_shadow *prev = &fhcd2xx->pshadow[frame];
+ __hc32 *hw_p = &fhcd2xx->periodic[frame];
+ union fhcd2xx_shadow here = *prev;
__hc32 type = 0;

/* skip any iso nodes which might belong to previous microframes */
while (here.ptr) {
- type = Q_NEXT_TYPE(fotg210, *hw_p);
- if (type == cpu_to_hc32(fotg210, Q_TYPE_QH))
+ type = Q_NEXT_TYPE(fhcd2xx, *hw_p);
+ if (type == cpu_to_hc32(fhcd2xx, Q_TYPE_QH))
break;
- prev = periodic_next_shadow(fotg210, prev, type);
- hw_p = shadow_next_periodic(fotg210, &here, type);
+ prev = periodic_next_shadow(fhcd2xx, prev, type);
+ hw_p = shadow_next_periodic(fhcd2xx, &here, type);
here = *prev;
}

@@ -4415,24 +4415,24 @@ static inline void itd_link(struct fotg210_hcd *fotg210, unsigned frame,
prev->itd = itd;
itd->frame = frame;
wmb();
- *hw_p = cpu_to_hc32(fotg210, itd->itd_dma | Q_TYPE_ITD);
+ *hw_p = cpu_to_hc32(fhcd2xx, itd->itd_dma | Q_TYPE_ITD);
}

/* fit urb's itds into the selected schedule slot; activate as needed */
-static void itd_link_urb(struct fotg210_hcd *fotg210, struct urb *urb,
- unsigned mod, struct fotg210_iso_stream *stream)
+static void itd_link_urb(struct fhcd2xx_hcd *fhcd2xx, struct urb *urb,
+ unsigned mod, struct fhcd2xx_iso_stream *stream)
{
int packet;
unsigned next_uframe, uframe, frame;
- struct fotg210_iso_sched *iso_sched = urb->hcpriv;
- struct fotg210_itd *itd;
+ struct fhcd2xx_iso_sched *iso_sched = urb->hcpriv;
+ struct fhcd2xx_itd *itd;

next_uframe = stream->next_uframe & (mod - 1);

if (unlikely(list_empty(&stream->td_list))) {
- fotg210_to_hcd(fotg210)->self.bandwidth_allocated
+ fhcd2xx_to_hcd(fhcd2xx)->self.bandwidth_allocated
+= stream->bandwidth;
- fotg210_dbg(fotg210,
+ fhcd2xx_dbg(fhcd2xx,
"schedule devp %s ep%d%s-iso period %d start %d.%d\n",
urb->dev->devpath, stream->bEndpointAddress & 0x0f,
(stream->bEndpointAddress & USB_DIR_IN) ? "in" : "out",
@@ -4448,17 +4448,17 @@ static void itd_link_urb(struct fotg210_hcd *fotg210, struct urb *urb,
/* ASSERT: no itds for this endpoint in this uframe */

itd = list_entry(iso_sched->td_list.next,
- struct fotg210_itd, itd_list);
+ struct fhcd2xx_itd, itd_list);
list_move_tail(&itd->itd_list, &stream->td_list);
itd->stream = stream;
itd->urb = urb;
- itd_init(fotg210, stream, itd);
+ itd_init(fhcd2xx, stream, itd);
}

uframe = next_uframe & 0x07;
frame = next_uframe >> 3;

- itd_patch(fotg210, itd, iso_sched, packet, uframe);
+ itd_patch(fhcd2xx, itd, iso_sched, packet, uframe);

next_uframe += stream->interval;
next_uframe &= mod - 1;
@@ -4467,7 +4467,7 @@ static void itd_link_urb(struct fotg210_hcd *fotg210, struct urb *urb,
/* link completed itds into the schedule */
if (((next_uframe >> 3) != frame)
|| packet == urb->number_of_packets) {
- itd_link(fotg210, frame & (fotg210->periodic_size - 1),
+ itd_link(fhcd2xx, frame & (fhcd2xx->periodic_size - 1),
itd);
itd = NULL;
}
@@ -4478,12 +4478,12 @@ static void itd_link_urb(struct fotg210_hcd *fotg210, struct urb *urb,
iso_sched_free(stream, iso_sched);
urb->hcpriv = NULL;

- ++fotg210->isoc_count;
- enable_periodic(fotg210);
+ ++fhcd2xx->isoc_count;
+ enable_periodic(fhcd2xx);
}

-#define ISO_ERRS (FOTG210_ISOC_BUF_ERR | FOTG210_ISOC_BABBLE |\
- FOTG210_ISOC_XACTERR)
+#define ISO_ERRS (FHCD2XX_ISOC_BUF_ERR | FHCD2XX_ISOC_BABBLE |\
+ FHCD2XX_ISOC_XACTERR)

/* Process and recycle a completed ITD. Return true iff its urb completed,
* and hence its completion callback probably added things to the hardware
@@ -4495,14 +4495,14 @@ static void itd_link_urb(struct fotg210_hcd *fotg210, struct urb *urb,
* (b) only this endpoint's completions submit URBs. It seems some silicon
* corrupts things if you reuse completed descriptors very quickly...
*/
-static bool itd_complete(struct fotg210_hcd *fotg210, struct fotg210_itd *itd)
+static bool itd_complete(struct fhcd2xx_hcd *fhcd2xx, struct fhcd2xx_itd *itd)
{
struct urb *urb = itd->urb;
struct usb_iso_packet_descriptor *desc;
u32 t;
unsigned uframe;
int urb_index = -1;
- struct fotg210_iso_stream *stream = itd->stream;
+ struct fhcd2xx_iso_stream *stream = itd->stream;
struct usb_device *dev;
bool retval = false;

@@ -4513,30 +4513,30 @@ static bool itd_complete(struct fotg210_hcd *fotg210, struct fotg210_itd *itd)
urb_index = itd->index[uframe];
desc = &urb->iso_frame_desc[urb_index];

- t = hc32_to_cpup(fotg210, &itd->hw_transaction[uframe]);
+ t = hc32_to_cpup(fhcd2xx, &itd->hw_transaction[uframe]);
itd->hw_transaction[uframe] = 0;

/* report transfer status */
if (unlikely(t & ISO_ERRS)) {
urb->error_count++;
- if (t & FOTG210_ISOC_BUF_ERR)
+ if (t & FHCD2XX_ISOC_BUF_ERR)
desc->status = usb_pipein(urb->pipe)
? -ENOSR /* hc couldn't read */
: -ECOMM; /* hc couldn't write */
- else if (t & FOTG210_ISOC_BABBLE)
+ else if (t & FHCD2XX_ISOC_BABBLE)
desc->status = -EOVERFLOW;
- else /* (t & FOTG210_ISOC_XACTERR) */
+ else /* (t & FHCD2XX_ISOC_XACTERR) */
desc->status = -EPROTO;

/* HC need not update length with this error */
- if (!(t & FOTG210_ISOC_BABBLE)) {
+ if (!(t & FHCD2XX_ISOC_BABBLE)) {
desc->actual_length =
- fotg210_itdlen(urb, desc, t);
+ fhcd2xx_itdlen(urb, desc, t);
urb->actual_length += desc->actual_length;
}
- } else if (likely((t & FOTG210_ISOC_ACTIVE) == 0)) {
+ } else if (likely((t & FHCD2XX_ISOC_ACTIVE) == 0)) {
desc->status = 0;
- desc->actual_length = fotg210_itdlen(urb, desc, t);
+ desc->actual_length = fhcd2xx_itdlen(urb, desc, t);
urb->actual_length += desc->actual_length;
} else {
/* URB was too late */
@@ -4555,17 +4555,17 @@ static bool itd_complete(struct fotg210_hcd *fotg210, struct fotg210_itd *itd)

/* give urb back to the driver; completion often (re)submits */
dev = urb->dev;
- fotg210_urb_done(fotg210, urb, 0);
+ fhcd2xx_urb_done(fhcd2xx, urb, 0);
retval = true;
urb = NULL;

- --fotg210->isoc_count;
- disable_periodic(fotg210);
+ --fhcd2xx->isoc_count;
+ disable_periodic(fhcd2xx);

if (unlikely(list_is_singular(&stream->td_list))) {
- fotg210_to_hcd(fotg210)->self.bandwidth_allocated
+ fhcd2xx_to_hcd(fhcd2xx)->self.bandwidth_allocated
-= stream->bandwidth;
- fotg210_dbg(fotg210,
+ fhcd2xx_dbg(fhcd2xx,
"deschedule devp %s ep%d%s-iso\n",
dev->devpath, stream->bEndpointAddress & 0x0f,
(stream->bEndpointAddress & USB_DIR_IN) ? "in" : "out");
@@ -4580,35 +4580,35 @@ done:
/* Recycle the iTDs when the pipeline is empty (ep no longer in use) */
if (list_empty(&stream->td_list)) {
list_splice_tail_init(&stream->free_list,
- &fotg210->cached_itd_list);
- start_free_itds(fotg210);
+ &fhcd2xx->cached_itd_list);
+ start_free_itds(fhcd2xx);
}

return retval;
}

-static int itd_submit(struct fotg210_hcd *fotg210, struct urb *urb,
+static int itd_submit(struct fhcd2xx_hcd *fhcd2xx, struct urb *urb,
gfp_t mem_flags)
{
int status = -EINVAL;
unsigned long flags;
- struct fotg210_iso_stream *stream;
+ struct fhcd2xx_iso_stream *stream;

/* Get iso_stream head */
- stream = iso_stream_find(fotg210, urb);
+ stream = iso_stream_find(fhcd2xx, urb);
if (unlikely(stream == NULL)) {
- fotg210_dbg(fotg210, "can't get iso stream\n");
+ fhcd2xx_dbg(fhcd2xx, "can't get iso stream\n");
return -ENOMEM;
}
if (unlikely(urb->interval != stream->interval &&
- fotg210_port_speed(fotg210, 0) == USB_PORT_STAT_HIGH_SPEED)) {
- fotg210_dbg(fotg210, "can't change iso interval %d --> %d\n",
+ fhcd2xx_port_speed(fhcd2xx, 0) == USB_PORT_STAT_HIGH_SPEED)) {
+ fhcd2xx_dbg(fhcd2xx, "can't change iso interval %d --> %d\n",
stream->interval, urb->interval);
goto done;
}

-#ifdef FOTG210_URB_TRACE
- fotg210_dbg(fotg210,
+#ifdef FHCD2XX_URB_TRACE
+ fhcd2xx_dbg(fhcd2xx,
"%s %s urb %p ep%d%s len %d, %d pkts %d uframes[%p]\n",
__func__, urb->dev->devpath, urb,
usb_pipeendpoint(urb->pipe),
@@ -4619,49 +4619,49 @@ static int itd_submit(struct fotg210_hcd *fotg210, struct urb *urb,
#endif

/* allocate ITDs w/o locking anything */
- status = itd_urb_transaction(stream, fotg210, urb, mem_flags);
+ status = itd_urb_transaction(stream, fhcd2xx, urb, mem_flags);
if (unlikely(status < 0)) {
- fotg210_dbg(fotg210, "can't init itds\n");
+ fhcd2xx_dbg(fhcd2xx, "can't init itds\n");
goto done;
}

/* schedule ... need to lock */
- spin_lock_irqsave(&fotg210->lock, flags);
- if (unlikely(!HCD_HW_ACCESSIBLE(fotg210_to_hcd(fotg210)))) {
+ spin_lock_irqsave(&fhcd2xx->lock, flags);
+ if (unlikely(!HCD_HW_ACCESSIBLE(fhcd2xx_to_hcd(fhcd2xx)))) {
status = -ESHUTDOWN;
goto done_not_linked;
}
- status = usb_hcd_link_urb_to_ep(fotg210_to_hcd(fotg210), urb);
+ status = usb_hcd_link_urb_to_ep(fhcd2xx_to_hcd(fhcd2xx), urb);
if (unlikely(status))
goto done_not_linked;
- status = iso_stream_schedule(fotg210, urb, stream);
+ status = iso_stream_schedule(fhcd2xx, urb, stream);
if (likely(status == 0))
- itd_link_urb(fotg210, urb, fotg210->periodic_size << 3, stream);
+ itd_link_urb(fhcd2xx, urb, fhcd2xx->periodic_size << 3, stream);
else
- usb_hcd_unlink_urb_from_ep(fotg210_to_hcd(fotg210), urb);
+ usb_hcd_unlink_urb_from_ep(fhcd2xx_to_hcd(fhcd2xx), urb);
done_not_linked:
- spin_unlock_irqrestore(&fotg210->lock, flags);
+ spin_unlock_irqrestore(&fhcd2xx->lock, flags);
done:
return status;
}

-static inline int scan_frame_queue(struct fotg210_hcd *fotg210, unsigned frame,
+static inline int scan_frame_queue(struct fhcd2xx_hcd *fhcd2xx, unsigned frame,
unsigned now_frame, bool live)
{
unsigned uf;
bool modified;
- union fotg210_shadow q, *q_p;
+ union fhcd2xx_shadow q, *q_p;
__hc32 type, *hw_p;

/* scan each element in frame's queue for completions */
- q_p = &fotg210->pshadow[frame];
- hw_p = &fotg210->periodic[frame];
+ q_p = &fhcd2xx->pshadow[frame];
+ hw_p = &fhcd2xx->periodic[frame];
q.ptr = q_p->ptr;
- type = Q_NEXT_TYPE(fotg210, *hw_p);
+ type = Q_NEXT_TYPE(fhcd2xx, *hw_p);
modified = false;

while (q.ptr != NULL) {
- switch (hc32_to_cpu(fotg210, type)) {
+ switch (hc32_to_cpu(fhcd2xx, type)) {
case Q_TYPE_ITD:
/* If this ITD is still active, leave it for
* later processing ... check the next entry.
@@ -4672,13 +4672,13 @@ static inline int scan_frame_queue(struct fotg210_hcd *fotg210, unsigned frame,
rmb();
for (uf = 0; uf < 8; uf++) {
if (q.itd->hw_transaction[uf] &
- ITD_ACTIVE(fotg210))
+ ITD_ACTIVE(fhcd2xx))
break;
}
if (uf < 8) {
q_p = &q.itd->itd_next;
hw_p = &q.itd->hw_next;
- type = Q_NEXT_TYPE(fotg210,
+ type = Q_NEXT_TYPE(fhcd2xx,
q.itd->hw_next);
q = *q_p;
break;
@@ -4692,13 +4692,13 @@ static inline int scan_frame_queue(struct fotg210_hcd *fotg210, unsigned frame,
*/
*q_p = q.itd->itd_next;
*hw_p = q.itd->hw_next;
- type = Q_NEXT_TYPE(fotg210, q.itd->hw_next);
+ type = Q_NEXT_TYPE(fhcd2xx, q.itd->hw_next);
wmb();
- modified = itd_complete(fotg210, q.itd);
+ modified = itd_complete(fhcd2xx, q.itd);
q = *q_p;
break;
default:
- fotg210_dbg(fotg210, "corrupt type %d frame %d shadow %p\n",
+ fhcd2xx_dbg(fhcd2xx, "corrupt type %d frame %d shadow %p\n",
type, frame, q.ptr);
/* FALL THROUGH */
case Q_TYPE_QH:
@@ -4709,16 +4709,16 @@ static inline int scan_frame_queue(struct fotg210_hcd *fotg210, unsigned frame,
}

/* assume completion callbacks modify the queue */
- if (unlikely(modified && fotg210->isoc_count > 0))
+ if (unlikely(modified && fhcd2xx->isoc_count > 0))
return -1;
}
return 0;
}

-static void scan_isoc(struct fotg210_hcd *fotg210)
+static void scan_isoc(struct fhcd2xx_hcd *fhcd2xx)
{
unsigned uf, now_frame, frame, ret;
- unsigned fmask = fotg210->periodic_size - 1;
+ unsigned fmask = fhcd2xx->periodic_size - 1;
bool live;

/*
@@ -4726,22 +4726,22 @@ static void scan_isoc(struct fotg210_hcd *fotg210)
* else clean up by scanning everything that's left.
* Touches as few pages as possible: cache-friendly.
*/
- if (fotg210->rh_state >= FOTG210_RH_RUNNING) {
- uf = fotg210_read_frame_index(fotg210);
+ if (fhcd2xx->rh_state >= FHCD2XX_RH_RUNNING) {
+ uf = fhcd2xx_read_frame_index(fhcd2xx);
now_frame = (uf >> 3) & fmask;
live = true;
} else {
- now_frame = (fotg210->next_frame - 1) & fmask;
+ now_frame = (fhcd2xx->next_frame - 1) & fmask;
live = false;
}
- fotg210->now_frame = now_frame;
+ fhcd2xx->now_frame = now_frame;

- frame = fotg210->next_frame;
+ frame = fhcd2xx->next_frame;
for (;;) {

ret = 1;
while (ret != 0)
- ret = scan_frame_queue(fotg210, frame, now_frame,
+ ret = scan_frame_queue(fhcd2xx, frame, now_frame,
live);

/* Stop when we have reached the current frame */
@@ -4749,7 +4749,7 @@ static void scan_isoc(struct fotg210_hcd *fotg210)
break;
frame = (frame + 1) & fmask;
}
- fotg210->next_frame = now_frame;
+ fhcd2xx->next_frame = now_frame;
}

/*
@@ -4759,11 +4759,11 @@ static ssize_t show_uframe_periodic_max(struct device *dev,
struct device_attribute *attr,
char *buf)
{
- struct fotg210_hcd *fotg210;
+ struct fhcd2xx_hcd *fhcd2xx;
int n;

- fotg210 = hcd_to_fotg210(bus_to_hcd(dev_get_drvdata(dev)));
- n = scnprintf(buf, PAGE_SIZE, "%d\n", fotg210->uframe_periodic_max);
+ fhcd2xx = hcd_to_fhcd2xx(bus_to_hcd(dev_get_drvdata(dev)));
+ n = scnprintf(buf, PAGE_SIZE, "%d\n", fhcd2xx->uframe_periodic_max);
return n;
}

@@ -4772,19 +4772,19 @@ static ssize_t store_uframe_periodic_max(struct device *dev,
struct device_attribute *attr,
const char *buf, size_t count)
{
- struct fotg210_hcd *fotg210;
+ struct fhcd2xx_hcd *fhcd2xx;
unsigned uframe_periodic_max;
unsigned frame, uframe;
unsigned short allocated_max;
unsigned long flags;
ssize_t ret;

- fotg210 = hcd_to_fotg210(bus_to_hcd(dev_get_drvdata(dev)));
+ fhcd2xx = hcd_to_fhcd2xx(bus_to_hcd(dev_get_drvdata(dev)));
if (kstrtouint(buf, 0, &uframe_periodic_max) < 0)
return -EINVAL;

if (uframe_periodic_max < 100 || uframe_periodic_max >= 125) {
- fotg210_info(fotg210, "rejecting invalid request for uframe_periodic_max=%u\n",
+ fhcd2xx_info(fhcd2xx, "rejecting invalid request for uframe_periodic_max=%u\n",
uframe_periodic_max);
return -EINVAL;
}
@@ -4795,25 +4795,25 @@ static ssize_t store_uframe_periodic_max(struct device *dev,
* lock, so that our checking does not race with possible periodic
* bandwidth allocation through submitting new urbs.
*/
- spin_lock_irqsave(&fotg210->lock, flags);
+ spin_lock_irqsave(&fhcd2xx->lock, flags);

/*
* for request to decrease max periodic bandwidth, we have to check
* every microframe in the schedule to see whether the decrease is
* possible.
*/
- if (uframe_periodic_max < fotg210->uframe_periodic_max) {
+ if (uframe_periodic_max < fhcd2xx->uframe_periodic_max) {
allocated_max = 0;

- for (frame = 0; frame < fotg210->periodic_size; ++frame)
+ for (frame = 0; frame < fhcd2xx->periodic_size; ++frame)
for (uframe = 0; uframe < 7; ++uframe)
allocated_max = max(allocated_max,
- periodic_usecs(fotg210,
+ periodic_usecs(fhcd2xx,
frame,
uframe));

if (allocated_max > uframe_periodic_max) {
- fotg210_info(fotg210,
+ fhcd2xx_info(fhcd2xx,
"cannot decrease uframe_periodic_max because periodic bandwidth is already allocated (%u > %u)\n",
allocated_max, uframe_periodic_max);
goto out_unlock;
@@ -4822,26 +4822,26 @@ static ssize_t store_uframe_periodic_max(struct device *dev,

/* increasing is always ok */

- fotg210_info(fotg210, "setting max periodic bandwidth to %u%% (== %u usec/uframe)\n",
+ fhcd2xx_info(fhcd2xx, "setting max periodic bandwidth to %u%% (== %u usec/uframe)\n",
100 * uframe_periodic_max/125, uframe_periodic_max);

if (uframe_periodic_max != 100)
- fotg210_warn(fotg210, "max periodic bandwidth set is non-standard\n");
+ fhcd2xx_warn(fhcd2xx, "max periodic bandwidth set is non-standard\n");

- fotg210->uframe_periodic_max = uframe_periodic_max;
+ fhcd2xx->uframe_periodic_max = uframe_periodic_max;
ret = count;

out_unlock:
- spin_unlock_irqrestore(&fotg210->lock, flags);
+ spin_unlock_irqrestore(&fhcd2xx->lock, flags);
return ret;
}

static DEVICE_ATTR(uframe_periodic_max, 0644, show_uframe_periodic_max,
store_uframe_periodic_max);

-static inline int create_sysfs_files(struct fotg210_hcd *fotg210)
+static inline int create_sysfs_files(struct fhcd2xx_hcd *fhcd2xx)
{
- struct device *controller = fotg210_to_hcd(fotg210)->self.controller;
+ struct device *controller = fhcd2xx_to_hcd(fhcd2xx)->self.controller;
int i = 0;

if (i)
@@ -4852,9 +4852,9 @@ out:
return i;
}

-static inline void remove_sysfs_files(struct fotg210_hcd *fotg210)
+static inline void remove_sysfs_files(struct fhcd2xx_hcd *fhcd2xx)
{
- struct device *controller = fotg210_to_hcd(fotg210)->self.controller;
+ struct device *controller = fhcd2xx_to_hcd(fhcd2xx)->self.controller;

device_remove_file(controller, &dev_attr_uframe_periodic_max);
}
@@ -4862,180 +4862,180 @@ static inline void remove_sysfs_files(struct fotg210_hcd *fotg210)
* The firmware seems to think that powering off is a wakeup event!
* This routine turns off remote wakeup and everything else, on all ports.
*/
-static void fotg210_turn_off_all_ports(struct fotg210_hcd *fotg210)
+static void fhcd2xx_turn_off_all_ports(struct fhcd2xx_hcd *fhcd2xx)
{
- u32 __iomem *status_reg = &fotg210->regs->port_status;
+ u32 __iomem *status_reg = &fhcd2xx->regs->port_status;

- fotg210_writel(fotg210, PORT_RWC_BITS, status_reg);
+ fhcd2xx_writel(fhcd2xx, PORT_RWC_BITS, status_reg);
}

/*
* Halt HC, turn off all ports, and let the BIOS use the companion controllers.
* Must be called with interrupts enabled and the lock not held.
*/
-static void fotg210_silence_controller(struct fotg210_hcd *fotg210)
+static void fhcd2xx_silence_controller(struct fhcd2xx_hcd *fhcd2xx)
{
- fotg210_halt(fotg210);
+ fhcd2xx_halt(fhcd2xx);

- spin_lock_irq(&fotg210->lock);
- fotg210->rh_state = FOTG210_RH_HALTED;
- fotg210_turn_off_all_ports(fotg210);
- spin_unlock_irq(&fotg210->lock);
+ spin_lock_irq(&fhcd2xx->lock);
+ fhcd2xx->rh_state = FHCD2XX_RH_HALTED;
+ fhcd2xx_turn_off_all_ports(fhcd2xx);
+ spin_unlock_irq(&fhcd2xx->lock);
}

-/* fotg210_shutdown kick in for silicon on any bus (not just pci, etc).
+/* fhcd2xx_shutdown kick in for silicon on any bus (not just pci, etc).
* This forcibly disables dma and IRQs, helping kexec and other cases
* where the next system software may expect clean state.
*/
-static void fotg210_shutdown(struct usb_hcd *hcd)
+static void fhcd2xx_shutdown(struct usb_hcd *hcd)
{
- struct fotg210_hcd *fotg210 = hcd_to_fotg210(hcd);
+ struct fhcd2xx_hcd *fhcd2xx = hcd_to_fhcd2xx(hcd);

- spin_lock_irq(&fotg210->lock);
- fotg210->shutdown = true;
- fotg210->rh_state = FOTG210_RH_STOPPING;
- fotg210->enabled_hrtimer_events = 0;
- spin_unlock_irq(&fotg210->lock);
+ spin_lock_irq(&fhcd2xx->lock);
+ fhcd2xx->shutdown = true;
+ fhcd2xx->rh_state = FHCD2XX_RH_STOPPING;
+ fhcd2xx->enabled_hrtimer_events = 0;
+ spin_unlock_irq(&fhcd2xx->lock);

- fotg210_silence_controller(fotg210);
+ fhcd2xx_silence_controller(fhcd2xx);

- hrtimer_cancel(&fotg210->hrtimer);
+ hrtimer_cancel(&fhcd2xx->hrtimer);
}

/*
- * fotg210_work is called from some interrupts, timers, and so on.
- * it calls driver completion functions, after dropping fotg210->lock.
+ * fhcd2xx_work is called from some interrupts, timers, and so on.
+ * it calls driver completion functions, after dropping fhcd2xx->lock.
*/
-static void fotg210_work(struct fotg210_hcd *fotg210)
+static void fhcd2xx_work(struct fhcd2xx_hcd *fhcd2xx)
{
- /* another CPU may drop fotg210->lock during a schedule scan while
+ /* another CPU may drop fhcd2xx->lock during a schedule scan while
* it reports urb completions. this flag guards against bogus
* attempts at re-entrant schedule scanning.
*/
- if (fotg210->scanning) {
- fotg210->need_rescan = true;
+ if (fhcd2xx->scanning) {
+ fhcd2xx->need_rescan = true;
return;
}
- fotg210->scanning = true;
+ fhcd2xx->scanning = true;

rescan:
- fotg210->need_rescan = false;
- if (fotg210->async_count)
- scan_async(fotg210);
- if (fotg210->intr_count > 0)
- scan_intr(fotg210);
- if (fotg210->isoc_count > 0)
- scan_isoc(fotg210);
- if (fotg210->need_rescan)
+ fhcd2xx->need_rescan = false;
+ if (fhcd2xx->async_count)
+ scan_async(fhcd2xx);
+ if (fhcd2xx->intr_count > 0)
+ scan_intr(fhcd2xx);
+ if (fhcd2xx->isoc_count > 0)
+ scan_isoc(fhcd2xx);
+ if (fhcd2xx->need_rescan)
goto rescan;
- fotg210->scanning = false;
+ fhcd2xx->scanning = false;

/* the IO watchdog guards against hardware or driver bugs that
* misplace IRQs, and should let us run completely without IRQs.
* such lossage has been observed on both VT6202 and VT8235.
*/
- turn_on_io_watchdog(fotg210);
+ turn_on_io_watchdog(fhcd2xx);
}

/*
- * Called when the fotg210_hcd module is removed.
+ * Called when the fhcd2xx_hcd module is removed.
*/
-static void fotg210_stop(struct usb_hcd *hcd)
+static void fhcd2xx_stop(struct usb_hcd *hcd)
{
- struct fotg210_hcd *fotg210 = hcd_to_fotg210(hcd);
+ struct fhcd2xx_hcd *fhcd2xx = hcd_to_fhcd2xx(hcd);

- fotg210_dbg(fotg210, "stop\n");
+ fhcd2xx_dbg(fhcd2xx, "stop\n");

/* no more interrupts ... */

- spin_lock_irq(&fotg210->lock);
- fotg210->enabled_hrtimer_events = 0;
- spin_unlock_irq(&fotg210->lock);
+ spin_lock_irq(&fhcd2xx->lock);
+ fhcd2xx->enabled_hrtimer_events = 0;
+ spin_unlock_irq(&fhcd2xx->lock);

- fotg210_quiesce(fotg210);
- fotg210_silence_controller(fotg210);
- fotg210_reset(fotg210);
+ fhcd2xx_quiesce(fhcd2xx);
+ fhcd2xx_silence_controller(fhcd2xx);
+ fhcd2xx_reset(fhcd2xx);

- hrtimer_cancel(&fotg210->hrtimer);
- remove_sysfs_files(fotg210);
- remove_debug_files(fotg210);
+ hrtimer_cancel(&fhcd2xx->hrtimer);
+ remove_sysfs_files(fhcd2xx);
+ remove_debug_files(fhcd2xx);

/* root hub is shut down separately (first, when possible) */
- spin_lock_irq(&fotg210->lock);
- end_free_itds(fotg210);
- spin_unlock_irq(&fotg210->lock);
- fotg210_mem_cleanup(fotg210);
-
-#ifdef FOTG210_STATS
- fotg210_dbg(fotg210, "irq normal %ld err %ld iaa %ld (lost %ld)\n",
- fotg210->stats.normal, fotg210->stats.error, fotg210->stats.iaa,
- fotg210->stats.lost_iaa);
- fotg210_dbg(fotg210, "complete %ld unlink %ld\n",
- fotg210->stats.complete, fotg210->stats.unlink);
+ spin_lock_irq(&fhcd2xx->lock);
+ end_free_itds(fhcd2xx);
+ spin_unlock_irq(&fhcd2xx->lock);
+ fhcd2xx_mem_cleanup(fhcd2xx);
+
+#ifdef FHCD2XX_STATS
+ fhcd2xx_dbg(fhcd2xx, "irq normal %ld err %ld iaa %ld (lost %ld)\n",
+ fhcd2xx->stats.normal, fhcd2xx->stats.error, fhcd2xx->stats.iaa,
+ fhcd2xx->stats.lost_iaa);
+ fhcd2xx_dbg(fhcd2xx, "complete %ld unlink %ld\n",
+ fhcd2xx->stats.complete, fhcd2xx->stats.unlink);
#endif

- dbg_status(fotg210, "fotg210_stop completed",
- fotg210_readl(fotg210, &fotg210->regs->status));
+ dbg_status(fhcd2xx, "fhcd2xx_stop completed",
+ fhcd2xx_readl(fhcd2xx, &fhcd2xx->regs->status));
}

/* one-time init, only for memory state */
-static int hcd_fotg210_init(struct usb_hcd *hcd)
+static int hcd_fhcd2xx_init(struct usb_hcd *hcd)
{
- struct fotg210_hcd *fotg210 = hcd_to_fotg210(hcd);
+ struct fhcd2xx_hcd *fhcd2xx = hcd_to_fhcd2xx(hcd);
u32 temp;
int retval;
u32 hcc_params;
- struct fotg210_qh_hw *hw;
+ struct fhcd2xx_qh_hw *hw;

- spin_lock_init(&fotg210->lock);
+ spin_lock_init(&fhcd2xx->lock);

/*
* keep io watchdog by default, those good HCDs could turn off it later
*/
- fotg210->need_io_watchdog = 1;
+ fhcd2xx->need_io_watchdog = 1;

- hrtimer_init(&fotg210->hrtimer, CLOCK_MONOTONIC, HRTIMER_MODE_ABS);
- fotg210->hrtimer.function = fotg210_hrtimer_func;
- fotg210->next_hrtimer_event = FOTG210_HRTIMER_NO_EVENT;
+ hrtimer_init(&fhcd2xx->hrtimer, CLOCK_MONOTONIC, HRTIMER_MODE_ABS);
+ fhcd2xx->hrtimer.function = fhcd2xx_hrtimer_func;
+ fhcd2xx->next_hrtimer_event = FHCD2XX_HRTIMER_NO_EVENT;

- hcc_params = fotg210_readl(fotg210, &fotg210->caps->hcc_params);
+ hcc_params = fhcd2xx_readl(fhcd2xx, &fhcd2xx->caps->hcc_params);

/*
* by default set standard 80% (== 100 usec/uframe) max periodic
* bandwidth as required by USB 2.0
*/
- fotg210->uframe_periodic_max = 100;
+ fhcd2xx->uframe_periodic_max = 100;

/*
* hw default: 1K periodic list heads, one per frame.
* periodic_size can shrink by USBCMD update if hcc_params allows.
*/
- fotg210->periodic_size = DEFAULT_I_TDPS;
- INIT_LIST_HEAD(&fotg210->intr_qh_list);
- INIT_LIST_HEAD(&fotg210->cached_itd_list);
+ fhcd2xx->periodic_size = DEFAULT_I_TDPS;
+ INIT_LIST_HEAD(&fhcd2xx->intr_qh_list);
+ INIT_LIST_HEAD(&fhcd2xx->cached_itd_list);

if (HCC_PGM_FRAMELISTLEN(hcc_params)) {
/* periodic schedule size can be smaller than default */
- switch (FOTG210_TUNE_FLS) {
+ switch (FHCD2XX_TUNE_FLS) {
case 0:
- fotg210->periodic_size = 1024;
+ fhcd2xx->periodic_size = 1024;
break;
case 1:
- fotg210->periodic_size = 512;
+ fhcd2xx->periodic_size = 512;
break;
case 2:
- fotg210->periodic_size = 256;
+ fhcd2xx->periodic_size = 256;
break;
default:
BUG();
}
}
- retval = fotg210_mem_init(fotg210, GFP_KERNEL);
+ retval = fhcd2xx_mem_init(fhcd2xx, GFP_KERNEL);
if (retval < 0)
return retval;

/* controllers may cache some of the periodic schedule ... */
- fotg210->i_thresh = 2;
+ fhcd2xx->i_thresh = 2;

/*
* dedicate a qh for the async ring head, since we couldn't unlink
@@ -5044,14 +5044,14 @@ static int hcd_fotg210_init(struct usb_hcd *hcd)
* its dummy is used in hw_alt_next of many tds, to prevent the qh
* from automatically advancing to the next td after short reads.
*/
- fotg210->async->qh_next.qh = NULL;
- hw = fotg210->async->hw;
- hw->hw_next = QH_NEXT(fotg210, fotg210->async->qh_dma);
- hw->hw_info1 = cpu_to_hc32(fotg210, QH_HEAD);
- hw->hw_token = cpu_to_hc32(fotg210, QTD_STS_HALT);
- hw->hw_qtd_next = FOTG210_LIST_END(fotg210);
- fotg210->async->qh_state = QH_STATE_LINKED;
- hw->hw_alt_next = QTD_NEXT(fotg210, fotg210->async->dummy->qtd_dma);
+ fhcd2xx->async->qh_next.qh = NULL;
+ hw = fhcd2xx->async->hw;
+ hw->hw_next = QH_NEXT(fhcd2xx, fhcd2xx->async->qh_dma);
+ hw->hw_info1 = cpu_to_hc32(fhcd2xx, QH_HEAD);
+ hw->hw_token = cpu_to_hc32(fhcd2xx, QTD_STS_HALT);
+ hw->hw_qtd_next = FHCD2XX_LIST_END(fhcd2xx);
+ fhcd2xx->async->qh_state = QH_STATE_LINKED;
+ hw->hw_alt_next = QTD_NEXT(fhcd2xx, fhcd2xx->async->dummy->qtd_dma);

/* clear interrupt enables, set irq latency */
if (log2_irq_thresh < 0 || log2_irq_thresh > 6)
@@ -5070,14 +5070,14 @@ static int hcd_fotg210_init(struct usb_hcd *hcd)
temp |= CMD_PARK;
temp |= park << 8;
}
- fotg210_dbg(fotg210, "park %d\n", park);
+ fhcd2xx_dbg(fhcd2xx, "park %d\n", park);
}
if (HCC_PGM_FRAMELISTLEN(hcc_params)) {
/* periodic schedule size can be smaller than default */
temp &= ~(3 << 2);
- temp |= (FOTG210_TUNE_FLS << 2);
+ temp |= (FHCD2XX_TUNE_FLS << 2);
}
- fotg210->command = temp;
+ fhcd2xx->command = temp;

/* Accept arbitrarily long scatter-gather lists */
if (!(hcd->driver->flags & HCD_LOCAL_MEM))
@@ -5085,10 +5085,10 @@ static int hcd_fotg210_init(struct usb_hcd *hcd)
return 0;
}

-/* start HC running; it's halted, hcd_fotg210_init() has been run (once) */
-static int fotg210_run(struct usb_hcd *hcd)
+/* start HC running; it's halted, hcd_fhcd2xx_init() has been run (once) */
+static int fhcd2xx_run(struct usb_hcd *hcd)
{
- struct fotg210_hcd *fotg210 = hcd_to_fotg210(hcd);
+ struct fhcd2xx_hcd *fhcd2xx = hcd_to_fhcd2xx(hcd);
u32 temp;
u32 hcc_params;

@@ -5096,13 +5096,13 @@ static int fotg210_run(struct usb_hcd *hcd)

/* EHCI spec section 4.1 */

- fotg210_writel(fotg210, fotg210->periodic_dma,
- &fotg210->regs->frame_list);
- fotg210_writel(fotg210, (u32)fotg210->async->qh_dma,
- &fotg210->regs->async_next);
+ fhcd2xx_writel(fhcd2xx, fhcd2xx->periodic_dma,
+ &fhcd2xx->regs->frame_list);
+ fhcd2xx_writel(fhcd2xx, (u32)fhcd2xx->async->qh_dma,
+ &fhcd2xx->regs->async_next);

/*
- * hcc_params controls whether fotg210->regs->segment must (!!!)
+ * hcc_params controls whether fhcd2xx->regs->segment must (!!!)
* be used; it constrains QH/ITD/SITD and QTD locations.
* pci_pool consistent memory always uses segment zero.
* streaming mappings for I/O buffers, like pci_map_single(),
@@ -5113,16 +5113,16 @@ static int fotg210_run(struct usb_hcd *hcd)
* Scsi_Host.highmem_io, and so forth. It's readonly to all
* host side drivers though.
*/
- hcc_params = fotg210_readl(fotg210, &fotg210->caps->hcc_params);
+ hcc_params = fhcd2xx_readl(fhcd2xx, &fhcd2xx->caps->hcc_params);

/*
* Philips, Intel, and maybe others need CMD_RUN before the
* root hub will detect new devices (why?); NEC doesn't
*/
- fotg210->command &= ~(CMD_IAAD|CMD_PSE|CMD_ASE|CMD_RESET);
- fotg210->command |= CMD_RUN;
- fotg210_writel(fotg210, fotg210->command, &fotg210->regs->command);
- dbg_cmd(fotg210, "init", fotg210->command);
+ fhcd2xx->command &= ~(CMD_IAAD|CMD_PSE|CMD_ASE|CMD_RESET);
+ fhcd2xx->command |= CMD_RUN;
+ fhcd2xx_writel(fhcd2xx, fhcd2xx->command, &fhcd2xx->regs->command);
+ dbg_cmd(fhcd2xx, "init", fhcd2xx->command);

/*
* Start, enabling full USB 2.0 functionality ... usb 1.1 devices
@@ -5139,77 +5139,77 @@ static int fotg210_run(struct usb_hcd *hcd)
* be started before the port switching actions could complete.
*/
down_write(&ehci_cf_port_reset_rwsem);
- fotg210->rh_state = FOTG210_RH_RUNNING;
+ fhcd2xx->rh_state = FHCD2XX_RH_RUNNING;
/* unblock posted writes */
- fotg210_readl(fotg210, &fotg210->regs->command);
+ fhcd2xx_readl(fhcd2xx, &fhcd2xx->regs->command);
usleep_range(5000, 6000);
up_write(&ehci_cf_port_reset_rwsem);
- fotg210->last_periodic_enable = ktime_get_real();
+ fhcd2xx->last_periodic_enable = ktime_get_real();

- temp = HC_VERSION(fotg210,
- fotg210_readl(fotg210, &fotg210->caps->hc_capbase));
- fotg210_info(fotg210,
+ temp = HC_VERSION(fhcd2xx,
+ fhcd2xx_readl(fhcd2xx, &fhcd2xx->caps->hc_capbase));
+ fhcd2xx_info(fhcd2xx,
"USB %x.%x started, EHCI %x.%02x\n",
- ((fotg210->sbrn & 0xf0)>>4), (fotg210->sbrn & 0x0f),
+ ((fhcd2xx->sbrn & 0xf0)>>4), (fhcd2xx->sbrn & 0x0f),
temp >> 8, temp & 0xff);

- fotg210_writel(fotg210, INTR_MASK,
- &fotg210->regs->intr_enable); /* Turn On Interrupts */
+ fhcd2xx_writel(fhcd2xx, INTR_MASK,
+ &fhcd2xx->regs->intr_enable); /* Turn On Interrupts */

/* GRR this is run-once init(), being done every time the HC starts.
* So long as they're part of class devices, we can't do it init()
* since the class device isn't created that early.
*/
- create_debug_files(fotg210);
- create_sysfs_files(fotg210);
+ create_debug_files(fhcd2xx);
+ create_sysfs_files(fhcd2xx);

return 0;
}

-static int fotg210_setup(struct usb_hcd *hcd)
+static int fhcd2xx_setup(struct usb_hcd *hcd)
{
- struct fotg210_hcd *fotg210 = hcd_to_fotg210(hcd);
+ struct fhcd2xx_hcd *fhcd2xx = hcd_to_fhcd2xx(hcd);
int retval;

- fotg210->regs = (void __iomem *)fotg210->caps +
- HC_LENGTH(fotg210,
- fotg210_readl(fotg210, &fotg210->caps->hc_capbase));
- dbg_hcs_params(fotg210, "reset");
- dbg_hcc_params(fotg210, "reset");
+ fhcd2xx->regs = (void __iomem *)fhcd2xx->caps +
+ HC_LENGTH(fhcd2xx,
+ fhcd2xx_readl(fhcd2xx, &fhcd2xx->caps->hc_capbase));
+ dbg_hcs_params(fhcd2xx, "reset");
+ dbg_hcc_params(fhcd2xx, "reset");

/* cache this readonly data; minimize chip reads */
- fotg210->hcs_params = fotg210_readl(fotg210,
- &fotg210->caps->hcs_params);
+ fhcd2xx->hcs_params = fhcd2xx_readl(fhcd2xx,
+ &fhcd2xx->caps->hcs_params);

- fotg210->sbrn = HCD_USB2;
+ fhcd2xx->sbrn = HCD_USB2;

/* data structure init */
- retval = hcd_fotg210_init(hcd);
+ retval = hcd_fhcd2xx_init(hcd);
if (retval)
return retval;

- retval = fotg210_halt(fotg210);
+ retval = fhcd2xx_halt(fhcd2xx);
if (retval)
return retval;

- fotg210_reset(fotg210);
+ fhcd2xx_reset(fhcd2xx);

return 0;
}

-static irqreturn_t fotg210_irq(struct usb_hcd *hcd)
+static irqreturn_t fhcd2xx_irq(struct usb_hcd *hcd)
{
- struct fotg210_hcd *fotg210 = hcd_to_fotg210(hcd);
+ struct fhcd2xx_hcd *fhcd2xx = hcd_to_fhcd2xx(hcd);
u32 status, masked_status, pcd_status = 0, cmd;
int bh;

- spin_lock(&fotg210->lock);
+ spin_lock(&fhcd2xx->lock);

- status = fotg210_readl(fotg210, &fotg210->regs->status);
+ status = fhcd2xx_readl(fhcd2xx, &fhcd2xx->regs->status);

/* e.g. cardbus physical eject */
if (status == ~(u32) 0) {
- fotg210_dbg(fotg210, "device removed\n");
+ fhcd2xx_dbg(fhcd2xx, "device removed\n");
goto dead;
}

@@ -5221,27 +5221,27 @@ static irqreturn_t fotg210_irq(struct usb_hcd *hcd)

/* Shared IRQ? */
if (!masked_status ||
- unlikely(fotg210->rh_state == FOTG210_RH_HALTED)) {
- spin_unlock(&fotg210->lock);
+ unlikely(fhcd2xx->rh_state == FHCD2XX_RH_HALTED)) {
+ spin_unlock(&fhcd2xx->lock);
return IRQ_NONE;
}

/* clear (just) interrupts */
- fotg210_writel(fotg210, masked_status, &fotg210->regs->status);
- cmd = fotg210_readl(fotg210, &fotg210->regs->command);
+ fhcd2xx_writel(fhcd2xx, masked_status, &fhcd2xx->regs->status);
+ cmd = fhcd2xx_readl(fhcd2xx, &fhcd2xx->regs->command);
bh = 0;

/* unrequested/ignored: Frame List Rollover */
- dbg_status(fotg210, "irq", status);
+ dbg_status(fhcd2xx, "irq", status);

/* INT, ERR, and IAA interrupt rates can be throttled */

/* normal [4.15.1.2] or error [4.15.1.1] completion */
if (likely((status & (STS_INT|STS_ERR)) != 0)) {
if (likely((status & STS_ERR) == 0))
- COUNT(fotg210->stats.normal);
+ COUNT(fhcd2xx->stats.normal);
else
- COUNT(fotg210->stats.error);
+ COUNT(fhcd2xx->stats.error);
bh = 1;
}

@@ -5249,8 +5249,8 @@ static irqreturn_t fotg210_irq(struct usb_hcd *hcd)
if (status & STS_IAA) {

/* Turn off the IAA watchdog */
- fotg210->enabled_hrtimer_events &=
- ~BIT(FOTG210_HRTIMER_IAA_WATCHDOG);
+ fhcd2xx->enabled_hrtimer_events &=
+ ~BIT(FHCD2XX_HRTIMER_IAA_WATCHDOG);

/*
* Mild optimization: Allow another IAAD to reset the
@@ -5259,75 +5259,75 @@ static irqreturn_t fotg210_irq(struct usb_hcd *hcd)
* tests show that about half the time it will be reset
* for some other event anyway.
*/
- if (fotg210->next_hrtimer_event == FOTG210_HRTIMER_IAA_WATCHDOG)
- ++fotg210->next_hrtimer_event;
+ if (fhcd2xx->next_hrtimer_event == FHCD2XX_HRTIMER_IAA_WATCHDOG)
+ ++fhcd2xx->next_hrtimer_event;

/* guard against (alleged) silicon errata */
if (cmd & CMD_IAAD)
- fotg210_dbg(fotg210, "IAA with IAAD still set?\n");
- if (fotg210->async_iaa) {
- COUNT(fotg210->stats.iaa);
- end_unlink_async(fotg210);
+ fhcd2xx_dbg(fhcd2xx, "IAA with IAAD still set?\n");
+ if (fhcd2xx->async_iaa) {
+ COUNT(fhcd2xx->stats.iaa);
+ end_unlink_async(fhcd2xx);
} else
- fotg210_dbg(fotg210, "IAA with nothing unlinked?\n");
+ fhcd2xx_dbg(fhcd2xx, "IAA with nothing unlinked?\n");
}

/* remote wakeup [4.3.1] */
if (status & STS_PCD) {
int pstatus;
- u32 __iomem *status_reg = &fotg210->regs->port_status;
+ u32 __iomem *status_reg = &fhcd2xx->regs->port_status;

/* kick root hub later */
pcd_status = status;

/* resume root hub? */
- if (fotg210->rh_state == FOTG210_RH_SUSPENDED)
+ if (fhcd2xx->rh_state == FHCD2XX_RH_SUSPENDED)
usb_hcd_resume_root_hub(hcd);

- pstatus = fotg210_readl(fotg210, status_reg);
+ pstatus = fhcd2xx_readl(fhcd2xx, status_reg);

- if (test_bit(0, &fotg210->suspended_ports) &&
+ if (test_bit(0, &fhcd2xx->suspended_ports) &&
((pstatus & PORT_RESUME) ||
!(pstatus & PORT_SUSPEND)) &&
(pstatus & PORT_PE) &&
- fotg210->reset_done[0] == 0) {
+ fhcd2xx->reset_done[0] == 0) {

/* start 20 msec resume signaling from this port,
* and make hub_wq collect PORT_STAT_C_SUSPEND to
* stop that signaling. Use 5 ms extra for safety,
* like usb_port_resume() does.
*/
- fotg210->reset_done[0] = jiffies + msecs_to_jiffies(25);
- set_bit(0, &fotg210->resuming_ports);
- fotg210_dbg(fotg210, "port 1 remote wakeup\n");
- mod_timer(&hcd->rh_timer, fotg210->reset_done[0]);
+ fhcd2xx->reset_done[0] = jiffies + msecs_to_jiffies(25);
+ set_bit(0, &fhcd2xx->resuming_ports);
+ fhcd2xx_dbg(fhcd2xx, "port 1 remote wakeup\n");
+ mod_timer(&hcd->rh_timer, fhcd2xx->reset_done[0]);
}
}

/* PCI errors [4.15.2.4] */
if (unlikely((status & STS_FATAL) != 0)) {
- fotg210_err(fotg210, "fatal error\n");
- dbg_cmd(fotg210, "fatal", cmd);
- dbg_status(fotg210, "fatal", status);
+ fhcd2xx_err(fhcd2xx, "fatal error\n");
+ dbg_cmd(fhcd2xx, "fatal", cmd);
+ dbg_status(fhcd2xx, "fatal", status);
dead:
usb_hc_died(hcd);

/* Don't let the controller do anything more */
- fotg210->shutdown = true;
- fotg210->rh_state = FOTG210_RH_STOPPING;
- fotg210->command &= ~(CMD_RUN | CMD_ASE | CMD_PSE);
- fotg210_writel(fotg210, fotg210->command,
- &fotg210->regs->command);
- fotg210_writel(fotg210, 0, &fotg210->regs->intr_enable);
- fotg210_handle_controller_death(fotg210);
+ fhcd2xx->shutdown = true;
+ fhcd2xx->rh_state = FHCD2XX_RH_STOPPING;
+ fhcd2xx->command &= ~(CMD_RUN | CMD_ASE | CMD_PSE);
+ fhcd2xx_writel(fhcd2xx, fhcd2xx->command,
+ &fhcd2xx->regs->command);
+ fhcd2xx_writel(fhcd2xx, 0, &fhcd2xx->regs->intr_enable);
+ fhcd2xx_handle_controller_death(fhcd2xx);

/* Handle completions when the controller stops */
bh = 0;
}

if (bh)
- fotg210_work(fotg210);
- spin_unlock(&fotg210->lock);
+ fhcd2xx_work(fhcd2xx);
+ spin_unlock(&fhcd2xx->lock);
if (pcd_status)
usb_hcd_poll_rh_status(hcd);
return IRQ_HANDLED;
@@ -5345,10 +5345,10 @@ dead:
* NOTE: control, bulk, and interrupt share the same code to append TDs
* to a (possibly active) QH, and the same QH scanning code.
*/
-static int fotg210_urb_enqueue(struct usb_hcd *hcd, struct urb *urb,
+static int fhcd2xx_urb_enqueue(struct usb_hcd *hcd, struct urb *urb,
gfp_t mem_flags)
{
- struct fotg210_hcd *fotg210 = hcd_to_fotg210(hcd);
+ struct fhcd2xx_hcd *fhcd2xx = hcd_to_fhcd2xx(hcd);
struct list_head qtd_list;

INIT_LIST_HEAD(&qtd_list);
@@ -5363,17 +5363,17 @@ static int fotg210_urb_enqueue(struct usb_hcd *hcd, struct urb *urb,
/* FALLTHROUGH */
/* case PIPE_BULK: */
default:
- if (!qh_urb_transaction(fotg210, urb, &qtd_list, mem_flags))
+ if (!qh_urb_transaction(fhcd2xx, urb, &qtd_list, mem_flags))
return -ENOMEM;
- return submit_async(fotg210, urb, &qtd_list, mem_flags);
+ return submit_async(fhcd2xx, urb, &qtd_list, mem_flags);

case PIPE_INTERRUPT:
- if (!qh_urb_transaction(fotg210, urb, &qtd_list, mem_flags))
+ if (!qh_urb_transaction(fhcd2xx, urb, &qtd_list, mem_flags))
return -ENOMEM;
- return intr_submit(fotg210, urb, &qtd_list, mem_flags);
+ return intr_submit(fhcd2xx, urb, &qtd_list, mem_flags);

case PIPE_ISOCHRONOUS:
- return itd_submit(fotg210, urb, mem_flags);
+ return itd_submit(fhcd2xx, urb, mem_flags);
}
}

@@ -5381,14 +5381,14 @@ static int fotg210_urb_enqueue(struct usb_hcd *hcd, struct urb *urb,
* completions normally happen asynchronously
*/

-static int fotg210_urb_dequeue(struct usb_hcd *hcd, struct urb *urb, int status)
+static int fhcd2xx_urb_dequeue(struct usb_hcd *hcd, struct urb *urb, int status)
{
- struct fotg210_hcd *fotg210 = hcd_to_fotg210(hcd);
- struct fotg210_qh *qh;
+ struct fhcd2xx_hcd *fhcd2xx = hcd_to_fhcd2xx(hcd);
+ struct fhcd2xx_qh *qh;
unsigned long flags;
int rc;

- spin_lock_irqsave(&fotg210->lock, flags);
+ spin_lock_irqsave(&fhcd2xx->lock, flags);
rc = usb_hcd_check_unlink_urb(hcd, urb, status);
if (rc)
goto done;
@@ -5397,13 +5397,13 @@ static int fotg210_urb_dequeue(struct usb_hcd *hcd, struct urb *urb, int status)
/* case PIPE_CONTROL: */
/* case PIPE_BULK:*/
default:
- qh = (struct fotg210_qh *) urb->hcpriv;
+ qh = (struct fhcd2xx_qh *) urb->hcpriv;
if (!qh)
break;
switch (qh->qh_state) {
case QH_STATE_LINKED:
case QH_STATE_COMPLETING:
- start_unlink_async(fotg210, qh);
+ start_unlink_async(fhcd2xx, qh);
break;
case QH_STATE_UNLINK:
case QH_STATE_UNLINK_WAIT:
@@ -5411,25 +5411,25 @@ static int fotg210_urb_dequeue(struct usb_hcd *hcd, struct urb *urb, int status)
break;
case QH_STATE_IDLE:
/* QH might be waiting for a Clear-TT-Buffer */
- qh_completions(fotg210, qh);
+ qh_completions(fhcd2xx, qh);
break;
}
break;

case PIPE_INTERRUPT:
- qh = (struct fotg210_qh *) urb->hcpriv;
+ qh = (struct fhcd2xx_qh *) urb->hcpriv;
if (!qh)
break;
switch (qh->qh_state) {
case QH_STATE_LINKED:
case QH_STATE_COMPLETING:
- start_unlink_intr(fotg210, qh);
+ start_unlink_intr(fhcd2xx, qh);
break;
case QH_STATE_IDLE:
- qh_completions(fotg210, qh);
+ qh_completions(fhcd2xx, qh);
break;
default:
- fotg210_dbg(fotg210, "bogus qh %p state %d\n",
+ fhcd2xx_dbg(fhcd2xx, "bogus qh %p state %d\n",
qh, qh->qh_state);
goto done;
}
@@ -5443,24 +5443,24 @@ static int fotg210_urb_dequeue(struct usb_hcd *hcd, struct urb *urb, int status)
break;
}
done:
- spin_unlock_irqrestore(&fotg210->lock, flags);
+ spin_unlock_irqrestore(&fhcd2xx->lock, flags);
return rc;
}

/* bulk qh holds the data toggle */

-static void fotg210_endpoint_disable(struct usb_hcd *hcd,
+static void fhcd2xx_endpoint_disable(struct usb_hcd *hcd,
struct usb_host_endpoint *ep)
{
- struct fotg210_hcd *fotg210 = hcd_to_fotg210(hcd);
+ struct fhcd2xx_hcd *fhcd2xx = hcd_to_fhcd2xx(hcd);
unsigned long flags;
- struct fotg210_qh *qh, *tmp;
+ struct fhcd2xx_qh *qh, *tmp;

/* ASSERT: any requests/urbs are being unlinked */
/* ASSERT: nobody can be submitting urbs for this any more */

rescan:
- spin_lock_irqsave(&fotg210->lock, flags);
+ spin_lock_irqsave(&fhcd2xx->lock, flags);
qh = ep->hcpriv;
if (!qh)
goto done;
@@ -5469,7 +5469,7 @@ rescan:
* accelerate iso completions ... so spin a while.
*/
if (qh->hw == NULL) {
- struct fotg210_iso_stream *stream = ep->hcpriv;
+ struct fhcd2xx_iso_stream *stream = ep->hcpriv;

if (!list_empty(&stream->td_list))
goto idle_timeout;
@@ -5479,12 +5479,12 @@ rescan:
goto done;
}

- if (fotg210->rh_state < FOTG210_RH_RUNNING)
+ if (fhcd2xx->rh_state < FHCD2XX_RH_RUNNING)
qh->qh_state = QH_STATE_IDLE;
switch (qh->qh_state) {
case QH_STATE_LINKED:
case QH_STATE_COMPLETING:
- for (tmp = fotg210->async->qh_next.qh;
+ for (tmp = fhcd2xx->async->qh_next.qh;
tmp && tmp != qh;
tmp = tmp->qh_next.qh)
continue;
@@ -5492,19 +5492,19 @@ rescan:
* may already be unlinked.
*/
if (tmp)
- start_unlink_async(fotg210, qh);
+ start_unlink_async(fhcd2xx, qh);
/* FALL THROUGH */
case QH_STATE_UNLINK: /* wait for hw to finish? */
case QH_STATE_UNLINK_WAIT:
idle_timeout:
- spin_unlock_irqrestore(&fotg210->lock, flags);
+ spin_unlock_irqrestore(&fhcd2xx->lock, flags);
schedule_timeout_uninterruptible(1);
goto rescan;
case QH_STATE_IDLE: /* fully unlinked */
if (qh->clearing_tt)
goto idle_timeout;
if (list_empty(&qh->qtd_list)) {
- qh_destroy(fotg210, qh);
+ qh_destroy(fhcd2xx, qh);
break;
}
/* else FALL THROUGH */
@@ -5512,21 +5512,21 @@ idle_timeout:
/* caller was supposed to have unlinked any requests;
* that's not our job. just leak this memory.
*/
- fotg210_err(fotg210, "qh %p (#%02x) state %d%s\n",
+ fhcd2xx_err(fhcd2xx, "qh %p (#%02x) state %d%s\n",
qh, ep->desc.bEndpointAddress, qh->qh_state,
list_empty(&qh->qtd_list) ? "" : "(has tds)");
break;
}
done:
ep->hcpriv = NULL;
- spin_unlock_irqrestore(&fotg210->lock, flags);
+ spin_unlock_irqrestore(&fhcd2xx->lock, flags);
}

-static void fotg210_endpoint_reset(struct usb_hcd *hcd,
+static void fhcd2xx_endpoint_reset(struct usb_hcd *hcd,
struct usb_host_endpoint *ep)
{
- struct fotg210_hcd *fotg210 = hcd_to_fotg210(hcd);
- struct fotg210_qh *qh;
+ struct fhcd2xx_hcd *fhcd2xx = hcd_to_fhcd2xx(hcd);
+ struct fhcd2xx_qh *qh;
int eptype = usb_endpoint_type(&ep->desc);
int epnum = usb_endpoint_num(&ep->desc);
int is_out = usb_endpoint_dir_out(&ep->desc);
@@ -5535,7 +5535,7 @@ static void fotg210_endpoint_reset(struct usb_hcd *hcd,
if (eptype != USB_ENDPOINT_XFER_BULK && eptype != USB_ENDPOINT_XFER_INT)
return;

- spin_lock_irqsave(&fotg210->lock, flags);
+ spin_lock_irqsave(&fhcd2xx->lock, flags);
qh = ep->hcpriv;

/* For Bulk and Interrupt endpoints we maintain the toggle state
@@ -5555,106 +5555,106 @@ static void fotg210_endpoint_reset(struct usb_hcd *hcd,
* re-linking will call qh_refresh().
*/
if (eptype == USB_ENDPOINT_XFER_BULK)
- start_unlink_async(fotg210, qh);
+ start_unlink_async(fhcd2xx, qh);
else
- start_unlink_intr(fotg210, qh);
+ start_unlink_intr(fhcd2xx, qh);
}
}
- spin_unlock_irqrestore(&fotg210->lock, flags);
+ spin_unlock_irqrestore(&fhcd2xx->lock, flags);
}

-static int fotg210_get_frame(struct usb_hcd *hcd)
+static int fhcd2xx_get_frame(struct usb_hcd *hcd)
{
- struct fotg210_hcd *fotg210 = hcd_to_fotg210(hcd);
+ struct fhcd2xx_hcd *fhcd2xx = hcd_to_fhcd2xx(hcd);

- return (fotg210_read_frame_index(fotg210) >> 3) %
- fotg210->periodic_size;
+ return (fhcd2xx_read_frame_index(fhcd2xx) >> 3) %
+ fhcd2xx->periodic_size;
}

/*
* The EHCI in ChipIdea HDRC cannot be a separate module or device,
* because its registers (and irq) are shared between host/gadget/otg
* functions and in order to facilitate role switching we cannot
- * give the fotg210 driver exclusive access to those.
+ * give the fhcd2xx driver exclusive access to those.
*/
MODULE_DESCRIPTION(DRIVER_DESC);
MODULE_AUTHOR(DRIVER_AUTHOR);
MODULE_LICENSE("GPL");

-static const struct hc_driver fotg210_fotg210_hc_driver = {
+static const struct hc_driver fhcd2xx_fhcd2xx_hc_driver = {
.description = hcd_name,
.product_desc = "Faraday USB2.0 Host Controller",
- .hcd_priv_size = sizeof(struct fotg210_hcd),
+ .hcd_priv_size = sizeof(struct fhcd2xx_hcd),

/*
* generic hardware linkage
*/
- .irq = fotg210_irq,
+ .irq = fhcd2xx_irq,
.flags = HCD_MEMORY | HCD_USB2,

/*
* basic lifecycle operations
*/
- .reset = hcd_fotg210_init,
- .start = fotg210_run,
- .stop = fotg210_stop,
- .shutdown = fotg210_shutdown,
+ .reset = hcd_fhcd2xx_init,
+ .start = fhcd2xx_run,
+ .stop = fhcd2xx_stop,
+ .shutdown = fhcd2xx_shutdown,

/*
* managing i/o requests and associated device resources
*/
- .urb_enqueue = fotg210_urb_enqueue,
- .urb_dequeue = fotg210_urb_dequeue,
- .endpoint_disable = fotg210_endpoint_disable,
- .endpoint_reset = fotg210_endpoint_reset,
+ .urb_enqueue = fhcd2xx_urb_enqueue,
+ .urb_dequeue = fhcd2xx_urb_dequeue,
+ .endpoint_disable = fhcd2xx_endpoint_disable,
+ .endpoint_reset = fhcd2xx_endpoint_reset,

/*
* scheduling support
*/
- .get_frame_number = fotg210_get_frame,
+ .get_frame_number = fhcd2xx_get_frame,

/*
* root hub support
*/
- .hub_status_data = fotg210_hub_status_data,
- .hub_control = fotg210_hub_control,
- .bus_suspend = fotg210_bus_suspend,
- .bus_resume = fotg210_bus_resume,
+ .hub_status_data = fhcd2xx_hub_status_data,
+ .hub_control = fhcd2xx_hub_control,
+ .bus_suspend = fhcd2xx_bus_suspend,
+ .bus_resume = fhcd2xx_bus_resume,

- .relinquish_port = fotg210_relinquish_port,
- .port_handed_over = fotg210_port_handed_over,
+ .relinquish_port = fhcd2xx_relinquish_port,
+ .port_handed_over = fhcd2xx_port_handed_over,

- .clear_tt_buffer_complete = fotg210_clear_tt_buffer_complete,
+ .clear_tt_buffer_complete = fhcd2xx_clear_tt_buffer_complete,
};

-static void fotg210_init(struct fotg210_hcd *fotg210)
+static void fhcd2xx_init(struct fhcd2xx_hcd *fhcd2xx)
{
u32 value;

iowrite32(GMIR_MDEV_INT | GMIR_MOTG_INT | GMIR_INT_POLARITY,
- &fotg210->regs->gmir);
+ &fhcd2xx->regs->gmir);

- value = ioread32(&fotg210->regs->otgcsr);
+ value = ioread32(&fhcd2xx->regs->otgcsr);
value &= ~OTGCSR_A_BUS_DROP;
value |= OTGCSR_A_BUS_REQ;
- iowrite32(value, &fotg210->regs->otgcsr);
+ iowrite32(value, &fhcd2xx->regs->otgcsr);
}

/**
- * fotg210_hcd_probe - initialize faraday FOTG210 HCDs
+ * fhcd2xx_hcd_probe - initialize faraday FHCD2XX HCDs
*
* Allocates basic resources for this USB host controller, and
* then invokes the start() method for the HCD associated with it
* through the hotplug entry's driver_data.
*/
-static int fotg210_hcd_probe(struct platform_device *pdev)
+static int fhcd2xx_hcd_probe(struct platform_device *pdev)
{
struct device *dev = &pdev->dev;
struct usb_hcd *hcd;
struct resource *res;
int irq;
int retval = -ENODEV;
- struct fotg210_hcd *fotg210;
+ struct fhcd2xx_hcd *fhcd2xx;

if (usb_disabled())
return -ENODEV;
@@ -5671,7 +5671,7 @@ static int fotg210_hcd_probe(struct platform_device *pdev)

irq = res->start;

- hcd = usb_create_hcd(&fotg210_fotg210_hc_driver, dev,
+ hcd = usb_create_hcd(&fhcd2xx_fhcd2xx_hc_driver, dev,
dev_name(dev));
if (!hcd) {
dev_err(dev, "failed to create hcd with err %d\n", retval);
@@ -5691,15 +5691,15 @@ static int fotg210_hcd_probe(struct platform_device *pdev)
hcd->rsrc_start = res->start;
hcd->rsrc_len = resource_size(res);

- fotg210 = hcd_to_fotg210(hcd);
+ fhcd2xx = hcd_to_fhcd2xx(hcd);

- fotg210->caps = hcd->regs;
+ fhcd2xx->caps = hcd->regs;

- retval = fotg210_setup(hcd);
+ retval = fhcd2xx_setup(hcd);
if (retval)
goto failed;

- fotg210_init(fotg210);
+ fhcd2xx_init(fhcd2xx);

retval = usb_add_hcd(hcd, irq, IRQF_SHARED);
if (retval) {
@@ -5718,11 +5718,11 @@ fail_create_hcd:
}

/**
- * fotg210_hcd_remove - shutdown processing for EHCI HCDs
+ * fhcd2xx_hcd_remove - shutdown processing for EHCI HCDs
* @dev: USB Host Controller being removed
*
*/
-static int fotg210_hcd_remove(struct platform_device *pdev)
+static int fhcd2xx_hcd_remove(struct platform_device *pdev)
{
struct device *dev = &pdev->dev;
struct usb_hcd *hcd = dev_get_drvdata(dev);
@@ -5736,15 +5736,15 @@ static int fotg210_hcd_remove(struct platform_device *pdev)
return 0;
}

-static struct platform_driver fotg210_hcd_driver = {
+static struct platform_driver fhcd2xx_hcd_driver = {
.driver = {
- .name = "fotg210-hcd",
+ .name = "fhcd2xx-hcd",
},
- .probe = fotg210_hcd_probe,
- .remove = fotg210_hcd_remove,
+ .probe = fhcd2xx_hcd_probe,
+ .remove = fhcd2xx_hcd_remove,
};

-static int __init fotg210_hcd_init(void)
+static int __init fhcd2xx_hcd_init(void)
{
int retval = 0;

@@ -5755,38 +5755,38 @@ static int __init fotg210_hcd_init(void)
set_bit(USB_EHCI_LOADED, &usb_hcds_loaded);
if (test_bit(USB_UHCI_LOADED, &usb_hcds_loaded) ||
test_bit(USB_OHCI_LOADED, &usb_hcds_loaded))
- pr_warn("Warning! fotg210_hcd should always be loaded before uhci_hcd and ohci_hcd, not after\n");
+ pr_warn("Warning! fhcd2xx_hcd should always be loaded before uhci_hcd and ohci_hcd, not after\n");

pr_debug("%s: block sizes: qh %Zd qtd %Zd itd %Zd\n",
hcd_name,
- sizeof(struct fotg210_qh), sizeof(struct fotg210_qtd),
- sizeof(struct fotg210_itd));
+ sizeof(struct fhcd2xx_qh), sizeof(struct fhcd2xx_qtd),
+ sizeof(struct fhcd2xx_itd));

- fotg210_debug_root = debugfs_create_dir("fotg210", usb_debug_root);
- if (!fotg210_debug_root) {
+ fhcd2xx_debug_root = debugfs_create_dir("fhcd2xx", usb_debug_root);
+ if (!fhcd2xx_debug_root) {
retval = -ENOENT;
goto err_debug;
}

- retval = platform_driver_register(&fotg210_hcd_driver);
+ retval = platform_driver_register(&fhcd2xx_hcd_driver);
if (retval < 0)
goto clean;
return retval;

- platform_driver_unregister(&fotg210_hcd_driver);
+ platform_driver_unregister(&fhcd2xx_hcd_driver);
clean:
- debugfs_remove(fotg210_debug_root);
- fotg210_debug_root = NULL;
+ debugfs_remove(fhcd2xx_debug_root);
+ fhcd2xx_debug_root = NULL;
err_debug:
clear_bit(USB_EHCI_LOADED, &usb_hcds_loaded);
return retval;
}
-module_init(fotg210_hcd_init);
+module_init(fhcd2xx_hcd_init);

-static void __exit fotg210_hcd_cleanup(void)
+static void __exit fhcd2xx_hcd_cleanup(void)
{
- platform_driver_unregister(&fotg210_hcd_driver);
- debugfs_remove(fotg210_debug_root);
+ platform_driver_unregister(&fhcd2xx_hcd_driver);
+ debugfs_remove(fhcd2xx_debug_root);
clear_bit(USB_EHCI_LOADED, &usb_hcds_loaded);
}
-module_exit(fotg210_hcd_cleanup);
+module_exit(fhcd2xx_hcd_cleanup);
diff --git a/drivers/usb/host/faraday-hcd.h b/drivers/usb/host/faraday-hcd.h
index b5cfa7a..cf29edf 100644
--- a/drivers/usb/host/faraday-hcd.h
+++ b/drivers/usb/host/faraday-hcd.h
@@ -1,5 +1,5 @@
-#ifndef __LINUX_FOTG210_H
-#define __LINUX_FOTG210_H
+#ifndef __LINUX_FHCD2XX_H
+#define __LINUX_FHCD2XX_H

#include <linux/usb/ehci-dbgp.h>

@@ -7,7 +7,7 @@

/*
* __hc32 and __hc16 are "Host Controller" types, they may be equivalent to
- * __leXX (normally) or __beXX (given FOTG210_BIG_ENDIAN_DESC), depending on
+ * __leXX (normally) or __beXX (given FHCD2XX_BIG_ENDIAN_DESC), depending on
* the host controller implementation.
*
* To facilitate the strongest possible byte-order checking from "sparse"
@@ -17,7 +17,7 @@
#define __hc16 __le16

/* statistics can be kept for tuning/monitoring */
-struct fotg210_stats {
+struct fhcd2xx_stats {
/* irq usage */
unsigned long normal;
unsigned long error;
@@ -29,27 +29,27 @@ struct fotg210_stats {
unsigned long unlink;
};

-/* fotg210_hcd->lock guards shared data against other CPUs:
- * fotg210_hcd: async, unlink, periodic (and shadow), ...
+/* fhcd2xx_hcd->lock guards shared data against other CPUs:
+ * fhcd2xx_hcd: async, unlink, periodic (and shadow), ...
* usb_host_endpoint: hcpriv
- * fotg210_qh: qh_next, qtd_list
- * fotg210_qtd: qtd_list
+ * fhcd2xx_qh: qh_next, qtd_list
+ * fhcd2xx_qtd: qtd_list
*
* Also, hold this lock when talking to HC registers or
* when updating hw_* fields in shared qh/qtd/... structures.
*/

-#define FOTG210_MAX_ROOT_PORTS 1 /* see HCS_N_PORTS */
+#define FHCD2XX_MAX_ROOT_PORTS 1 /* see HCS_N_PORTS */

/*
- * fotg210_rh_state values of FOTG210_RH_RUNNING or above mean that the
+ * fhcd2xx_rh_state values of FHCD2XX_RH_RUNNING or above mean that the
* controller may be doing DMA. Lower values mean there's no DMA.
*/
-enum fotg210_rh_state {
- FOTG210_RH_HALTED,
- FOTG210_RH_SUSPENDED,
- FOTG210_RH_RUNNING,
- FOTG210_RH_STOPPING
+enum fhcd2xx_rh_state {
+ FHCD2XX_RH_HALTED,
+ FHCD2XX_RH_SUSPENDED,
+ FHCD2XX_RH_RUNNING,
+ FHCD2XX_RH_STOPPING
};

/*
@@ -57,26 +57,26 @@ enum fotg210_rh_state {
* Always update event_delays_ns[] and event_handlers[] (defined in
* ehci-timer.c) in parallel with this list.
*/
-enum fotg210_hrtimer_event {
- FOTG210_HRTIMER_POLL_ASS, /* Poll for async schedule off */
- FOTG210_HRTIMER_POLL_PSS, /* Poll for periodic schedule off */
- FOTG210_HRTIMER_POLL_DEAD, /* Wait for dead controller to stop */
- FOTG210_HRTIMER_UNLINK_INTR, /* Wait for interrupt QH unlink */
- FOTG210_HRTIMER_FREE_ITDS, /* Wait for unused iTDs and siTDs */
- FOTG210_HRTIMER_ASYNC_UNLINKS, /* Unlink empty async QHs */
- FOTG210_HRTIMER_IAA_WATCHDOG, /* Handle lost IAA interrupts */
- FOTG210_HRTIMER_DISABLE_PERIODIC, /* Wait to disable periodic sched */
- FOTG210_HRTIMER_DISABLE_ASYNC, /* Wait to disable async sched */
- FOTG210_HRTIMER_IO_WATCHDOG, /* Check for missing IRQs */
- FOTG210_HRTIMER_NUM_EVENTS /* Must come last */
+enum fhcd2xx_hrtimer_event {
+ FHCD2XX_HRTIMER_POLL_ASS, /* Poll for async schedule off */
+ FHCD2XX_HRTIMER_POLL_PSS, /* Poll for periodic schedule off */
+ FHCD2XX_HRTIMER_POLL_DEAD, /* Wait for dead controller to stop */
+ FHCD2XX_HRTIMER_UNLINK_INTR, /* Wait for interrupt QH unlink */
+ FHCD2XX_HRTIMER_FREE_ITDS, /* Wait for unused iTDs and siTDs */
+ FHCD2XX_HRTIMER_ASYNC_UNLINKS, /* Unlink empty async QHs */
+ FHCD2XX_HRTIMER_IAA_WATCHDOG, /* Handle lost IAA interrupts */
+ FHCD2XX_HRTIMER_DISABLE_PERIODIC, /* Wait to disable periodic sched */
+ FHCD2XX_HRTIMER_DISABLE_ASYNC, /* Wait to disable async sched */
+ FHCD2XX_HRTIMER_IO_WATCHDOG, /* Check for missing IRQs */
+ FHCD2XX_HRTIMER_NUM_EVENTS /* Must come last */
};
-#define FOTG210_HRTIMER_NO_EVENT 99
+#define FHCD2XX_HRTIMER_NO_EVENT 99

-struct fotg210_hcd { /* one per controller */
+struct fhcd2xx_hcd { /* one per controller */
/* timing support */
- enum fotg210_hrtimer_event next_hrtimer_event;
+ enum fhcd2xx_hrtimer_event next_hrtimer_event;
unsigned enabled_hrtimer_events;
- ktime_t hr_timeouts[FOTG210_HRTIMER_NUM_EVENTS];
+ ktime_t hr_timeouts[FHCD2XX_HRTIMER_NUM_EVENTS];
struct hrtimer hrtimer;

int PSS_poll_count;
@@ -84,13 +84,13 @@ struct fotg210_hcd { /* one per controller */
int died_poll_count;

/* glue to PCI and HCD framework */
- struct fotg210_caps __iomem *caps;
- struct fotg210_regs __iomem *regs;
+ struct fhcd2xx_caps __iomem *caps;
+ struct fhcd2xx_regs __iomem *regs;
struct ehci_dbg_port __iomem *debug;

__u32 hcs_params; /* cached register copy */
spinlock_t lock;
- enum fotg210_rh_state rh_state;
+ enum fhcd2xx_rh_state rh_state;

/* general schedule support */
bool scanning:1;
@@ -98,14 +98,14 @@ struct fotg210_hcd { /* one per controller */
bool intr_unlinking:1;
bool async_unlinking:1;
bool shutdown:1;
- struct fotg210_qh *qh_scan_next;
+ struct fhcd2xx_qh *qh_scan_next;

/* async schedule support */
- struct fotg210_qh *async;
- struct fotg210_qh *dummy; /* For AMD quirk use */
- struct fotg210_qh *async_unlink;
- struct fotg210_qh *async_unlink_last;
- struct fotg210_qh *async_iaa;
+ struct fhcd2xx_qh *async;
+ struct fhcd2xx_qh *dummy; /* For AMD quirk use */
+ struct fhcd2xx_qh *async_unlink;
+ struct fhcd2xx_qh *async_unlink_last;
+ struct fhcd2xx_qh *async_iaa;
unsigned async_unlink_cycle;
unsigned async_count; /* async activity count */

@@ -117,9 +117,9 @@ struct fotg210_hcd { /* one per controller */
struct list_head intr_qh_list;
unsigned i_thresh; /* uframes HC might cache */

- union fotg210_shadow *pshadow; /* mirror hw periodic table */
- struct fotg210_qh *intr_unlink;
- struct fotg210_qh *intr_unlink_last;
+ union fhcd2xx_shadow *pshadow; /* mirror hw periodic table */
+ struct fhcd2xx_qh *intr_unlink;
+ struct fhcd2xx_qh *intr_unlink_last;
unsigned intr_unlink_cycle;
unsigned now_frame; /* frame from HC hardware */
unsigned next_frame; /* scan periodic, start here */
@@ -132,10 +132,10 @@ struct fotg210_hcd { /* one per controller */

/* list of itds completed while now_frame was still active */
struct list_head cached_itd_list;
- struct fotg210_itd *last_itd_to_free;
+ struct fhcd2xx_itd *last_itd_to_free;

/* per root hub port */
- unsigned long reset_done[FOTG210_MAX_ROOT_PORTS];
+ unsigned long reset_done[FHCD2XX_MAX_ROOT_PORTS];

/* bit vectors (one bit per port)
* which ports were already suspended at the start of a bus suspend
@@ -174,8 +174,8 @@ struct fotg210_hcd { /* one per controller */
u8 sbrn; /* packed release number */

/* irq statistics */
-#ifdef FOTG210_STATS
- struct fotg210_stats stats;
+#ifdef FHCD2XX_STATS
+ struct fhcd2xx_stats stats;
# define COUNT(x) ((x)++)
#else
# define COUNT(x)
@@ -185,14 +185,14 @@ struct fotg210_hcd { /* one per controller */
struct dentry *debug_dir;
};

-/* convert between an HCD pointer and the corresponding FOTG210_HCD */
-static inline struct fotg210_hcd *hcd_to_fotg210(struct usb_hcd *hcd)
+/* convert between an HCD pointer and the corresponding FHCD2XX_HCD */
+static inline struct fhcd2xx_hcd *hcd_to_fhcd2xx(struct usb_hcd *hcd)
{
- return (struct fotg210_hcd *)(hcd->hcd_priv);
+ return (struct fhcd2xx_hcd *)(hcd->hcd_priv);
}
-static inline struct usb_hcd *fotg210_to_hcd(struct fotg210_hcd *fotg210)
+static inline struct usb_hcd *fhcd2xx_to_hcd(struct fhcd2xx_hcd *fhcd2xx)
{
- return container_of((void *) fotg210, struct usb_hcd, hcd_priv);
+ return container_of((void *) fhcd2xx, struct usb_hcd, hcd_priv);
}

/*-------------------------------------------------------------------------*/
@@ -200,7 +200,7 @@ static inline struct usb_hcd *fotg210_to_hcd(struct fotg210_hcd *fotg210)
/* EHCI register interface, corresponds to EHCI Revision 0.95 specification */

/* Section 2.2 Host Controller Capability Registers */
-struct fotg210_caps {
+struct fhcd2xx_caps {
/* these fields are specified as 8 and 16 bit registers,
* but some hosts can't perform 8 or 16 bit PCI accesses.
* some hosts treat caplength and hciversion as parts of a 32-bit
@@ -208,10 +208,10 @@ struct fotg210_caps {
* affects the memory map for big endian controllers.
*/
u32 hc_capbase;
-#define HC_LENGTH(fotg210, p) (0x00ff&((p) >> /* bits 7:0 / offset 00h */ \
- (fotg210_big_endian_capbase(fotg210) ? 24 : 0)))
-#define HC_VERSION(fotg210, p) (0xffff&((p) >> /* bits 31:16 / offset 02h */ \
- (fotg210_big_endian_capbase(fotg210) ? 0 : 16)))
+#define HC_LENGTH(fhcd2xx, p) (0x00ff&((p) >> /* bits 7:0 / offset 00h */ \
+ (fhcd2xx_big_endian_capbase(fhcd2xx) ? 24 : 0)))
+#define HC_VERSION(fhcd2xx, p) (0xffff&((p) >> /* bits 31:16 / offset 02h */ \
+ (fhcd2xx_big_endian_capbase(fhcd2xx) ? 0 : 16)))
u32 hcs_params; /* HCSPARAMS - offset 0x4 */
#define HCS_N_PORTS(p) (((p)>>0)&0xf) /* bits 3:0, ports on HC */

@@ -223,7 +223,7 @@ struct fotg210_caps {

/* Section 2.3 Host Controller Operational Registers */
-struct fotg210_regs {
+struct fhcd2xx_regs {

/* USBCMD: offset 0x00 */
u32 command;
@@ -303,7 +303,7 @@ struct fotg210_regs {

/*-------------------------------------------------------------------------*/

-#define QTD_NEXT(fotg210, dma) cpu_to_hc32(fotg210, (u32)dma)
+#define QTD_NEXT(fhcd2xx, dma) cpu_to_hc32(fhcd2xx, (u32)dma)

/*
* EHCI Specification 0.95 Section 3.5
@@ -313,7 +313,7 @@ struct fotg210_regs {
* These are associated only with "QH" (Queue Head) structures,
* used with control, bulk, and interrupt transfers.
*/
-struct fotg210_qtd {
+struct fhcd2xx_qtd {
/* first part defined by EHCI spec */
__hc32 hw_next; /* see EHCI 3.5.1 */
__hc32 hw_alt_next; /* see EHCI 3.5.2 */
@@ -332,9 +332,9 @@ struct fotg210_qtd {
#define QTD_STS_STS (1 << 1) /* split transaction state */
#define QTD_STS_PING (1 << 0) /* issue PING? */

-#define ACTIVE_BIT(fotg210) cpu_to_hc32(fotg210, QTD_STS_ACTIVE)
-#define HALT_BIT(fotg210) cpu_to_hc32(fotg210, QTD_STS_HALT)
-#define STATUS_BIT(fotg210) cpu_to_hc32(fotg210, QTD_STS_STS)
+#define ACTIVE_BIT(fhcd2xx) cpu_to_hc32(fhcd2xx, QTD_STS_ACTIVE)
+#define HALT_BIT(fhcd2xx) cpu_to_hc32(fhcd2xx, QTD_STS_HALT)
+#define STATUS_BIT(fhcd2xx) cpu_to_hc32(fhcd2xx, QTD_STS_STS)

__hc32 hw_buf[5]; /* see EHCI 3.5.4 */
__hc32 hw_buf_hi[5]; /* Appendix B */
@@ -347,14 +347,14 @@ struct fotg210_qtd {
} __aligned(32);

/* mask NakCnt+T in qh->hw_alt_next */
-#define QTD_MASK(fotg210) cpu_to_hc32(fotg210, ~0x1f)
+#define QTD_MASK(fhcd2xx) cpu_to_hc32(fhcd2xx, ~0x1f)

#define IS_SHORT_READ(token) (QTD_LENGTH(token) != 0 && QTD_PID(token) == 1)

/*-------------------------------------------------------------------------*/

/* type tag from {qh,itd,fstn}->hw_next */
-#define Q_NEXT_TYPE(fotg210, dma) ((dma) & cpu_to_hc32(fotg210, 3 << 1))
+#define Q_NEXT_TYPE(fhcd2xx, dma) ((dma) & cpu_to_hc32(fhcd2xx, 3 << 1))

/*
* Now the following defines are not converted using the
@@ -370,12 +370,12 @@ struct fotg210_qtd {
#define Q_TYPE_FSTN (3 << 1)

/* next async queue entry, or pointer to interrupt/periodic QH */
-#define QH_NEXT(fotg210, dma) \
- (cpu_to_hc32(fotg210, (((u32)dma)&~0x01f)|Q_TYPE_QH))
+#define QH_NEXT(fhcd2xx, dma) \
+ (cpu_to_hc32(fhcd2xx, (((u32)dma)&~0x01f)|Q_TYPE_QH))

/* for periodic/async schedules and qtd lists, mark end of list */
-#define FOTG210_LIST_END(fotg210) \
- cpu_to_hc32(fotg210, 1) /* "null pointer" to hw */
+#define FHCD2XX_LIST_END(fhcd2xx) \
+ cpu_to_hc32(fhcd2xx, 1) /* "null pointer" to hw */

/*
* Entries in periodic shadow table are pointers to one of four kinds
@@ -385,10 +385,10 @@ struct fotg210_qtd {
*
* For entries in the async schedule, the type tag always says "qh".
*/
-union fotg210_shadow {
- struct fotg210_qh *qh; /* Q_TYPE_QH */
- struct fotg210_itd *itd; /* Q_TYPE_ITD */
- struct fotg210_fstn *fstn; /* Q_TYPE_FSTN */
+union fhcd2xx_shadow {
+ struct fhcd2xx_qh *qh; /* Q_TYPE_QH */
+ struct fhcd2xx_itd *itd; /* Q_TYPE_ITD */
+ struct fhcd2xx_fstn *fstn; /* Q_TYPE_FSTN */
__hc32 *hw_next; /* (all types) */
void *ptr;
};
@@ -404,7 +404,7 @@ union fotg210_shadow {
*/

/* first part defined by EHCI spec */
-struct fotg210_qh_hw {
+struct fhcd2xx_qh_hw {
__hc32 hw_next; /* see EHCI 3.6.1 */
__hc32 hw_info1; /* see EHCI 3.6.2 */
#define QH_CONTROL_EP (1 << 27) /* FS/LS control endpoint */
@@ -422,7 +422,7 @@ struct fotg210_qh_hw {
#define QH_MULT 0xc0000000
__hc32 hw_current; /* qtd list - see EHCI 3.6.4 */

- /* qtd overlay (hardware parts of a struct fotg210_qtd) */
+ /* qtd overlay (hardware parts of a struct fhcd2xx_qtd) */
__hc32 hw_qtd_next;
__hc32 hw_alt_next;
__hc32 hw_token;
@@ -430,15 +430,15 @@ struct fotg210_qh_hw {
__hc32 hw_buf_hi[5];
} __aligned(32);

-struct fotg210_qh {
- struct fotg210_qh_hw *hw; /* Must come first */
+struct fhcd2xx_qh {
+ struct fhcd2xx_qh_hw *hw; /* Must come first */
/* the rest is HCD-private */
dma_addr_t qh_dma; /* address of qh */
- union fotg210_shadow qh_next; /* ptr to qh; or periodic */
+ union fhcd2xx_shadow qh_next; /* ptr to qh; or periodic */
struct list_head qtd_list; /* sw qtd list */
struct list_head intr_node; /* list of intr QHs */
- struct fotg210_qtd *dummy;
- struct fotg210_qh *unlink_next; /* next on unlink list */
+ struct fhcd2xx_qtd *dummy;
+ struct fhcd2xx_qh *unlink_next; /* next on unlink list */

unsigned unlink_cycle;

@@ -470,7 +470,7 @@ struct fotg210_qh {
/*-------------------------------------------------------------------------*/

/* description of one iso transaction (up to 3 KB data if highspeed) */
-struct fotg210_iso_packet {
+struct fhcd2xx_iso_packet {
/* These will be copied to iTD when scheduling */
u64 bufp; /* itd->hw_bufp{,_hi}[pg] |= */
__hc32 transaction; /* itd->hw_transaction[i] |= */
@@ -483,19 +483,19 @@ struct fotg210_iso_packet {
* each packet is one logical usb transaction to the device (not TT),
* beginning at stream->next_uframe
*/
-struct fotg210_iso_sched {
+struct fhcd2xx_iso_sched {
struct list_head td_list;
unsigned span;
- struct fotg210_iso_packet packet[0];
+ struct fhcd2xx_iso_packet packet[0];
};

/*
- * fotg210_iso_stream - groups all (s)itds for this endpoint.
+ * fhcd2xx_iso_stream - groups all (s)itds for this endpoint.
* acts like a qh would, if EHCI had them for ISO.
*/
-struct fotg210_iso_stream {
- /* first field matches fotg210_hq, but is NULL */
- struct fotg210_qh_hw *hw;
+struct fhcd2xx_iso_stream {
+ /* first field matches fhcd2xx_hq, but is NULL */
+ struct fhcd2xx_qh_hw *hw;

u8 bEndpointAddress;
u8 highspeed;
@@ -536,28 +536,28 @@ struct fotg210_iso_stream {
*
* Schedule records for high speed iso xfers
*/
-struct fotg210_itd {
+struct fhcd2xx_itd {
/* first part defined by EHCI spec */
__hc32 hw_next; /* see EHCI 3.3.1 */
__hc32 hw_transaction[8]; /* see EHCI 3.3.2 */
-#define FOTG210_ISOC_ACTIVE (1<<31) /* activate transfer this slot */
-#define FOTG210_ISOC_BUF_ERR (1<<30) /* Data buffer error */
-#define FOTG210_ISOC_BABBLE (1<<29) /* babble detected */
-#define FOTG210_ISOC_XACTERR (1<<28) /* XactErr - transaction error */
-#define FOTG210_ITD_LENGTH(tok) (((tok)>>16) & 0x0fff)
-#define FOTG210_ITD_IOC (1 << 15) /* interrupt on complete */
+#define FHCD2XX_ISOC_ACTIVE (1<<31) /* activate transfer this slot */
+#define FHCD2XX_ISOC_BUF_ERR (1<<30) /* Data buffer error */
+#define FHCD2XX_ISOC_BABBLE (1<<29) /* babble detected */
+#define FHCD2XX_ISOC_XACTERR (1<<28) /* XactErr - transaction error */
+#define FHCD2XX_ITD_LENGTH(tok) (((tok)>>16) & 0x0fff)
+#define FHCD2XX_ITD_IOC (1 << 15) /* interrupt on complete */

-#define ITD_ACTIVE(fotg210) cpu_to_hc32(fotg210, FOTG210_ISOC_ACTIVE)
+#define ITD_ACTIVE(fhcd2xx) cpu_to_hc32(fhcd2xx, FHCD2XX_ISOC_ACTIVE)

__hc32 hw_bufp[7]; /* see EHCI 3.3.3 */
__hc32 hw_bufp_hi[7]; /* Appendix B */

/* the rest is HCD-private */
dma_addr_t itd_dma; /* for this itd */
- union fotg210_shadow itd_next; /* ptr to periodic q entry */
+ union fhcd2xx_shadow itd_next; /* ptr to periodic q entry */

struct urb *urb;
- struct fotg210_iso_stream *stream; /* endpoint's queue */
+ struct fhcd2xx_iso_stream *stream; /* endpoint's queue */
struct list_head itd_list; /* list of stream's itds */

/* any/all hw_transactions here may be used by that urb */
@@ -577,24 +577,24 @@ struct fotg210_itd {
* makes the HC jump (back) to a QH to scan for fs/ls QH completions until
* it hits a "restore" FSTN; then it returns to finish other uframe 0/1 work.
*/
-struct fotg210_fstn {
+struct fhcd2xx_fstn {
__hc32 hw_next; /* any periodic q entry */
- __hc32 hw_prev; /* qh or FOTG210_LIST_END */
+ __hc32 hw_prev; /* qh or FHCD2XX_LIST_END */

/* the rest is HCD-private */
dma_addr_t fstn_dma;
- union fotg210_shadow fstn_next; /* ptr to periodic q entry */
+ union fhcd2xx_shadow fstn_next; /* ptr to periodic q entry */
} __aligned(32);

/*-------------------------------------------------------------------------*/

/* Prepare the PORTSC wakeup flags during controller suspend/resume */

-#define fotg210_prepare_ports_for_controller_suspend(fotg210, do_wakeup) \
- fotg210_adjust_port_wakeup_flags(fotg210, true, do_wakeup)
+#define fhcd2xx_prepare_ports_for_controller_suspend(fhcd2xx, do_wakeup) \
+ fhcd2xx_adjust_port_wakeup_flags(fhcd2xx, true, do_wakeup)

-#define fotg210_prepare_ports_for_controller_resume(fotg210) \
- fotg210_adjust_port_wakeup_flags(fotg210, false, false)
+#define fhcd2xx_prepare_ports_for_controller_resume(fhcd2xx) \
+ fhcd2xx_adjust_port_wakeup_flags(fhcd2xx, false, false)

/*-------------------------------------------------------------------------*/

@@ -606,17 +606,17 @@ struct fotg210_fstn {
*/

static inline unsigned int
-fotg210_get_speed(struct fotg210_hcd *fotg210, unsigned int portsc)
+fhcd2xx_get_speed(struct fhcd2xx_hcd *fhcd2xx, unsigned int portsc)
{
- return (readl(&fotg210->regs->otgcsr)
+ return (readl(&fhcd2xx->regs->otgcsr)
& OTGCSR_HOST_SPD_TYP) >> 22;
}

/* Returns the speed of a device attached to a port on the root hub. */
static inline unsigned int
-fotg210_port_speed(struct fotg210_hcd *fotg210, unsigned int portsc)
+fhcd2xx_port_speed(struct fhcd2xx_hcd *fhcd2xx, unsigned int portsc)
{
- switch (fotg210_get_speed(fotg210, portsc)) {
+ switch (fhcd2xx_get_speed(fhcd2xx, portsc)) {
case 0:
return 0;
case 1:
@@ -629,7 +629,7 @@ fotg210_port_speed(struct fotg210_hcd *fotg210, unsigned int portsc)

/*-------------------------------------------------------------------------*/

-#define fotg210_has_fsl_portno_bug(e) (0)
+#define fhcd2xx_has_fsl_portno_bug(e) (0)

/*
* While most USB host controllers implement their registers in
@@ -642,34 +642,34 @@ fotg210_port_speed(struct fotg210_hcd *fotg210, unsigned int portsc)
*
*/

-#define fotg210_big_endian_mmio(e) 0
-#define fotg210_big_endian_capbase(e) 0
+#define fhcd2xx_big_endian_mmio(e) 0
+#define fhcd2xx_big_endian_capbase(e) 0

-static inline unsigned int fotg210_readl(const struct fotg210_hcd *fotg210,
+static inline unsigned int fhcd2xx_readl(const struct fhcd2xx_hcd *fhcd2xx,
__u32 __iomem *regs)
{
return readl(regs);
}

-static inline void fotg210_writel(const struct fotg210_hcd *fotg210,
+static inline void fhcd2xx_writel(const struct fhcd2xx_hcd *fhcd2xx,
const unsigned int val, __u32 __iomem *regs)
{
writel(val, regs);
}

-/* cpu to fotg210 */
-static inline __hc32 cpu_to_hc32(const struct fotg210_hcd *fotg210, const u32 x)
+/* cpu to fhcd2xx */
+static inline __hc32 cpu_to_hc32(const struct fhcd2xx_hcd *fhcd2xx, const u32 x)
{
return cpu_to_le32(x);
}

-/* fotg210 to cpu */
-static inline u32 hc32_to_cpu(const struct fotg210_hcd *fotg210, const __hc32 x)
+/* fhcd2xx to cpu */
+static inline u32 hc32_to_cpu(const struct fhcd2xx_hcd *fhcd2xx, const __hc32 x)
{
return le32_to_cpu(x);
}

-static inline u32 hc32_to_cpup(const struct fotg210_hcd *fotg210,
+static inline u32 hc32_to_cpup(const struct fhcd2xx_hcd *fhcd2xx,
const __hc32 *x)
{
return le32_to_cpup(x);
@@ -677,16 +677,16 @@ static inline u32 hc32_to_cpup(const struct fotg210_hcd *fotg210,

/*-------------------------------------------------------------------------*/

-static inline unsigned fotg210_read_frame_index(struct fotg210_hcd *fotg210)
+static inline unsigned fhcd2xx_read_frame_index(struct fhcd2xx_hcd *fhcd2xx)
{
- return fotg210_readl(fotg210, &fotg210->regs->frame_index);
+ return fhcd2xx_readl(fhcd2xx, &fhcd2xx->regs->frame_index);
}

-#define fotg210_itdlen(urb, desc, t) ({ \
+#define fhcd2xx_itdlen(urb, desc, t) ({ \
usb_pipein((urb)->pipe) ? \
- (desc)->length - FOTG210_ITD_LENGTH(t) : \
- FOTG210_ITD_LENGTH(t); \
+ (desc)->length - FHCD2XX_ITD_LENGTH(t) : \
+ FHCD2XX_ITD_LENGTH(t); \
})
/*-------------------------------------------------------------------------*/

-#endif /* __LINUX_FOTG210_H */
+#endif /* __LINUX_FHCD2XX_H */
--
2.1.0

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

Next message: Peter Senna Tschudin: "[PATCH 05/14] RFC: usb/host/fotg210: change kmalloc by kmalloc_array"
Previous message: Peter Senna Tschudin: "[PATCH 06/14] RFC: usb/host/fotg210: replace msleep by usleep_range"
In reply to: Peter Senna Tschudin: "[PATCH 06/14] RFC: usb/host/fotg210: replace msleep by usleep_range"
Next in thread: Peter Senna Tschudin: "[PATCH 05/14] RFC: usb/host/fotg210: change kmalloc by kmalloc_array"
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]