Update of /cvsroot/linux-mips/linux/arch/mips/au1000/common
In directory usw-pr-cvs1:/tmp/cvs-serv17985/arch/mips/au1000/common
Modified Files:
dma.c power.c usbdev.c
Log Message:
Removal of files duplicated in Linus tree.
Index: dma.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/au1000/common/dma.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- dma.c 2001/09/25 03:36:35 1.4
+++ dma.c 2001/11/06 20:23:53 1.5
@@ -39,7 +39,7 @@
#include <asm/au1000_dma.h>
#include <asm/system.h>
-
+
/*
* A note on resource allocation:
@@ -97,11 +97,11 @@
int au1000_dma_read_proc(char *buf, char **start, off_t fpos,
- int length, int *eof, void *data)
+ int length, int *eof, void *data)
{
int i, len = 0;
struct dma_chan *chan;
-
+
for (i = 0; i < NUM_AU1000_DMA_CHANNELS; i++) {
if ((chan = get_dma_chan(i)) != NULL) {
len +=
@@ -109,7 +109,7 @@
chan->dev_str);
}
}
-
+
if (fpos >= len) {
*start = buf;
*eof = 1;
@@ -189,6 +189,6 @@
}
disable_dma(dmanr);
-
+
chan->dev_id = -1;
-} /* free_dma */
+} /* free_dma */
Index: power.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/au1000/common/power.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- power.c 2001/09/25 03:36:35 1.2
+++ power.c 2001/11/06 20:23:53 1.3
@@ -84,15 +84,15 @@
wakeup |= 1 << 6; /* turn on gpio 6 wakeup */
writel(wakeup, PM_WAKEUP_SOURCE_MASK);
- writel(1, PM_WAKEUP_CAUSE); /* clear cause */
- writel(1, PM_SLEEP_POWER); /* prepare to sleep */
+ writel(1, PM_WAKEUP_CAUSE); /* clear cause */
+ writel(1, PM_SLEEP_POWER); /* prepare to sleep */
__asm__("la $4, 1f\n\t"
"lui $5, 0xb190\n\t"
"ori $5, 0x18\n\t"
"sw $4, 0($5)\n\t"
"li $4, 1\n\t"
- "lui $5, 0xb190\n\t"
+ "lui $5, 0xb190\n\t"
"ori $5, 0x7c\n\t"
"sw $4, 0($5)\n\t" "sync\n\t" "1:\t\n\t" "nop\n\t");
@@ -107,12 +107,12 @@
void *buffer, size_t * len)
{
int retval = 0;
-
+
if (!write) {
*len = 0;
} else {
retval = pm_send_all(PM_SUSPEND, (void *) 2);
- if (retval)
+ if (retval)
return retval;
au_sleep();
@@ -125,12 +125,12 @@
void *buffer, size_t * len)
{
int retval = 0;
-
+
if (!write) {
*len = 0;
} else {
retval = pm_send_all(PM_SUSPEND, (void *) 2);
- if (retval)
+ if (retval)
return retval;
suspend_mode = 1;
au1_wait();
@@ -152,7 +152,7 @@
unsigned long old_baud_base, old_cpu_freq, baud_rate, old_clk,
old_refresh;
unsigned long new_baud_base, new_cpu_freq, new_clk, new_refresh;
-
+
save_and_cli(flags);
if (!write) {
*len = 0;
@@ -175,7 +175,7 @@
}
pll = val / 12;
- if ((pll > 33) || (pll < 7)) { /* 396 MHz max, 84 MHz min */
+ if ((pll > 33) || (pll < 7)) { /* 396 MHz max, 84 MHz min */
/* revisit this for higher speed cpus */
restore_flags(flags);
return -EFAULT;
@@ -222,7 +222,7 @@
baud_rate = 38400;
else if (baud_rate > 17000)
baud_rate = 19200;
- else
+ else
(baud_rate = 9600);
// new_clk = new_baud_base/baud_rate
new_clk = new_baud_base / baud_rate;
@@ -252,8 +252,8 @@
static struct ctl_table pm_table[] = {
{ACPI_S1_SLP_TYP, "suspend", NULL, 0, 0600, NULL, &pm_do_suspend},
- {ACPI_SLEEP, "sleep", NULL, 0, 0600, NULL, &pm_do_sleep},
- {CTL_ACPI, "freq", NULL, 0, 0600, NULL, &pm_do_freq},
+ {ACPI_SLEEP, "sleep", NULL, 0, 0600, NULL, &pm_do_sleep},
+ {CTL_ACPI, "freq", NULL, 0, 0600, NULL, &pm_do_freq},
{0}
};
@@ -326,11 +326,11 @@
}
-#else /* CONFIG_PM */
+#else /* CONFIG_PM */
void au1_wait(void)
{
__asm__("nop\n\t" "nop\n\t");
}
-#endif /* CONFIG_PM */
+#endif /* CONFIG_PM */
Index: usbdev.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/au1000/common/usbdev.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- usbdev.c 2001/09/25 03:36:35 1.4
+++ usbdev.c 2001/11/06 20:23:53 1.5
@@ -93,13 +93,13 @@
static int serial_open(struct tty_struct *tty, struct file *filp);
static void serial_close(struct tty_struct *tty, struct file *filp);
static int serial_write(struct tty_struct *tty, int from_user,
- const unsigned char *buf, int count);
+ const unsigned char *buf, int count);
static int serial_write_room(struct tty_struct *tty);
static int serial_chars_in_buffer(struct tty_struct *tty);
static void serial_throttle(struct tty_struct *tty);
static void serial_unthrottle(struct tty_struct *tty);
static int serial_ioctl(struct tty_struct *tty, struct file *file,
- unsigned int cmd, unsigned long arg);
[...969 lines suppressed...]
struct usb_serial_port *port = &usbserial.port[i];
endpoint_flush(&port->ep_bulkin);
@@ -1844,7 +1844,7 @@
// start packet reception on bulk OUT endpoint
kickstart_receive_packet(&port->ep_bulkout);
}
-
+
/*
* Enable Receive FIFO Complete interrupts only. Transmit
* complete is being handled by the DMA done interrupts.
@@ -1853,7 +1853,7 @@
return 0;
- err_out:
+ err_out:
usbdev_serial_exit();
return -1;
}
|
