Deleted unwanted extra blank and border lines.
Signed-off-by: Ajay Kumar Gupta <ajay.gupta@xxxxxx>
---
drivers/usb/musb/musb_core.c | 35 -----------------------------------
drivers/usb/musb/musb_core.h | 7 -------
drivers/usb/musb/musb_dma.h | 1 -
drivers/usb/musb/musb_gadget.c | 24 +-----------------------
drivers/usb/musb/musb_gadget.h | 1 -
drivers/usb/musb/musb_gadget_ep0.c | 1 -
drivers/usb/musb/musb_host.c | 8 --------
drivers/usb/musb/musb_host.h | 1 -
drivers/usb/musb/musb_regs.h | 1 -
drivers/usb/musb/musb_virthub.c | 5 -----
10 files changed, 1 insertions(+), 83 deletions(-)
diff --git a/drivers/usb/musb/musb_core.c b/drivers/usb/musb/musb_core.c
index c666ddf..4093f6d 100644
--- a/drivers/usb/musb/musb_core.c
+++ b/drivers/usb/musb/musb_core.c
@@ -107,14 +107,12 @@
#include "musb_core.h"
-
#ifdef CONFIG_ARCH_DAVINCI
#include "davinci.h"
#endif
#define TA_WAIT_BCON(m) max_t(int, (m)->a_wait_bcon, OTG_TIME_A_WAIT_BCON)
-
unsigned musb_debug;
module_param_named(debug, musb_debug, uint, S_IRUGO | S_IWUSR);
MODULE_PARM_DESC(debug, "Debug message level. Default = 0");
@@ -134,9 +132,6 @@ MODULE_AUTHOR(DRIVER_AUTHOR);
MODULE_LICENSE("GPL");
MODULE_ALIAS("platform:" MUSB_DRIVER_NAME);
-
-/*-------------------------------------------------------------------------*/
-
static inline struct musb *dev_to_musb(struct device *dev)
{
#ifdef CONFIG_USB_MUSB_HDRC_HCD
@@ -147,8 +142,6 @@ static inline struct musb *dev_to_musb(struct device *dev)
#endif
}
-/*-------------------------------------------------------------------------*/
-
#ifndef CONFIG_BLACKFIN
static int musb_ulpi_read(struct otg_transceiver *otg, u32 offset)
{
@@ -228,10 +221,7 @@ static struct otg_io_access_ops musb_ulpi_access = {
.write = musb_ulpi_write,
};
-/*-------------------------------------------------------------------------*/
-
#if !defined(CONFIG_USB_TUSB6010) && !defined(CONFIG_BLACKFIN)
-
/*
* Load an endpoint's FIFO
*/
@@ -312,9 +302,6 @@ void musb_read_fifo(struct musb_hw_ep *hw_ep, u16 len, u8 *dst)
#endif /* normal PIO */
-
-/*-------------------------------------------------------------------------*/
-
/* for high speed test mode; see USB 2.0 spec 7.1.20 */
static const u8 musb_test_packet[53] = {
/* implicit SYNC then DATA0 to start */
@@ -345,8 +332,6 @@ void musb_load_testpacket(struct musb *musb)
musb_writew(regs, MUSB_CSR0, MUSB_CSR0_TXPKTRDY);
}
-/*-------------------------------------------------------------------------*/
-
const char *otg_state_string(struct musb *musb)
{
switch (musb->xceiv->state) {
@@ -368,7 +353,6 @@ const char *otg_state_string(struct musb *musb)
}
#ifdef CONFIG_USB_MUSB_OTG
-
/*
* Handles OTG hnp timeouts, such as b_ase0_brst
*/
@@ -640,7 +624,6 @@ static irqreturn_t musb_stage0_irq(struct musb *musb, u8 int_usb,
handled = IRQ_HANDLED;
}
-
if (int_usb & MUSB_INTR_SUSPEND) {
DBG(1, "SUSPEND (%s) devctl %02x power %02x\n",
otg_state_string(musb), devctl, power);
@@ -935,8 +918,6 @@ b_host:
return handled;
}
-/*-------------------------------------------------------------------------*/
-
/*
* Program the HDRC to start (enable interrupts, dma, etc.).
*/
@@ -989,7 +970,6 @@ void musb_start(struct musb *musb)
musb_writeb(regs, MUSB_DEVCTL, devctl);
}
-
static void musb_generic_disable(struct musb *musb)
{
void __iomem *mbase = musb->mregs;
@@ -1049,9 +1029,6 @@ static void musb_shutdown(struct platform_device *pdev)
/* FIXME power down */
}
-
-/*-------------------------------------------------------------------------*/
-
/*
* The silicon either has hard-wired endpoint configurations, or else
* "dynamic fifo" sizing. The driver has support for both, though at this
@@ -1308,7 +1285,6 @@ static int __init ep_config_from_table(struct musb *musb)
printk(KERN_DEBUG "%s: setup fifo_mode %d\n",
musb_driver_name, fifo_mode);
-
done:
offset = fifo_setup(musb, hw_ep, &ep0_cfg, 0);
/* assert(offset > 0) */
@@ -1350,7 +1326,6 @@ done:
return 0;
}
-
/*
* ep_config_from_hw - when MUSB_C_DYNFIFO_DEF is false
* @param musb the controller
@@ -1533,8 +1508,6 @@ static int __init musb_core_init(u16 musb_type, struct musb *musb)
return 0;
}
-/*-------------------------------------------------------------------------*/
-
#if defined(CONFIG_ARCH_OMAP2430) || defined(CONFIG_ARCH_OMAP3430) || \
defined(CONFIG_ARCH_OMAP4)
@@ -1652,7 +1625,6 @@ irqreturn_t musb_interrupt(struct musb *musb)
return retval;
}
-
#ifndef CONFIG_MUSB_PIO_ONLY
static int __initdata use_dma = 1;
@@ -1703,10 +1675,7 @@ void musb_dma_completion(struct musb *musb, u8 epnum, u8 transmit)
#define use_dma 0
#endif
-/*-------------------------------------------------------------------------*/
-
#ifdef CONFIG_SYSFS
-
static ssize_t
musb_mode_show(struct device *dev, struct device_attribute *attr, char *buf)
{
@@ -2191,8 +2160,6 @@ fail0:
}
-/*-------------------------------------------------------------------------*/
-
/* all implementations (PCI bridge to FPGA, VLYNQ, etc) should just
* bridge to a platform device; this driver then suffices.
*/
@@ -2479,8 +2446,6 @@ static struct platform_driver musb_driver = {
.shutdown = musb_shutdown,
};
-/*-------------------------------------------------------------------------*/
-
static int __init musb_init(void)
{
#ifdef CONFIG_USB_MUSB_HDRC_HCD
diff --git a/drivers/usb/musb/musb_core.h b/drivers/usb/musb/musb_core.h
index d7b277e..414a545 100644
--- a/drivers/usb/musb/musb_core.h
+++ b/drivers/usb/musb/musb_core.h
@@ -64,16 +64,12 @@ struct musb_ep;
#include "musb_debug.h"
#include "musb_dma.h"
-
#include "musb_io.h"
#include "musb_regs.h"
-
#include "musb_gadget.h"
#include "../core/hcd.h"
#include "musb_host.h"
-
-
#ifdef CONFIG_USB_MUSB_OTG
#define is_peripheral_enabled(musb) ((musb)->board_mode != MUSB_HOST)
@@ -165,7 +161,6 @@ static inline void musb_host_rx(struct musb *m, u8 e) {}
#endif
-
/****************************** CONSTANTS ********************************/
#ifndef MUSB_C_NUM_EPS
@@ -205,7 +200,6 @@ enum musb_g_ep0_state {
#define OTG_TIME_A_AIDL_BDIS 200 /* min 200 msec */
#define OTG_TIME_B_ASE0_BRST 100 /* min 3.125 ms */
-
/*************************** REGISTER ACCESS ********************************/
/* Endpoint registers (other than dynfifo setup) can be accessed either
@@ -574,7 +568,6 @@ static inline void musb_configure_ep0(struct musb *musb)
}
#endif /* CONFIG_BLACKFIN */
-
/***************************** Glue it together *****************************/
extern const char musb_driver_name[];
diff --git a/drivers/usb/musb/musb_dma.h b/drivers/usb/musb/musb_dma.h
index 916065b..0b79e83 100644
--- a/drivers/usb/musb/musb_dma.h
+++ b/drivers/usb/musb/musb_dma.h
@@ -174,7 +174,6 @@ struct dma_controller {
/* called after channel_program(), may indicate a fault */
extern void musb_dma_completion(struct musb *musb, u8 epnum, u8 transmit);
-
extern struct dma_controller *__init
dma_controller_create(struct musb *, void __iomem *);
diff --git a/drivers/usb/musb/musb_gadget.c b/drivers/usb/musb/musb_gadget.c
index 6fca870..54a37e9 100644
--- a/drivers/usb/musb/musb_gadget.c
+++ b/drivers/usb/musb/musb_gadget.c
@@ -47,7 +47,6 @@
#include "musb_core.h"
-
/* MUSB PERIPHERAL status 3-mar-2006:
*
* - EP0 seems solid. It passes both USBCV and usbtest control cases.
@@ -90,8 +89,6 @@
* + TUSB 6010, platform-specific dma in the works
*/
-/* ----------------------------------------------------------------------- */
-
/*
* Immediately complete a request.
*
@@ -151,8 +148,6 @@ __acquires(ep->musb->lock)
ep->busy = busy;
}
-/* ----------------------------------------------------------------------- */
-
/*
* Abort requests queued to an endpoint using the status. Synchronous.
* caller locked controller and blocked irqs, and selected this ep.
@@ -198,8 +193,6 @@ static void nuke(struct musb_ep *ep, const int status)
}
}
-/* ----------------------------------------------------------------------- */
-
/* Data transfers - pure PIO, pure DMA, or mixed mode */
/*
@@ -215,9 +208,7 @@ static inline int max_ep_writesize(struct musb *musb, struct musb_ep *ep)
return ep->packet_sz;
}
-
#ifdef CONFIG_USB_INVENTRA_DMA
-
/* Peripheral tx (IN) using Mentor DMA works as follows:
Only mode 0 is used for transfers <= wPktSize,
mode 1 is used for larger transfers,
@@ -528,10 +519,7 @@ void musb_g_tx(struct musb *musb, u8 epnum)
}
}
-/* ------------------------------------------------------------ */
-
#ifdef CONFIG_USB_INVENTRA_DMA
-
/* Peripheral rx (OUT) using Mentor DMA works as follows:
- Only mode 0 is used.
@@ -832,8 +820,6 @@ void musb_g_rx(struct musb *musb, u8 epnum)
return;
}
-/* ------------------------------------------------------------ */
-
static int musb_gadget_enable(struct usb_ep *ep,
const struct usb_endpoint_descriptor *desc)
{
@@ -1399,8 +1385,6 @@ static const struct usb_ep_ops musb_ep_ops = {
.fifo_flush = musb_gadget_fifo_flush
};
-/* ----------------------------------------------------------------------- */
-
static int musb_gadget_get_frame(struct usb_gadget *gadget)
{
struct musb *musb = gadget_to_musb(gadget);
@@ -1554,8 +1538,6 @@ static const struct usb_gadget_ops musb_gadget_operations = {
.pullup = musb_gadget_pullup,
};
-/* ----------------------------------------------------------------------- */
-
/* Registration */
/* Only this registration code "knows" the rule (from USB standards)
@@ -1570,7 +1552,6 @@ static void musb_gadget_release(struct device *dev)
dev_dbg(dev, "%s\n", __func__);
}
-
static void __init
init_peripheral_ep(struct musb *musb, struct musb_ep *ep, u8 epnum, int is_in)
{
@@ -1886,10 +1867,7 @@ int usb_gadget_unregister_driver(struct usb_gadget_driver *driver)
}
EXPORT_SYMBOL(usb_gadget_unregister_driver);
-
-/* ----------------------------------------------------------------------- */
-
-/* lifecycle operations called through plat_uds.c */
+/* lifecycle operations called through musb_core.c */
void musb_g_resume(struct musb *musb)
{
diff --git a/drivers/usb/musb/musb_gadget.h b/drivers/usb/musb/musb_gadget.h
index c8b1403..99c7e34 100644
--- a/drivers/usb/musb/musb_gadget.h
+++ b/drivers/usb/musb/musb_gadget.h
@@ -53,7 +53,6 @@ extern struct usb_request *
musb_alloc_request(struct usb_ep *ep, gfp_t gfp_flags);
extern void musb_free_request(struct usb_ep *ep, struct usb_request *req);
-
/*
* struct musb_ep - peripheral side view of endpoint rx or tx side
*/
diff --git a/drivers/usb/musb/musb_gadget_ep0.c b/drivers/usb/musb/musb_gadget_ep0.c
index 21b9788..2182238 100644
--- a/drivers/usb/musb/musb_gadget_ep0.c
+++ b/drivers/usb/musb/musb_gadget_ep0.c
@@ -891,7 +891,6 @@ finish:
return retval;
}
-
static int
musb_g_ep0_enable(struct usb_ep *ep, const struct usb_endpoint_descriptor *desc)
{
diff --git a/drivers/usb/musb/musb_host.c b/drivers/usb/musb/musb_host.c
index 877d20b..70f8412 100644
--- a/drivers/usb/musb/musb_host.c
+++ b/drivers/usb/musb/musb_host.c
@@ -45,7 +45,6 @@
#include "musb_core.h"
#include "musb_host.h"
-
/* MUSB HOST status 22-mar-2006
*
* - There's still lots of partial code duplication for fault paths, so
@@ -80,7 +79,6 @@
* although ARP RX wins. (That test was done with a full speed link.)
*/
-
/*
* NOTE on endpoint usage:
*
@@ -95,7 +93,6 @@
* of transfers between endpoints, or anything clever.
*/
-
static void musb_ep_program(struct musb *musb, u8 epnum,
struct urb *urb, int is_out,
u8 *buf, u32 offset, u32 len);
@@ -880,7 +877,6 @@ static void musb_ep_program(struct musb *musb, u8 epnum,
}
}
-
/*
* Service the default endpoint (ep0) as host.
* Return true until it's time to start the status stage.
@@ -1081,7 +1077,6 @@ done:
return retval;
}
-
#ifdef CONFIG_USB_INVENTRA_DMA
/* Host side TX (OUT) using Mentor DMA works as follows:
@@ -1334,9 +1329,7 @@ void musb_host_tx(struct musb *musb, u8 epnum)
MUSB_TXCSR_H_WZC_BITS | MUSB_TXCSR_TXPKTRDY);
}
-
#ifdef CONFIG_USB_INVENTRA_DMA
-
/* Host side RX (IN) using Mentor DMA works as follows:
submit_urb ->
- if queue was empty, ProgramEndpoint
@@ -2066,7 +2059,6 @@ done:
return ret;
}
-
/*
* abort a transfer that's at the head of a hardware queue.
* called with controller locked, irqs blocked
diff --git a/drivers/usb/musb/musb_host.h b/drivers/usb/musb/musb_host.h
index 14b0077..e408398 100644
--- a/drivers/usb/musb/musb_host.h
+++ b/drivers/usb/musb/musb_host.h
@@ -81,7 +81,6 @@ static inline struct musb_qh *first_qh(struct list_head *q)
return list_entry(q->next, struct musb_qh, ring);
}
-
extern void musb_root_disconnect(struct musb *musb);
struct usb_hcd;
diff --git a/drivers/usb/musb/musb_regs.h b/drivers/usb/musb/musb_regs.h
index 2442675..1f6a037 100644
--- a/drivers/usb/musb/musb_regs.h
+++ b/drivers/usb/musb/musb_regs.h
@@ -213,7 +213,6 @@
/* HUBADDR */
#define MUSB_HUBADDR_MULTI_TT 0x80
-
#ifndef CONFIG_BLACKFIN
/*
diff --git a/drivers/usb/musb/musb_virthub.c b/drivers/usb/musb/musb_virthub.c
index 7775e1c..f6f8212 100644
--- a/drivers/usb/musb/musb_virthub.c
+++ b/drivers/usb/musb/musb_virthub.c
@@ -39,12 +39,10 @@
#include <linux/init.h>
#include <linux/time.h>
#include <linux/timer.h>
-
#include <asm/unaligned.h>
#include "musb_core.h"
-
static void musb_port_suspend(struct musb *musb, bool do_suspend)
{
u8 power;
@@ -212,9 +210,6 @@ void musb_root_disconnect(struct musb *musb)
}
}
-
-/*---------------------------------------------------------------------*/
-
/* Caller may or may not hold musb->lock */
int musb_hub_status_data(struct usb_hcd *hcd, char *buf)
{
--
1.6.2.4
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
