Signed-off-by: Rahul Bedarkar <[email protected]>
---
drivers/usb/c67x00/c67x00-drv.c | 3 ++-
drivers/usb/c67x00/c67x00-hcd.h | 2 +-
drivers/usb/c67x00/c67x00-ll-hpi.c | 21 +++++++++---------
drivers/usb/c67x00/c67x00-sched.c | 44 ++++++++++++++++++++------------------
drivers/usb/c67x00/c67x00.h | 4 ++--
5 files changed, 39 insertions(+), 35 deletions(-)
diff --git a/drivers/usb/c67x00/c67x00-drv.c b/drivers/usb/c67x00/c67x00-drv.c
index 8db3380..34c6cbb 100644
--- a/drivers/usb/c67x00/c67x00-drv.c
+++ b/drivers/usb/c67x00/c67x00-drv.c
@@ -28,7 +28,8 @@
* interrupt handling).
*
* The c67x00 has 2 SIE's (serial interface engine) which can be configured
- * to be host, device or OTG (with some limitations, E.G. only SIE1 can be
OTG).
+ * to be host, device or OTG (with some limitations, E.G. only SIE1 can be
+ * OTG).
*
* Depending on the platform configuration, the SIE's are created and
* the corresponding subdriver is initialized (c67x00_probe_sie).
diff --git a/drivers/usb/c67x00/c67x00-hcd.h b/drivers/usb/c67x00/c67x00-hcd.h
index cf8a455..d441a98 100644
--- a/drivers/usb/c67x00/c67x00-hcd.h
+++ b/drivers/usb/c67x00/c67x00-hcd.h
@@ -64,7 +64,7 @@
*/
#define MAX_PERIODIC_BW(full_bw) full_bw
-/* --------------------------------------------------------------------------
*/
+/* ------------------------------------------------------------------------- */
struct c67x00_hcd {
spinlock_t lock;
diff --git a/drivers/usb/c67x00/c67x00-ll-hpi.c
b/drivers/usb/c67x00/c67x00-ll-hpi.c
index 18ae45d..ada34dc 100644
--- a/drivers/usb/c67x00/c67x00-ll-hpi.c
+++ b/drivers/usb/c67x00/c67x00-ll-hpi.c
@@ -33,7 +33,7 @@ struct c67x00_lcp_int_data {
u16 regs[COMM_REGS];
};
-/* --------------------------------------------------------------------------
*/
+/* ------------------------------------------------------------------------- */
/* Interface definitions */
#define COMM_ACK 0x0FED
@@ -101,7 +101,8 @@ static u16 hpi_read_word(struct c67x00_device *dev, u16 reg)
return value;
}
-static void hpi_write_word_nolock(struct c67x00_device *dev, u16 reg, u16
value)
+static void
+hpi_write_word_nolock(struct c67x00_device *dev, u16 reg, u16 value)
{
hpi_write_reg(dev, HPI_ADDR, reg);
hpi_write_reg(dev, HPI_DATA, value);
@@ -234,7 +235,7 @@ void c67x00_ll_hpi_disable_sofeop(struct c67x00_sie *sie)
SOFEOP_TO_HPI_EN(sie->sie_num));
}
-/* --------------------------------------------------------------------------
*/
+/* ------------------------------------------------------------------------- */
/* Transactions */
static inline int ll_recv_msg(struct c67x00_device *dev)
@@ -247,7 +248,7 @@ static inline int ll_recv_msg(struct c67x00_device *dev)
return (res == 0) ? -EIO : 0;
}
-/* --------------------------------------------------------------------------
*/
+/* ------------------------------------------------------------------------- */
/* General functions */
u16 c67x00_ll_fetch_siemsg(struct c67x00_device *dev, int sie_num)
@@ -279,7 +280,7 @@ u16 c67x00_ll_usb_get_status(struct c67x00_sie *sie)
return hpi_read_word(sie->dev, USB_STAT_REG(sie->sie_num));
}
-/* --------------------------------------------------------------------------
*/
+/* ------------------------------------------------------------------------- */
static int c67x00_comm_exec_int(struct c67x00_device *dev, u16 nr,
struct c67x00_lcp_int_data *data)
@@ -297,7 +298,7 @@ static int c67x00_comm_exec_int(struct c67x00_device *dev,
u16 nr,
return rc;
}
-/* --------------------------------------------------------------------------
*/
+/* ------------------------------------------------------------------------- */
/* Host specific functions */
void c67x00_ll_set_husb_eot(struct c67x00_device *dev, u16 value)
@@ -372,7 +373,7 @@ void c67x00_ll_husb_reset_port(struct c67x00_sie *sie, int
port)
hpi_set_bits(sie->dev, USB_CTL_REG(sie->sie_num), PORT_RES_EN(port));
}
-/* --------------------------------------------------------------------------
*/
+/* ------------------------------------------------------------------------- */
void c67x00_ll_irq(struct c67x00_device *dev, u16 int_status)
{
@@ -383,7 +384,7 @@ void c67x00_ll_irq(struct c67x00_device *dev, u16
int_status)
complete(&dev->hpi.lcp.msg_received);
}
-/* --------------------------------------------------------------------------
*/
+/* ------------------------------------------------------------------------- */
int c67x00_ll_reset(struct c67x00_device *dev)
{
@@ -397,7 +398,7 @@ int c67x00_ll_reset(struct c67x00_device *dev)
return rc;
}
-/* --------------------------------------------------------------------------
*/
+/* ------------------------------------------------------------------------- */
/**
* c67x00_ll_write_mem_le16 - write into c67x00 memory
@@ -468,7 +469,7 @@ void c67x00_ll_read_mem_le16(struct c67x00_device *dev, u16
addr,
}
}
-/* --------------------------------------------------------------------------
*/
+/* ------------------------------------------------------------------------- */
void c67x00_ll_init(struct c67x00_device *dev)
{
diff --git a/drivers/usb/c67x00/c67x00-sched.c
b/drivers/usb/c67x00/c67x00-sched.c
index 892cc96..469f045 100644
--- a/drivers/usb/c67x00/c67x00-sched.c
+++ b/drivers/usb/c67x00/c67x00-sched.c
@@ -35,7 +35,7 @@
#define DATA_STAGE 1
#define STATUS_STAGE 2
-/* --------------------------------------------------------------------------
*/
+/* ------------------------------------------------------------------------- */
/**
* struct c67x00_ep_data: Host endpoint data structure
@@ -142,7 +142,7 @@ struct c67x00_urb_priv {
(td->status & TD_STATUSMASK_ACK))
#define td_actual_bytes(td) (td_length(td) - td_residue(td))
-/* --------------------------------------------------------------------------
*/
+/* ------------------------------------------------------------------------- */
#ifdef DEBUG
@@ -177,7 +177,7 @@ dbg_td(struct c67x00_hcd *c67x00, struct c67x00_td *td,
char *msg) { }
#endif /* DEBUG */
-/* --------------------------------------------------------------------------
*/
+/* ------------------------------------------------------------------------- */
/* Helper functions */
static inline u16 c67x00_get_current_frame_number(struct c67x00_hcd *c67x00)
@@ -212,7 +212,7 @@ static inline int frame_after_eq(u16 a, u16 b)
(HOST_FRAME_MASK / 2);
}
-/* --------------------------------------------------------------------------
*/
+/* ------------------------------------------------------------------------- */
/**
* c67x00_release_urb - remove link from all tds to this urb
@@ -249,7 +249,7 @@ static void c67x00_release_urb(struct c67x00_hcd *c67x00,
struct urb *urb)
kfree(urbp);
}
-/* --------------------------------------------------------------------------
*/
+/* ------------------------------------------------------------------------- */
static struct c67x00_ep_data *
c67x00_ep_data_alloc(struct c67x00_hcd *c67x00, struct urb *urb)
@@ -332,7 +332,8 @@ void c67x00_endpoint_disable(struct usb_hcd *hcd, struct
usb_host_endpoint *ep)
unsigned long flags;
if (!list_empty(&ep->urb_list))
- dev_warn(c67x00_hcd_dev(c67x00), "error: urb list not empty\n");
+ dev_warn(c67x00_hcd_dev(c67x00),
+ "error: urb list not empty\n");
spin_lock_irqsave(&c67x00->lock, flags);
@@ -354,7 +355,7 @@ void c67x00_endpoint_disable(struct usb_hcd *hcd, struct
usb_host_endpoint *ep)
spin_unlock_irqrestore(&c67x00->lock, flags);
}
-/* --------------------------------------------------------------------------
*/
+/* ------------------------------------------------------------------------- */
static inline int get_root_port(struct usb_device *dev)
{
@@ -489,7 +490,7 @@ int c67x00_urb_dequeue(struct usb_hcd *hcd, struct urb
*urb, int status)
return rc;
}
-/* --------------------------------------------------------------------------
*/
+/* ------------------------------------------------------------------------- */
/*
* pre: c67x00 locked, urb unlocked
@@ -514,7 +515,7 @@ c67x00_giveback_urb(struct c67x00_hcd *c67x00, struct urb
*urb, int status)
spin_lock(&c67x00->lock);
}
-/* --------------------------------------------------------------------------
*/
+/* ------------------------------------------------------------------------- */
static int c67x00_claim_frame_bw(struct c67x00_hcd *c67x00, struct urb *urb,
int len, int periodic)
@@ -579,7 +580,7 @@ static int c67x00_claim_frame_bw(struct c67x00_hcd *c67x00,
struct urb *urb,
return 0;
}
-/* --------------------------------------------------------------------------
*/
+/* ------------------------------------------------------------------------- */
/**
* td_addr and buf_addr must be word aligned
@@ -664,7 +665,7 @@ static inline void c67x00_release_td(struct c67x00_td *td)
kfree(td);
}
-/* --------------------------------------------------------------------------
*/
+/* ------------------------------------------------------------------------- */
static int c67x00_add_data_urb(struct c67x00_hcd *c67x00, struct urb *urb)
{
@@ -794,10 +795,11 @@ static int c67x00_add_iso_urb(struct c67x00_hcd *c67x00,
struct urb *urb)
return 0;
}
-/* --------------------------------------------------------------------------
*/
+/* ------------------------------------------------------------------------- */
-static void c67x00_fill_from_list(struct c67x00_hcd *c67x00, int type,
- int (*add)(struct c67x00_hcd *, struct urb *))
+static void
+c67x00_fill_from_list(struct c67x00_hcd *c67x00, int type,
+ int (*add)(struct c67x00_hcd *, struct urb *))
{
struct c67x00_ep_data *ep_data;
struct urb *urb;
@@ -843,7 +845,7 @@ static void c67x00_fill_frame(struct c67x00_hcd *c67x00)
c67x00_fill_from_list(c67x00, PIPE_BULK, c67x00_add_data_urb);
}
-/* --------------------------------------------------------------------------
*/
+/* ------------------------------------------------------------------------- */
/**
* Get TD from C67X00
@@ -903,7 +905,7 @@ static inline int c67x00_end_of_data(struct c67x00_td *td)
return 0;
}
-/* --------------------------------------------------------------------------
*/
+/* ------------------------------------------------------------------------- */
/* Remove all td's from the list which come
* after last_td and are meant for the same pipe.
@@ -924,7 +926,7 @@ static inline void c67x00_clear_pipe(struct c67x00_hcd
*c67x00,
}
}
-/* --------------------------------------------------------------------------
*/
+/* ------------------------------------------------------------------------- */
static void c67x00_handle_successful_td(struct c67x00_hcd *c67x00,
struct c67x00_td *td)
@@ -993,7 +995,7 @@ static void c67x00_handle_isoc(struct c67x00_hcd *c67x00,
struct c67x00_td *td)
c67x00_giveback_urb(c67x00, urb, 0);
}
-/* --------------------------------------------------------------------------
*/
+/* ------------------------------------------------------------------------- */
/**
* c67x00_check_td_list - handle tds which have been processed by the c67x00
@@ -1060,7 +1062,7 @@ cont:
}
}
-/* --------------------------------------------------------------------------
*/
+/* ------------------------------------------------------------------------- */
static inline int c67x00_all_tds_processed(struct c67x00_hcd *c67x00)
{
@@ -1104,7 +1106,7 @@ static void c67x00_send_frame(struct c67x00_hcd *c67x00)
c67x00_ll_husb_set_current_td(c67x00->sie, c67x00->td_base_addr);
}
-/* --------------------------------------------------------------------------
*/
+/* ------------------------------------------------------------------------- */
/**
* c67x00_do_work - Schedulers state machine
@@ -1145,7 +1147,7 @@ static void c67x00_do_work(struct c67x00_hcd *c67x00)
spin_unlock(&c67x00->lock);
}
-/* --------------------------------------------------------------------------
*/
+/* ------------------------------------------------------------------------- */
static void c67x00_sched_tasklet(unsigned long __c67x00)
{
diff --git a/drivers/usb/c67x00/c67x00.h b/drivers/usb/c67x00/c67x00.h
index a26e9de..465a8ee 100644
--- a/drivers/usb/c67x00/c67x00.h
+++ b/drivers/usb/c67x00/c67x00.h
@@ -102,7 +102,7 @@
/* Device n Interrupt Enable Register */
#define DEVICE_N_IRQ_EN_REG(x) ((x) ? 0xC0AC : 0xC08C)
-#define DEVICE_N_ENDPOINT_N_CTL_REG(dev, ep) ((dev) \
+#define DEVICE_N_ENDPOINT_N_CTL_REG(dev, ep) ((dev) \
? (0x0280 + (ep << 4)) \
: (0x0200 + (ep << 4)))
#define DEVICE_N_ENDPOINT_N_STAT_REG(dev, ep) ((dev) \
@@ -154,7 +154,7 @@
#define SUSB_SOF_MSG 0x0200
#define SUSB_CFG_MSG 0x0400
#define SUSB_SUS_MSG 0x0800
-#define SUSB_ID_MSG 0x4000
+#define SUSB_ID_MSG 0x4000
#define SUSB_VBUS_MSG 0x8000
/* BIOS interrupt routines */
--
1.8.1.2
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
