aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWill Newton <will.newton@imgtec.com>2008-08-12 10:39:11 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2008-10-17 17:41:06 -0400
commit9d9d88c80e80397a71745ab80e69edd95e1f6b41 (patch)
treef57651c34829dd3434ae30b0fc61d50f4f1f1143
parentbf7409a23b4589e65624ca6bcefe6229a16ea0ae (diff)
fsl_usb2_udc: Clean up whitespace in /proc debugging output.
Missing spaces were causing the /proc debugging output to be rather unreadable. Signed-off-by: Will Newton <will.newton@gmail.com> Acked-by: Li Yang <leoli@freescale.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--drivers/usb/gadget/fsl_usb2_udc.c35
1 files changed, 18 insertions, 17 deletions
diff --git a/drivers/usb/gadget/fsl_usb2_udc.c b/drivers/usb/gadget/fsl_usb2_udc.c
index 38ffb06f31ec..2bd2c9341f6d 100644
--- a/drivers/usb/gadget/fsl_usb2_udc.c
+++ b/drivers/usb/gadget/fsl_usb2_udc.c
@@ -1909,7 +1909,7 @@ static int fsl_proc_read(char *page, char **start, off_t off, int count,
1909 tmp_reg = fsl_readl(&dr_regs->usbsts); 1909 tmp_reg = fsl_readl(&dr_regs->usbsts);
1910 t = scnprintf(next, size, 1910 t = scnprintf(next, size,
1911 "USB Status Reg:\n" 1911 "USB Status Reg:\n"
1912 "Dr Suspend: %d" "Reset Received: %d" "System Error: %s" 1912 "Dr Suspend: %d Reset Received: %d System Error: %s "
1913 "USB Error Interrupt: %s\n\n", 1913 "USB Error Interrupt: %s\n\n",
1914 (tmp_reg & USB_STS_SUSPEND) ? 1 : 0, 1914 (tmp_reg & USB_STS_SUSPEND) ? 1 : 0,
1915 (tmp_reg & USB_STS_RESET) ? 1 : 0, 1915 (tmp_reg & USB_STS_RESET) ? 1 : 0,
@@ -1921,11 +1921,11 @@ static int fsl_proc_read(char *page, char **start, off_t off, int count,
1921 tmp_reg = fsl_readl(&dr_regs->usbintr); 1921 tmp_reg = fsl_readl(&dr_regs->usbintr);
1922 t = scnprintf(next, size, 1922 t = scnprintf(next, size,
1923 "USB Intrrupt Enable Reg:\n" 1923 "USB Intrrupt Enable Reg:\n"
1924 "Sleep Enable: %d" "SOF Received Enable: %d" 1924 "Sleep Enable: %d SOF Received Enable: %d "
1925 "Reset Enable: %d\n" 1925 "Reset Enable: %d\n"
1926 "System Error Enable: %d" 1926 "System Error Enable: %d "
1927 "Port Change Dectected Enable: %d\n" 1927 "Port Change Dectected Enable: %d\n"
1928 "USB Error Intr Enable: %d" "USB Intr Enable: %d\n\n", 1928 "USB Error Intr Enable: %d USB Intr Enable: %d\n\n",
1929 (tmp_reg & USB_INTR_DEVICE_SUSPEND) ? 1 : 0, 1929 (tmp_reg & USB_INTR_DEVICE_SUSPEND) ? 1 : 0,
1930 (tmp_reg & USB_INTR_SOF_EN) ? 1 : 0, 1930 (tmp_reg & USB_INTR_SOF_EN) ? 1 : 0,
1931 (tmp_reg & USB_INTR_RESET_EN) ? 1 : 0, 1931 (tmp_reg & USB_INTR_RESET_EN) ? 1 : 0,
@@ -1938,21 +1938,21 @@ static int fsl_proc_read(char *page, char **start, off_t off, int count,
1938 1938
1939 tmp_reg = fsl_readl(&dr_regs->frindex); 1939 tmp_reg = fsl_readl(&dr_regs->frindex);
1940 t = scnprintf(next, size, 1940 t = scnprintf(next, size,
1941 "USB Frame Index Reg:" "Frame Number is 0x%x\n\n", 1941 "USB Frame Index Reg: Frame Number is 0x%x\n\n",
1942 (tmp_reg & USB_FRINDEX_MASKS)); 1942 (tmp_reg & USB_FRINDEX_MASKS));
1943 size -= t; 1943 size -= t;
1944 next += t; 1944 next += t;
1945 1945
1946 tmp_reg = fsl_readl(&dr_regs->deviceaddr); 1946 tmp_reg = fsl_readl(&dr_regs->deviceaddr);
1947 t = scnprintf(next, size, 1947 t = scnprintf(next, size,
1948 "USB Device Address Reg:" "Device Addr is 0x%x\n\n", 1948 "USB Device Address Reg: Device Addr is 0x%x\n\n",
1949 (tmp_reg & USB_DEVICE_ADDRESS_MASK)); 1949 (tmp_reg & USB_DEVICE_ADDRESS_MASK));
1950 size -= t; 1950 size -= t;
1951 next += t; 1951 next += t;
1952 1952
1953 tmp_reg = fsl_readl(&dr_regs->endpointlistaddr); 1953 tmp_reg = fsl_readl(&dr_regs->endpointlistaddr);
1954 t = scnprintf(next, size, 1954 t = scnprintf(next, size,
1955 "USB Endpoint List Address Reg:" 1955 "USB Endpoint List Address Reg: "
1956 "Device Addr is 0x%x\n\n", 1956 "Device Addr is 0x%x\n\n",
1957 (tmp_reg & USB_EP_LIST_ADDRESS_MASK)); 1957 (tmp_reg & USB_EP_LIST_ADDRESS_MASK));
1958 size -= t; 1958 size -= t;
@@ -1961,11 +1961,12 @@ static int fsl_proc_read(char *page, char **start, off_t off, int count,
1961 tmp_reg = fsl_readl(&dr_regs->portsc1); 1961 tmp_reg = fsl_readl(&dr_regs->portsc1);
1962 t = scnprintf(next, size, 1962 t = scnprintf(next, size,
1963 "USB Port Status&Control Reg:\n" 1963 "USB Port Status&Control Reg:\n"
1964 "Port Transceiver Type : %s" "Port Speed: %s \n" 1964 "Port Transceiver Type : %s Port Speed: %s\n"
1965 "PHY Low Power Suspend: %s" "Port Reset: %s" 1965 "PHY Low Power Suspend: %s Port Reset: %s "
1966 "Port Suspend Mode: %s \n" "Over-current Change: %s" 1966 "Port Suspend Mode: %s\n"
1967 "Over-current Change: %s "
1967 "Port Enable/Disable Change: %s\n" 1968 "Port Enable/Disable Change: %s\n"
1968 "Port Enabled/Disabled: %s" 1969 "Port Enabled/Disabled: %s "
1969 "Current Connect Status: %s\n\n", ( { 1970 "Current Connect Status: %s\n\n", ( {
1970 char *s; 1971 char *s;
1971 switch (tmp_reg & PORTSCX_PTS_FSLS) { 1972 switch (tmp_reg & PORTSCX_PTS_FSLS) {
@@ -2010,7 +2011,7 @@ static int fsl_proc_read(char *page, char **start, off_t off, int count,
2010 2011
2011 tmp_reg = fsl_readl(&dr_regs->usbmode); 2012 tmp_reg = fsl_readl(&dr_regs->usbmode);
2012 t = scnprintf(next, size, 2013 t = scnprintf(next, size,
2013 "USB Mode Reg:" "Controller Mode is : %s\n\n", ( { 2014 "USB Mode Reg: Controller Mode is: %s\n\n", ( {
2014 char *s; 2015 char *s;
2015 switch (tmp_reg & USB_MODE_CTRL_MODE_HOST) { 2016 switch (tmp_reg & USB_MODE_CTRL_MODE_HOST) {
2016 case USB_MODE_CTRL_MODE_IDLE: 2017 case USB_MODE_CTRL_MODE_IDLE:
@@ -2029,7 +2030,7 @@ static int fsl_proc_read(char *page, char **start, off_t off, int count,
2029 2030
2030 tmp_reg = fsl_readl(&dr_regs->endptsetupstat); 2031 tmp_reg = fsl_readl(&dr_regs->endptsetupstat);
2031 t = scnprintf(next, size, 2032 t = scnprintf(next, size,
2032 "Endpoint Setup Status Reg:" "SETUP on ep 0x%x\n\n", 2033 "Endpoint Setup Status Reg: SETUP on ep 0x%x\n\n",
2033 (tmp_reg & EP_SETUP_STATUS_MASK)); 2034 (tmp_reg & EP_SETUP_STATUS_MASK));
2034 size -= t; 2035 size -= t;
2035 next += t; 2036 next += t;
@@ -2042,12 +2043,12 @@ static int fsl_proc_read(char *page, char **start, off_t off, int count,
2042 next += t; 2043 next += t;
2043 } 2044 }
2044 tmp_reg = fsl_readl(&dr_regs->endpointprime); 2045 tmp_reg = fsl_readl(&dr_regs->endpointprime);
2045 t = scnprintf(next, size, "EP Prime Reg = [0x%x]\n", tmp_reg); 2046 t = scnprintf(next, size, "EP Prime Reg = [0x%x]\n\n", tmp_reg);
2046 size -= t; 2047 size -= t;
2047 next += t; 2048 next += t;
2048 2049
2049 tmp_reg = usb_sys_regs->snoop1; 2050 tmp_reg = usb_sys_regs->snoop1;
2050 t = scnprintf(next, size, "\nSnoop1 Reg : = [0x%x]\n\n", tmp_reg); 2051 t = scnprintf(next, size, "Snoop1 Reg : = [0x%x]\n\n", tmp_reg);
2051 size -= t; 2052 size -= t;
2052 next += t; 2053 next += t;
2053 2054
@@ -2071,7 +2072,7 @@ static int fsl_proc_read(char *page, char **start, off_t off, int count,
2071 } else { 2072 } else {
2072 list_for_each_entry(req, &ep->queue, queue) { 2073 list_for_each_entry(req, &ep->queue, queue) {
2073 t = scnprintf(next, size, 2074 t = scnprintf(next, size,
2074 "req %p actual 0x%x length 0x%x buf %p\n", 2075 "req %p actual 0x%x length 0x%x buf %p\n",
2075 &req->req, req->req.actual, 2076 &req->req, req->req.actual,
2076 req->req.length, req->req.buf); 2077 req->req.length, req->req.buf);
2077 size -= t; 2078 size -= t;
@@ -2097,7 +2098,7 @@ static int fsl_proc_read(char *page, char **start, off_t off, int count,
2097 } else { 2098 } else {
2098 list_for_each_entry(req, &ep->queue, queue) { 2099 list_for_each_entry(req, &ep->queue, queue) {
2099 t = scnprintf(next, size, 2100 t = scnprintf(next, size,
2100 "req %p actual 0x%x length" 2101 "req %p actual 0x%x length "
2101 "0x%x buf %p\n", 2102 "0x%x buf %p\n",
2102 &req->req, req->req.actual, 2103 &req->req, req->req.actual,
2103 req->req.length, req->req.buf); 2104 req->req.length, req->req.buf);