CVSROOT: /home/cvs
Module name: linux
Changes by: ths@ftp.linux-mips.org 05/07/10 11:29:03
Modified files:
arch/mips/au1000/mtx-1: init.c
arch/mips/mm : dma-ip32.c
arch/mips/oprofile: Kconfig
arch/mips/pci : fixup-vr4133.c ops-msc.c ops-tx4927.c
arch/mips/sgi-ip32: crime.c
arch/mips/vr41xx/nec-cmbvr4133: init.c irq.c
drivers/i2c/busses: i2c-au1550.c
drivers/media/video: vino.c
drivers/pcmcia : Kconfig au1000_db1x00.c au1000_generic.c
au1000_generic.h au1000_xxs1500.c
vrc4173_cardu.c vrc4173_cardu.h
drivers/tc : zs.h
drivers/usb/host: ohci-au1xxx.c
drivers/video : bt431.h gbefb.c maxinefb.c pmag-aa-fb.c
pmag-ba-fb.c
include/asm-mips: ucontext.h
include/asm-mips/mips-boards: msc01_pci.h
sound/mips : au1x00.c
sound/oss : au1000.c au1550_ac97.c nec_vrc5477.c
Log message:
Paint whitespaces in mainline colour.
diff -urN linux/arch/mips/au1000/mtx-1/init.c
linux/arch/mips/au1000/mtx-1/init.c
--- linux/arch/mips/au1000/mtx-1/init.c 2005/04/14 12:34:15 1.8
+++ linux/arch/mips/au1000/mtx-1/init.c 2005/07/10 10:29:00 1.9
@@ -58,7 +58,7 @@
mips_machgroup = MACH_GROUP_ALCHEMY;
mips_machtype = MACH_MTX1; /* set the platform # */
-
+
prom_init_cmdline();
memsize_str = prom_getenv("memsize");
diff -urN linux/arch/mips/mm/dma-ip32.c linux/arch/mips/mm/dma-ip32.c
--- linux/arch/mips/mm/dma-ip32.c 2005/04/08 18:57:59 1.4
+++ linux/arch/mips/mm/dma-ip32.c 2005/07/10 10:29:00 1.5
@@ -175,7 +175,7 @@
for (i = 0; i < nents; i++, sg++) {
unsigned long addr;
-
+
addr = (unsigned long) page_address(sg->page)+sg->offset;
if (addr)
__dma_sync(addr, sg->length, direction);
@@ -251,9 +251,9 @@
size_t size, enum dma_data_direction direction)
{
unsigned long addr;
-
+
BUG_ON(direction == DMA_NONE);
-
+
dma_handle&=RAM_OFFSET_MASK;
addr = dma_handle + PAGE_OFFSET;
if(dma_handle>=256*1024*1024)
@@ -315,9 +315,9 @@
enum dma_data_direction direction)
{
int i;
-
+
BUG_ON(direction == DMA_NONE);
-
+
/* Make sure that gcc doesn't leave the empty loop body. */
for (i = 0; i < nelems; i++, sg++)
__dma_sync((unsigned long)page_address(sg->page),
diff -urN linux/arch/mips/oprofile/Kconfig linux/arch/mips/oprofile/Kconfig
--- linux/arch/mips/oprofile/Kconfig 2004/12/12 02:22:46 1.1
+++ linux/arch/mips/oprofile/Kconfig 2005/07/10 10:29:00 1.2
@@ -7,7 +7,7 @@
help
Say Y here to enable the extended profiling support mechanisms used
by profilers such as OProfile.
-
+
config OPROFILE
tristate "OProfile system profiling (EXPERIMENTAL)"
diff -urN linux/arch/mips/pci/fixup-vr4133.c linux/arch/mips/pci/fixup-vr4133.c
--- linux/arch/mips/pci/fixup-vr4133.c 2004/12/15 14:08:18 1.1
+++ linux/arch/mips/pci/fixup-vr4133.c 2005/07/10 10:29:00 1.2
@@ -11,9 +11,9 @@
* is licensed "as is" without any warranty of any kind, whether express
* or implied.
*
- * Modified for support in 2.6
+ * Modified for support in 2.6
* Author: Manish Lachwani (mlachwani@mvista.com)
- *
+ *
*/
#include <linux/config.h>
#include <linux/init.h>
@@ -29,21 +29,21 @@
/* Do platform specific device initialization at pci_enable_device() time */
int pcibios_plat_dev_init(struct pci_dev *dev)
{
- /*
+ /*
* We have to reset AMD PCnet adapter on Rockhopper since
* PMON leaves it enabled and generating interrupts. This leads
* to a lock if some PCI device driver later enables the IRQ line
* shared with PCnet and there is no AMD PCnet driver to catch its
- * interrupts.
+ * interrupts.
*/
#ifdef CONFIG_ROCKHOPPER
- if (dev->vendor == PCI_VENDOR_ID_AMD &&
+ if (dev->vendor == PCI_VENDOR_ID_AMD &&
dev->device == PCI_DEVICE_ID_AMD_LANCE) {
inl(pci_resource_start(dev, 0) + 0x18);
}
#endif
- /*
+ /*
* we have to open the bridges' windows down to 0 because otherwise
* we cannot access ISA south bridge I/O registers that get mapped from
* 0. for example, 8259 PIC would be unaccessible without that
@@ -60,8 +60,8 @@
return 0;
}
-/*
- * M1535 IRQ mapping
+/*
+ * M1535 IRQ mapping
* Feel free to change this, although it shouldn't be needed
*/
#define M1535_IRQ_INTA 7
@@ -124,7 +124,7 @@
{1, ROCKHOPPER_PCI2_SLOT, M1535_IRQ_INTC}, /* PCI slot #2 */
{1, ROCKHOPPER_M5237_SLOT, M1535_IRQ_USB}, /* USB host controller
*/
{1, ROCKHOPPER_M5229_SLOT, IDE_PRIMARY_IRQ}, /* IDE controller */
- {2, ROCKHOPPER_PCNET_SLOT, M1535_IRQ_INTD}, /* AMD Am79c973
on-board
+ {2, ROCKHOPPER_PCNET_SLOT, M1535_IRQ_INTD}, /* AMD Am79c973 on-board
ethernet */
{2, ROCKHOPPER_PCI3_SLOT, M1535_IRQ_INTB}, /* PCI slot #3 */
{2, ROCKHOPPER_PCI4_SLOT, M1535_IRQ_INTC} /* PCI slot #4 */
diff -urN linux/arch/mips/pci/ops-msc.c linux/arch/mips/pci/ops-msc.c
--- linux/arch/mips/pci/ops-msc.c 2005/04/14 11:31:25 1.7
+++ linux/arch/mips/pci/ops-msc.c 2005/07/10 10:29:00 1.8
@@ -1,8 +1,8 @@
/*
* Copyright (C) 1999, 2000, 2004, 2005 MIPS Technologies, Inc.
- * All rights reserved.
- * Authors: Carsten Langgaard <carstenl@mips.com>
- * Maciej W. Rozycki <macro@mips.com>
+ * All rights reserved.
+ * Authors: Carsten Langgaard <carstenl@mips.com>
+ * Maciej W. Rozycki <macro@mips.com>
* Copyright (C) 2005 Ralf Baechle (ralf@linux-mips.org)
*
* This program is free software; you can distribute it and/or modify it
diff -urN linux/arch/mips/pci/ops-tx4927.c linux/arch/mips/pci/ops-tx4927.c
--- linux/arch/mips/pci/ops-tx4927.c 2005/01/22 22:14:10 1.7
+++ linux/arch/mips/pci/ops-tx4927.c 2005/07/10 10:29:00 1.8
@@ -120,7 +120,7 @@
switch (size) {
case 1:
*val = *(volatile u8 *) ((ulong) & tx4927_pcicptr->
- g2pcfgdata |
+ g2pcfgdata |
#ifdef __LITTLE_ENDIAN
(where & 3));
#else
@@ -129,7 +129,7 @@
break;
case 2:
*val = *(volatile u16 *) ((ulong) & tx4927_pcicptr->
- g2pcfgdata |
+ g2pcfgdata |
#ifdef __LITTLE_ENDIAN
(where & 3));
#else
@@ -169,7 +169,7 @@
switch (size) {
case 1:
*(volatile u8 *) ((ulong) & tx4927_pcicptr->
- g2pcfgdata |
+ g2pcfgdata |
#ifdef __LITTLE_ENDIAN
(where & 3)) = val;
#else
@@ -179,7 +179,7 @@
case 2:
*(volatile u16 *) ((ulong) & tx4927_pcicptr->
- g2pcfgdata |
+ g2pcfgdata |
#ifdef __LITTLE_ENDIAN
(where & 3)) = val;
#else
diff -urN linux/arch/mips/sgi-ip32/crime.c linux/arch/mips/sgi-ip32/crime.c
--- linux/arch/mips/sgi-ip32/crime.c 2005/01/12 00:10:42 1.7
+++ linux/arch/mips/sgi-ip32/crime.c 2005/07/10 10:29:01 1.8
@@ -26,7 +26,7 @@
unsigned int id, rev;
const int field = 2 * sizeof(unsigned long);
- set_io_port_base((unsigned long) ioremap(MACEPCI_LOW_IO, 0x2000000));
+ set_io_port_base((unsigned long) ioremap(MACEPCI_LOW_IO, 0x2000000));
crime = ioremap(CRIME_BASE, sizeof(struct sgi_crime));
mace = ioremap(MACE_BASE, sizeof(struct sgi_mace));
diff -urN linux/arch/mips/vr41xx/nec-cmbvr4133/init.c
linux/arch/mips/vr41xx/nec-cmbvr4133/init.c
--- linux/arch/mips/vr41xx/nec-cmbvr4133/init.c 2004/12/15 14:08:18 1.1
+++ linux/arch/mips/vr41xx/nec-cmbvr4133/init.c 2005/07/10 10:29:01 1.2
@@ -12,7 +12,7 @@
* is licensed "as is" without any warranty of any kind, whether express
* or implied.
*
- * Support for NEC-CMBVR4133 in 2.6
+ * Support for NEC-CMBVR4133 in 2.6
* Manish Lachwani (mlachwani@mvista.com)
*/
#include <linux/config.h>
@@ -40,7 +40,7 @@
{
u32 data;
- /*
+ /*
* Workaround for the bug in PMON on VR4133. PMON leaves
* AMD PCNet controller (on Rockhopper) initialized and running in
* bus master mode. We have do disable it before doing any
@@ -69,7 +69,7 @@
(4 & 0xfc) |
1UL,
PCICONFAREG);
-
+
data &= ~4;
writel(data, PCICONFDREG);
diff -urN linux/arch/mips/vr41xx/nec-cmbvr4133/irq.c
linux/arch/mips/vr41xx/nec-cmbvr4133/irq.c
--- linux/arch/mips/vr41xx/nec-cmbvr4133/irq.c 2004/12/15 14:08:18 1.1
+++ linux/arch/mips/vr41xx/nec-cmbvr4133/irq.c 2005/07/10 10:29:01 1.2
@@ -27,9 +27,9 @@
extern void disable_8259A_irq(unsigned int irq);
extern void mask_and_ack_8259A(unsigned int irq);
extern void init_8259A(int hoge);
-
+
extern int vr4133_rockhopper;
-
+
static unsigned int startup_i8259_irq(unsigned int irq)
{
enable_8259A_irq(irq - I8259_IRQ_BASE);
diff -urN linux/drivers/i2c/busses/i2c-au1550.c
linux/drivers/i2c/busses/i2c-au1550.c
--- linux/drivers/i2c/busses/i2c-au1550.c 2005/04/14 11:31:25 1.3
+++ linux/drivers/i2c/busses/i2c-au1550.c 2005/07/10 10:29:01 1.4
@@ -21,7 +21,7 @@
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
@@ -289,8 +289,8 @@
.functionality = au1550_func,
};
-/*
- * registering functions to load algorithms at runtime
+/*
+ * registering functions to load algorithms at runtime
* Prior to calling us, the 50MHz clock frequency and routing
* must have been set up for the PSC indicated by the adapter.
*/
diff -urN linux/drivers/media/video/vino.c linux/drivers/media/video/vino.c
--- linux/drivers/media/video/vino.c 2003/09/17 20:05:09 1.7
+++ linux/drivers/media/video/vino.c 2005/07/10 10:29:01 1.8
@@ -1,6 +1,6 @@
/*
* (incomplete) Driver for the VINO (Video In No Out) system found in SGI
Indys.
- *
+ *
* This file is subject to the terms and conditions of the GNU General Public
* License version 2 as published by the Free Software Foundation.
*
@@ -139,7 +139,7 @@
static int i2c_vino_client_unreg(struct i2c_client *client)
{
int res = 0;
-
+
down(&Vino->input_lock);
if (client == Vino->decoder.driver) {
if (Vino->decoder.owner)
@@ -223,7 +223,7 @@
{
unsigned long rev;
int i, ret = 0;
-
+
/* VINO is Indy specific beast */
if (ip22_is_fullhouse())
return -ENODEV;
@@ -231,7 +231,7 @@
/*
* VINO is in the EISA address space, so the sysid register will tell
* us if the EISA_PRESENT pin on MC has been pulled low.
- *
+ *
* If EISA_PRESENT is not set we definitely don't have a VINO equiped
* system.
*/
diff -urN linux/drivers/pcmcia/Kconfig linux/drivers/pcmcia/Kconfig
--- linux/drivers/pcmcia/Kconfig 2005/03/18 17:37:43 1.16
+++ linux/drivers/pcmcia/Kconfig 2005/07/10 10:29:01 1.17
@@ -201,4 +201,3 @@
endif # PCCARD
endmenu
-
diff -urN linux/drivers/pcmcia/au1000_db1x00.c
linux/drivers/pcmcia/au1000_db1x00.c
--- linux/drivers/pcmcia/au1000_db1x00.c 2005/04/14 11:31:26 1.7
+++ linux/drivers/pcmcia/au1000_db1x00.c 2005/07/10 10:29:01 1.8
@@ -8,7 +8,7 @@
*
* Copyright 2004 Pete Popov, updated the driver to 2.6.
* Followed the sa11xx API and largely copied many of the hardware
- * independent functions.
+ * independent functions.
*
* ########################################################################
*
@@ -27,7 +27,7 @@
*
* ########################################################################
*
- *
+ *
*/
#include <linux/config.h>
@@ -72,7 +72,7 @@
au_sync_delay(2);
}
-static void
+static void
db1x00_pcmcia_socket_state(struct au1000_pcmcia_socket *skt, struct
pcmcia_state *state)
{
u32 inserted;
@@ -96,8 +96,8 @@
return;
}
- if (inserted)
- debug("db1x00 socket %d: inserted %d, vs %d pcmcia %x\n",
+ if (inserted)
+ debug("db1x00 socket %d: inserted %d, vs %d pcmcia %x\n",
skt->nr, inserted, vs, bcsr->pcmcia);
if (inserted) {
@@ -121,14 +121,14 @@
* we should turn off power to it
*/
if ((skt->nr == 0) && (bcsr->pcmcia & BCSR_PCMCIA_PC0RST)) {
- bcsr->pcmcia &= ~(BCSR_PCMCIA_PC0RST |
+ bcsr->pcmcia &= ~(BCSR_PCMCIA_PC0RST |
BCSR_PCMCIA_PC0DRVEN |
BCSR_PCMCIA_PC0VPP |
BCSR_PCMCIA_PC0VCC);
au_sync_delay(10);
}
else if ((skt->nr == 1) && bcsr->pcmcia & BCSR_PCMCIA_PC1RST) {
- bcsr->pcmcia &= ~(BCSR_PCMCIA_PC1RST |
+ bcsr->pcmcia &= ~(BCSR_PCMCIA_PC1RST |
BCSR_PCMCIA_PC1DRVEN |
BCSR_PCMCIA_PC1VPP |
BCSR_PCMCIA_PC1VCC);
@@ -138,21 +138,21 @@
state->bvd1=1;
state->bvd2=1;
- state->wrprot=0;
+ state->wrprot=0;
}
-static int
+static int
db1x00_pcmcia_configure_socket(struct au1000_pcmcia_socket *skt, struct
socket_state_t *state)
{
u16 pwr;
int sock = skt->nr;
- debug("config_skt %d Vcc %dV Vpp %dV, reset %d\n",
- sock, state->Vcc, state->Vpp,
+ debug("config_skt %d Vcc %dV Vpp %dV, reset %d\n",
+ sock, state->Vcc, state->Vpp,
state->flags & SS_RESET);
/* pcmcia reg was set to zero at init time. Be careful when
- * initializing a socket not to wipe out the settings of the
+ * initializing a socket not to wipe out the settings of the
* other socket.
*/
pwr = bcsr->pcmcia;
@@ -177,9 +177,9 @@
case 33:
default:
pwr |= SET_VCC_VPP(0,0,sock);
- printk("%s: bad Vcc/Vpp (%d:%d)\n",
- __FUNCTION__,
- state->Vcc,
+ printk("%s: bad Vcc/Vpp (%d:%d)\n",
+ __FUNCTION__,
+ state->Vcc,
state->Vpp);
break;
}
@@ -198,16 +198,16 @@
case 50:
default:
pwr |= SET_VCC_VPP(0,0,sock);
- printk("%s: bad Vcc/Vpp (%d:%d)\n",
- __FUNCTION__,
- state->Vcc,
+ printk("%s: bad Vcc/Vpp (%d:%d)\n",
+ __FUNCTION__,
+ state->Vcc,
state->Vpp);
break;
}
break;
default: /* what's this ? */
pwr |= SET_VCC_VPP(0,0,sock);
- printk(KERN_ERR "%s: bad Vcc %d\n",
+ printk(KERN_ERR "%s: bad Vcc %d\n",
__FUNCTION__, state->Vcc);
break;
}
@@ -266,7 +266,7 @@
/* nothing to do for now */
}
-struct pcmcia_low_level db1x00_pcmcia_ops = {
+struct pcmcia_low_level db1x00_pcmcia_ops = {
.owner = THIS_MODULE,
.hw_init = db1x00_pcmcia_hw_init,
diff -urN linux/drivers/pcmcia/au1000_generic.c
linux/drivers/pcmcia/au1000_generic.c
--- linux/drivers/pcmcia/au1000_generic.c 2005/04/29 11:15:09 1.20
+++ linux/drivers/pcmcia/au1000_generic.c 2005/07/10 10:29:01 1.21
@@ -7,8 +7,8 @@
* ppopov@embeddedalley.com or source@mvista.com
*
* Copyright 2004 Pete Popov, Embedded Alley Solutions, Inc.
- * Updated the driver to 2.6. Followed the sa11xx API and largely
- * copied many of the hardware independent functions.
+ * Updated the driver to 2.6. Followed the sa11xx API and largely
+ * copied many of the hardware independent functions.
*
* ########################################################################
*
@@ -78,7 +78,7 @@
au1x_board_init,
};
-static int
+static int
au1x00_pcmcia_skt_state(struct au1000_pcmcia_socket *skt)
{
struct pcmcia_state state;
@@ -243,7 +243,7 @@
/* au1x00_pcmcia_get_socket()
* Implements the get_socket() operation for the in-kernel PCMCIA
- * service (formerly SS_GetSocket in Card Services). Not a very
+ * service (formerly SS_GetSocket in Card Services). Not a very
* exciting routine.
*
* Returns: 0
@@ -342,7 +342,7 @@
map->static_start = skt->phys_mem + map->card_start;
}
- debug("set_mem_map %d start %08lx card_start %08x\n",
+ debug("set_mem_map %d start %08lx card_start %08x\n",
map->map, map->static_start, map->card_start);
return 0;
@@ -409,11 +409,11 @@
skt->res_mem.flags = IORESOURCE_MEM;
skt->res_attr.name = "attribute";
skt->res_attr.flags = IORESOURCE_MEM;
-
+
/*
* PCMCIA client drivers use the inb/outb macros to access the
- * IO registers. Since mips_io_port_base is added to the
- * access address of the mips implementation of inb/outb,
+ * IO registers. Since mips_io_port_base is added to the
+ * access address of the mips implementation of inb/outb,
* we need to subtract it here because we want to access the
* I/O or MEM address directly, without going through this
* "mips_io_port_base" mechanism.
@@ -459,7 +459,7 @@
do {
struct au1000_pcmcia_socket *skt = PCMCIA_SOCKET(i);
-
+
del_timer_sync(&skt->poll_timer);
pcmcia_unregister_socket(&skt->socket);
out_err:
diff -urN linux/drivers/pcmcia/au1000_generic.h
linux/drivers/pcmcia/au1000_generic.h
--- linux/drivers/pcmcia/au1000_generic.h 2005/04/14 11:31:26 1.7
+++ linux/drivers/pcmcia/au1000_generic.h 2005/07/10 10:29:01 1.8
@@ -63,21 +63,21 @@
struct pcmcia_state {
unsigned detect: 1,
- ready: 1,
- wrprot: 1,
+ ready: 1,
+ wrprot: 1,
bvd1: 1,
bvd2: 1,
- vs_3v: 1,
- vs_Xv: 1;
+ vs_3v: 1,
+ vs_Xv: 1;
};
struct pcmcia_configure {
unsigned sock: 8,
- vcc: 8,
- vpp: 8,
- output: 1,
- speaker: 1,
- reset: 1;
+ vcc: 8,
+ vpp: 8,
+ output: 1,
+ speaker: 1,
+ reset: 1;
};
struct pcmcia_irqs {
@@ -90,7 +90,7 @@
struct au1000_pcmcia_socket {
struct pcmcia_socket socket;
- /*
+ /*
* Info from low level handler
*/
struct device *dev;
diff -urN linux/drivers/pcmcia/au1000_xxs1500.c
linux/drivers/pcmcia/au1000_xxs1500.c
--- linux/drivers/pcmcia/au1000_xxs1500.c 2005/04/14 11:31:26 1.3
+++ linux/drivers/pcmcia/au1000_xxs1500.c 2005/07/10 10:29:01 1.4
@@ -73,14 +73,14 @@
au_sync_delay(100);
/* assert reset */
- au_writel(au_readl(GPIO2_PINSTATE) | (1<<4)|(1<<20),
+ au_writel(au_readl(GPIO2_PINSTATE) | (1<<4)|(1<<20),
GPIO2_OUTPUT);
au_sync_delay(100);
return 0;
}
-static int
+static int
xxs1500_pcmcia_socket_state(unsigned sock, struct pcmcia_state *state)
{
u32 inserted; u32 vs;
@@ -122,7 +122,7 @@
state->bvd1= gpio2 & (1<<10);
state->bvd2 = gpio2 & (1<<11);
- state->wrprot=0;
+ state->wrprot=0;
return 1;
}
@@ -136,13 +136,13 @@
}
-static int
+static int
xxs1500_pcmcia_configure_socket(const struct pcmcia_configure *configure)
{
if(configure->sock > PCMCIA_MAX_SOCK) return -1;
- DEBUG("Vcc %dV Vpp %dV, reset %d\n",
+ DEBUG("Vcc %dV Vpp %dV, reset %d\n",
configure->vcc, configure->vpp, configure->reset);
switch(configure->vcc){
@@ -166,22 +166,22 @@
if (!configure->reset) {
DEBUG("deassert reset\n");
- au_writel((au_readl(GPIO2_PINSTATE) & ~(1<<4))|(1<<20),
+ au_writel((au_readl(GPIO2_PINSTATE) & ~(1<<4))|(1<<20),
GPIO2_OUTPUT);
au_sync_delay(100);
- au_writel((au_readl(GPIO2_PINSTATE) & ~(1<<5))|(1<<21),
+ au_writel((au_readl(GPIO2_PINSTATE) & ~(1<<5))|(1<<21),
GPIO2_OUTPUT);
}
else {
DEBUG("assert reset\n");
- au_writel(au_readl(GPIO2_PINSTATE) | (1<<4)|(1<<20),
+ au_writel(au_readl(GPIO2_PINSTATE) | (1<<4)|(1<<20),
GPIO2_OUTPUT);
}
au_sync_delay(100);
return 0;
}
-struct pcmcia_low_level xxs1500_pcmcia_ops = {
+struct pcmcia_low_level xxs1500_pcmcia_ops = {
xxs1500_pcmcia_init,
xxs1500_pcmcia_shutdown,
xxs1500_pcmcia_socket_state,
diff -urN linux/drivers/pcmcia/vrc4173_cardu.c
linux/drivers/pcmcia/vrc4173_cardu.c
--- linux/drivers/pcmcia/vrc4173_cardu.c 2005/04/08 18:58:22 1.5
+++ linux/drivers/pcmcia/vrc4173_cardu.c 2005/07/10 10:29:01 1.6
@@ -295,7 +295,7 @@
map = io->map;
if (map > 1)
- return -EINVAL;
+ return -EINVAL;
io->start = exca_readw(socket, IO_WIN_SA(map));
io->stop = exca_readw(socket, IO_WIN_EA(map));
@@ -461,7 +461,7 @@
status = exca_readb(socket, IF_STATUS);
csc = exca_readb(socket, CARD_SC);
- if ((csc & CARD_DT_CHG) &&
+ if ((csc & CARD_DT_CHG) &&
((status & (CARD_DETECT1|CARD_DETECT2)) ==
(CARD_DETECT1|CARD_DETECT2)))
events |= SS_DETECT;
diff -urN linux/drivers/pcmcia/vrc4173_cardu.h
linux/drivers/pcmcia/vrc4173_cardu.h
--- linux/drivers/pcmcia/vrc4173_cardu.h 2003/09/09 11:40:32 1.3
+++ linux/drivers/pcmcia/vrc4173_cardu.h 2005/07/10 10:29:01 1.4
@@ -136,8 +136,8 @@
#define IO_WIN_CNT 0x007
#define IO_WIN_CNT_MASK(x) (0x03 << ((x) << 2))
- #define IO_WIN_DATA_AUTOSZ(x) (0x02 << ((x) << 2))
- #define IO_WIN_DATA_16BIT(x) (0x01 << ((x) << 2))
+ #define IO_WIN_DATA_AUTOSZ(x) (0x02 << ((x) << 2))
+ #define IO_WIN_DATA_16BIT(x) (0x01 << ((x) << 2))
#define IO_WIN_SA(x) (0x008 + ((x) << 2))
#define IO_WIN_EA(x) (0x00a + ((x) << 2))
diff -urN linux/drivers/tc/zs.h linux/drivers/tc/zs.h
--- linux/drivers/tc/zs.h 2005/06/13 19:58:52 1.10
+++ linux/drivers/tc/zs.h 2005/07/10 10:29:02 1.11
@@ -44,24 +44,24 @@
*/
#define ZILOG_HUP_NOTIFY 0x0001 /* Notify getty on hangups and closes
on the callout port */
-#define ZILOG_FOURPORT 0x0002 /* Set OU1, OUT2 per AST Fourport settings */
+#define ZILOG_FOURPORT 0x0002 /* Set OU1, OUT2 per AST Fourport settings */
#define ZILOG_SAK 0x0004 /* Secure Attention Key (Orange book) */
#define ZILOG_SPLIT_TERMIOS 0x0008 /* Separate termios for dialin/callout */
#define ZILOG_SPD_MASK 0x0030
#define ZILOG_SPD_HI 0x0010 /* Use 56000 instead of 38400 bps */
-#define ZILOG_SPD_VHI 0x0020 /* Use 115200 instead of 38400 bps */
-#define ZILOG_SPD_CUST 0x0030 /* Use user-specified divisor */
+#define ZILOG_SPD_VHI 0x0020 /* Use 115200 instead of 38400 bps */
+#define ZILOG_SPD_CUST 0x0030 /* Use user-specified divisor */
#define ZILOG_SKIP_TEST 0x0040 /* Skip UART test during
autoconfiguration */
-#define ZILOG_AUTO_IRQ 0x0080 /* Do automatic IRQ during autoconfiguration */
+#define ZILOG_AUTO_IRQ 0x0080 /* Do automatic IRQ during autoconfiguration */
#define ZILOG_SESSION_LOCKOUT 0x0100 /* Lock out cua opens based on session */
#define ZILOG_PGRP_LOCKOUT 0x0200 /* Lock out cua opens based on pgrp */
#define ZILOG_CALLOUT_NOHUP 0x0400 /* Don't do hangups for cua device */
#define ZILOG_FLAGS 0x0FFF /* Possible legal ZILOG flags */
-#define ZILOG_USR_MASK 0x0430 /* Legal flags that non-privileged
+#define ZILOG_USR_MASK 0x0430 /* Legal flags that non-privileged
* users can set or reset */
/* Internal flags used only by kernel/chr_drv/serial.c */
diff -urN linux/drivers/usb/host/ohci-au1xxx.c
linux/drivers/usb/host/ohci-au1xxx.c
--- linux/drivers/usb/host/ohci-au1xxx.c 2005/04/03 20:39:19 1.5
+++ linux/drivers/usb/host/ohci-au1xxx.c 2005/07/10 10:29:02 1.6
@@ -51,7 +51,7 @@
/* wait for reset complete (read register twice; see au1500 errata) */
while (au_readl(USB_HOST_CONFIG),
- !(au_readl(USB_HOST_CONFIG) & USBH_ENABLE_RD))
+ !(au_readl(USB_HOST_CONFIG) & USBH_ENABLE_RD))
udelay(1000);
printk(KERN_DEBUG __FILE__
@@ -161,7 +161,7 @@
int ret;
ohci_dbg (ohci, "ohci_au1xxx_start, ohci:%p", ohci);
-
+
if ((ret = ohci_init (ohci)) < 0)
return ret;
diff -urN linux/drivers/video/bt431.h linux/drivers/video/bt431.h
--- linux/drivers/video/bt431.h 2003/09/23 12:11:09 1.2
+++ linux/drivers/video/bt431.h 2005/07/10 10:29:02 1.3
@@ -176,7 +176,7 @@
{
/*
* Magic from the MACH sources.
- *
+ *
* Cx = x + D + H - P
* P = 37 if 1:1, 52 if 4:1, 57 if 5:1
* D = pixel skew between outdata and external data
diff -urN linux/drivers/video/gbefb.c linux/drivers/video/gbefb.c
--- linux/drivers/video/gbefb.c 2005/03/04 19:40:45 1.14
+++ linux/drivers/video/gbefb.c 2005/07/10 10:29:02 1.15
@@ -1065,7 +1065,7 @@
device_remove_file(dev, &dev_attr_revision);
}
-static void gbefb_create_sysfs(struct device *dev)
+static void gbefb_create_sysfs(struct device *dev)
{
device_create_file(dev, &dev_attr_size);
device_create_file(dev, &dev_attr_revision);
diff -urN linux/drivers/video/maxinefb.c linux/drivers/video/maxinefb.c
--- linux/drivers/video/maxinefb.c 2004/10/12 01:45:47 1.18
+++ linux/drivers/video/maxinefb.c 2005/07/10 10:29:02 1.19
@@ -109,7 +109,7 @@
.owner = THIS_MODULE,
.fb_get_fix = gen_get_fix,
.fb_get_var = gen_get_var,
- .fb_setcolreg = maxinefb_setcolreg,
+ .fb_setcolreg = maxinefb_setcolreg,
.fb_fillrect = cfb_fillrect,
.fb_copyarea = cfb_copyarea,
.fb_imageblit = cfb_imageblit,
diff -urN linux/drivers/video/pmag-aa-fb.c linux/drivers/video/pmag-aa-fb.c
--- linux/drivers/video/pmag-aa-fb.c 2005/07/01 16:10:59 1.4
+++ linux/drivers/video/pmag-aa-fb.c 2005/07/10 10:29:02 1.5
@@ -478,7 +478,7 @@
return 0;
}
-/*
+/*
* Initialise the framebuffer.
*/
int __init pmagaafb_init(void)
diff -urN linux/drivers/video/pmag-ba-fb.c linux/drivers/video/pmag-ba-fb.c
--- linux/drivers/video/pmag-ba-fb.c 2005/07/01 16:10:59 1.20
+++ linux/drivers/video/pmag-ba-fb.c 2005/07/10 10:29:02 1.21
@@ -66,7 +66,7 @@
.accel = FB_ACCEL_NONE,
.vmode = FB_VMODE_NONINTERLACED,
};
-
+
static struct fb_fix_screeninfo pmagbafb_fix = {
.id = "PMAG-BA",
.smem_len = (1024 * 864),
diff -urN linux/include/asm-mips/ucontext.h linux/include/asm-mips/ucontext.h
--- linux/include/asm-mips/ucontext.h 2005/05/31 11:49:19 1.6
+++ linux/include/asm-mips/ucontext.h 2005/07/10 10:29:02 1.7
@@ -11,11 +11,11 @@
#define _ASM_UCONTEXT_H
struct ucontext {
- unsigned long uc_flags;
- struct ucontext *uc_link;
- stack_t uc_stack;
- struct sigcontext uc_mcontext;
- sigset_t uc_sigmask; /* mask last for extensibility */
+ unsigned long uc_flags;
+ struct ucontext *uc_link;
+ stack_t uc_stack;
+ struct sigcontext uc_mcontext;
+ sigset_t uc_sigmask; /* mask last for extensibility */
};
#endif /* _ASM_UCONTEXT_H */
diff -urN linux/include/asm-mips/mips-boards/msc01_pci.h
linux/include/asm-mips/mips-boards/msc01_pci.h
--- linux/include/asm-mips/mips-boards/msc01_pci.h 2005/02/01 20:19:03
1.5
+++ linux/include/asm-mips/mips-boards/msc01_pci.h 2005/07/10 10:29:02
1.6
@@ -30,22 +30,22 @@
#define MSC01_PCI_CFGADDR_OFS 0x0610
#define MSC01_PCI_CFGDATA_OFS 0x0618
#define MSC01_PCI_IACK_OFS 0x0620
-#define MSC01_PCI_HEAD0_OFS 0x2000 /* DevID, VendorID */
-#define MSC01_PCI_HEAD1_OFS 0x2008 /* Status, Command */
-#define MSC01_PCI_HEAD2_OFS 0x2010 /* Class code, RevID */
-#define MSC01_PCI_HEAD3_OFS 0x2018 /* bist, header, latency */
-#define MSC01_PCI_HEAD4_OFS 0x2020 /* BAR 0 */
-#define MSC01_PCI_HEAD5_OFS 0x2028 /* BAR 1 */
-#define MSC01_PCI_HEAD6_OFS 0x2030 /* BAR 2 */
-#define MSC01_PCI_HEAD7_OFS 0x2038 /* BAR 3 */
-#define MSC01_PCI_HEAD8_OFS 0x2040 /* BAR 4 */
-#define MSC01_PCI_HEAD9_OFS 0x2048 /* BAR 5 */
-#define MSC01_PCI_HEAD10_OFS 0x2050 /* CardBus CIS Ptr */
-#define MSC01_PCI_HEAD11_OFS 0x2058 /* SubSystem ID, -VendorID */
-#define MSC01_PCI_HEAD12_OFS 0x2060 /* ROM BAR */
-#define MSC01_PCI_HEAD13_OFS 0x2068 /* Capabilities ptr */
-#define MSC01_PCI_HEAD14_OFS 0x2070 /* reserved */
-#define MSC01_PCI_HEAD15_OFS 0x2078 /* Maxl, ming, intpin, int */
+#define MSC01_PCI_HEAD0_OFS 0x2000 /* DevID, VendorID */
+#define MSC01_PCI_HEAD1_OFS 0x2008 /* Status, Command */
+#define MSC01_PCI_HEAD2_OFS 0x2010 /* Class code, RevID */
+#define MSC01_PCI_HEAD3_OFS 0x2018 /* bist, header, latency */
+#define MSC01_PCI_HEAD4_OFS 0x2020 /* BAR 0 */
+#define MSC01_PCI_HEAD5_OFS 0x2028 /* BAR 1 */
+#define MSC01_PCI_HEAD6_OFS 0x2030 /* BAR 2 */
+#define MSC01_PCI_HEAD7_OFS 0x2038 /* BAR 3 */
+#define MSC01_PCI_HEAD8_OFS 0x2040 /* BAR 4 */
+#define MSC01_PCI_HEAD9_OFS 0x2048 /* BAR 5 */
+#define MSC01_PCI_HEAD10_OFS 0x2050 /* CardBus CIS Ptr */
+#define MSC01_PCI_HEAD11_OFS 0x2058 /* SubSystem ID, -VendorID */
+#define MSC01_PCI_HEAD12_OFS 0x2060 /* ROM BAR */
+#define MSC01_PCI_HEAD13_OFS 0x2068 /* Capabilities ptr */
+#define MSC01_PCI_HEAD14_OFS 0x2070 /* reserved */
+#define MSC01_PCI_HEAD15_OFS 0x2078 /* Maxl, ming, intpin, int */
#define MSC01_PCI_BAR0_OFS 0x2220
#define MSC01_PCI_CFG_OFS 0x2380
#define MSC01_PCI_SWAP_OFS 0x2388
@@ -87,73 +87,73 @@
#define MSC01_PCI_P2SCMAPL_MAP_SHF 24
#define MSC01_PCI_P2SCMAPL_MAP_MSK 0xff000000
-#define MSC01_PCI_INTCFG_RST_SHF 10
-#define MSC01_PCI_INTCFG_RST_MSK 0x00000400
-#define MSC01_PCI_INTCFG_RST_BIT 0x00000400
-#define MSC01_PCI_INTCFG_MWE_SHF 9
-#define MSC01_PCI_INTCFG_MWE_MSK 0x00000200
-#define MSC01_PCI_INTCFG_MWE_BIT 0x00000200
-#define MSC01_PCI_INTCFG_DTO_SHF 8
-#define MSC01_PCI_INTCFG_DTO_MSK 0x00000100
-#define MSC01_PCI_INTCFG_DTO_BIT 0x00000100
-#define MSC01_PCI_INTCFG_MA_SHF 7
-#define MSC01_PCI_INTCFG_MA_MSK 0x00000080
-#define MSC01_PCI_INTCFG_MA_BIT 0x00000080
-#define MSC01_PCI_INTCFG_TA_SHF 6
-#define MSC01_PCI_INTCFG_TA_MSK 0x00000040
-#define MSC01_PCI_INTCFG_TA_BIT 0x00000040
-#define MSC01_PCI_INTCFG_RTY_SHF 5
-#define MSC01_PCI_INTCFG_RTY_MSK 0x00000020
-#define MSC01_PCI_INTCFG_RTY_BIT 0x00000020
-#define MSC01_PCI_INTCFG_MWP_SHF 4
-#define MSC01_PCI_INTCFG_MWP_MSK 0x00000010
-#define MSC01_PCI_INTCFG_MWP_BIT 0x00000010
-#define MSC01_PCI_INTCFG_MRP_SHF 3
-#define MSC01_PCI_INTCFG_MRP_MSK 0x00000008
-#define MSC01_PCI_INTCFG_MRP_BIT 0x00000008
-#define MSC01_PCI_INTCFG_SWP_SHF 2
-#define MSC01_PCI_INTCFG_SWP_MSK 0x00000004
-#define MSC01_PCI_INTCFG_SWP_BIT 0x00000004
-#define MSC01_PCI_INTCFG_SRP_SHF 1
-#define MSC01_PCI_INTCFG_SRP_MSK 0x00000002
-#define MSC01_PCI_INTCFG_SRP_BIT 0x00000002
-#define MSC01_PCI_INTCFG_SE_SHF 0
-#define MSC01_PCI_INTCFG_SE_MSK 0x00000001
-#define MSC01_PCI_INTCFG_SE_BIT 0x00000001
-
-#define MSC01_PCI_INTSTAT_RST_SHF 10
-#define MSC01_PCI_INTSTAT_RST_MSK 0x00000400
-#define MSC01_PCI_INTSTAT_RST_BIT 0x00000400
-#define MSC01_PCI_INTSTAT_MWE_SHF 9
-#define MSC01_PCI_INTSTAT_MWE_MSK 0x00000200
-#define MSC01_PCI_INTSTAT_MWE_BIT 0x00000200
-#define MSC01_PCI_INTSTAT_DTO_SHF 8
-#define MSC01_PCI_INTSTAT_DTO_MSK 0x00000100
-#define MSC01_PCI_INTSTAT_DTO_BIT 0x00000100
-#define MSC01_PCI_INTSTAT_MA_SHF 7
-#define MSC01_PCI_INTSTAT_MA_MSK 0x00000080
-#define MSC01_PCI_INTSTAT_MA_BIT 0x00000080
-#define MSC01_PCI_INTSTAT_TA_SHF 6
-#define MSC01_PCI_INTSTAT_TA_MSK 0x00000040
-#define MSC01_PCI_INTSTAT_TA_BIT 0x00000040
-#define MSC01_PCI_INTSTAT_RTY_SHF 5
-#define MSC01_PCI_INTSTAT_RTY_MSK 0x00000020
-#define MSC01_PCI_INTSTAT_RTY_BIT 0x00000020
-#define MSC01_PCI_INTSTAT_MWP_SHF 4
-#define MSC01_PCI_INTSTAT_MWP_MSK 0x00000010
-#define MSC01_PCI_INTSTAT_MWP_BIT 0x00000010
-#define MSC01_PCI_INTSTAT_MRP_SHF 3
-#define MSC01_PCI_INTSTAT_MRP_MSK 0x00000008
-#define MSC01_PCI_INTSTAT_MRP_BIT 0x00000008
-#define MSC01_PCI_INTSTAT_SWP_SHF 2
-#define MSC01_PCI_INTSTAT_SWP_MSK 0x00000004
-#define MSC01_PCI_INTSTAT_SWP_BIT 0x00000004
-#define MSC01_PCI_INTSTAT_SRP_SHF 1
-#define MSC01_PCI_INTSTAT_SRP_MSK 0x00000002
-#define MSC01_PCI_INTSTAT_SRP_BIT 0x00000002
-#define MSC01_PCI_INTSTAT_SE_SHF 0
-#define MSC01_PCI_INTSTAT_SE_MSK 0x00000001
-#define MSC01_PCI_INTSTAT_SE_BIT 0x00000001
+#define MSC01_PCI_INTCFG_RST_SHF 10
+#define MSC01_PCI_INTCFG_RST_MSK 0x00000400
+#define MSC01_PCI_INTCFG_RST_BIT 0x00000400
+#define MSC01_PCI_INTCFG_MWE_SHF 9
+#define MSC01_PCI_INTCFG_MWE_MSK 0x00000200
+#define MSC01_PCI_INTCFG_MWE_BIT 0x00000200
+#define MSC01_PCI_INTCFG_DTO_SHF 8
+#define MSC01_PCI_INTCFG_DTO_MSK 0x00000100
+#define MSC01_PCI_INTCFG_DTO_BIT 0x00000100
+#define MSC01_PCI_INTCFG_MA_SHF 7
+#define MSC01_PCI_INTCFG_MA_MSK 0x00000080
+#define MSC01_PCI_INTCFG_MA_BIT 0x00000080
+#define MSC01_PCI_INTCFG_TA_SHF 6
+#define MSC01_PCI_INTCFG_TA_MSK 0x00000040
+#define MSC01_PCI_INTCFG_TA_BIT 0x00000040
+#define MSC01_PCI_INTCFG_RTY_SHF 5
+#define MSC01_PCI_INTCFG_RTY_MSK 0x00000020
+#define MSC01_PCI_INTCFG_RTY_BIT 0x00000020
+#define MSC01_PCI_INTCFG_MWP_SHF 4
+#define MSC01_PCI_INTCFG_MWP_MSK 0x00000010
+#define MSC01_PCI_INTCFG_MWP_BIT 0x00000010
+#define MSC01_PCI_INTCFG_MRP_SHF 3
+#define MSC01_PCI_INTCFG_MRP_MSK 0x00000008
+#define MSC01_PCI_INTCFG_MRP_BIT 0x00000008
+#define MSC01_PCI_INTCFG_SWP_SHF 2
+#define MSC01_PCI_INTCFG_SWP_MSK 0x00000004
+#define MSC01_PCI_INTCFG_SWP_BIT 0x00000004
+#define MSC01_PCI_INTCFG_SRP_SHF 1
+#define MSC01_PCI_INTCFG_SRP_MSK 0x00000002
+#define MSC01_PCI_INTCFG_SRP_BIT 0x00000002
+#define MSC01_PCI_INTCFG_SE_SHF 0
+#define MSC01_PCI_INTCFG_SE_MSK 0x00000001
+#define MSC01_PCI_INTCFG_SE_BIT 0x00000001
+
+#define MSC01_PCI_INTSTAT_RST_SHF 10
+#define MSC01_PCI_INTSTAT_RST_MSK 0x00000400
+#define MSC01_PCI_INTSTAT_RST_BIT 0x00000400
+#define MSC01_PCI_INTSTAT_MWE_SHF 9
+#define MSC01_PCI_INTSTAT_MWE_MSK 0x00000200
+#define MSC01_PCI_INTSTAT_MWE_BIT 0x00000200
+#define MSC01_PCI_INTSTAT_DTO_SHF 8
+#define MSC01_PCI_INTSTAT_DTO_MSK 0x00000100
+#define MSC01_PCI_INTSTAT_DTO_BIT 0x00000100
+#define MSC01_PCI_INTSTAT_MA_SHF 7
+#define MSC01_PCI_INTSTAT_MA_MSK 0x00000080
+#define MSC01_PCI_INTSTAT_MA_BIT 0x00000080
+#define MSC01_PCI_INTSTAT_TA_SHF 6
+#define MSC01_PCI_INTSTAT_TA_MSK 0x00000040
+#define MSC01_PCI_INTSTAT_TA_BIT 0x00000040
+#define MSC01_PCI_INTSTAT_RTY_SHF 5
+#define MSC01_PCI_INTSTAT_RTY_MSK 0x00000020
+#define MSC01_PCI_INTSTAT_RTY_BIT 0x00000020
+#define MSC01_PCI_INTSTAT_MWP_SHF 4
+#define MSC01_PCI_INTSTAT_MWP_MSK 0x00000010
+#define MSC01_PCI_INTSTAT_MWP_BIT 0x00000010
+#define MSC01_PCI_INTSTAT_MRP_SHF 3
+#define MSC01_PCI_INTSTAT_MRP_MSK 0x00000008
+#define MSC01_PCI_INTSTAT_MRP_BIT 0x00000008
+#define MSC01_PCI_INTSTAT_SWP_SHF 2
+#define MSC01_PCI_INTSTAT_SWP_MSK 0x00000004
+#define MSC01_PCI_INTSTAT_SWP_BIT 0x00000004
+#define MSC01_PCI_INTSTAT_SRP_SHF 1
+#define MSC01_PCI_INTSTAT_SRP_MSK 0x00000002
+#define MSC01_PCI_INTSTAT_SRP_BIT 0x00000002
+#define MSC01_PCI_INTSTAT_SE_SHF 0
+#define MSC01_PCI_INTSTAT_SE_MSK 0x00000001
+#define MSC01_PCI_INTSTAT_SE_BIT 0x00000001
#define MSC01_PCI_CFGADDR_BNUM_SHF 16
#define MSC01_PCI_CFGADDR_BNUM_MSK 0x00ff0000
@@ -220,19 +220,19 @@
* Registers absolute addresses
*/
-#define MSC01_PCI_ID (MSC01_PCI_REG_BASE + MSC01_PCI_ID_OFS)
-#define MSC01_PCI_SC2PMBASL (MSC01_PCI_REG_BASE + MSC01_PCI_SC2PMBASL_OFS)
-#define MSC01_PCI_SC2PMMSKL (MSC01_PCI_REG_BASE + MSC01_PCI_SC2PMMSKL_OFS)
-#define MSC01_PCI_SC2PMMAPL (MSC01_PCI_REG_BASE + MSC01_PCI_SC2PMMAPL_OFS)
-#define MSC01_PCI_SC2PIOBASL (MSC01_PCI_REG_BASE + MSC01_PCI_SC2PIOBASL_OFS)
-#define MSC01_PCI_SC2PIOMSKL (MSC01_PCI_REG_BASE + MSC01_PCI_SC2PIOMSKL_OFS)
-#define MSC01_PCI_SC2PIOMAPL (MSC01_PCI_REG_BASE + MSC01_PCI_SC2PIOMAPL_OFS)
-#define MSC01_PCI_P2SCMSKL (MSC01_PCI_REG_BASE + MSC01_PCI_P2SCMSKL_OFS)
-#define MSC01_PCI_P2SCMAPL (MSC01_PCI_REG_BASE + MSC01_PCI_P2SCMAPL_OFS)
-#define MSC01_PCI_INTCFG (MSC01_PCI_REG_BASE + MSC01_PCI_INTCFG_OFS)
-#define MSC01_PCI_INTSTAT (MSC01_PCI_REG_BASE + MSC01_PCI_INTSTAT_OFS)
-#define MSC01_PCI_CFGADDR (MSC01_PCI_REG_BASE + MSC01_PCI_CFGADDR_OFS)
-#define MSC01_PCI_CFGDATA (MSC01_PCI_REG_BASE + MSC01_PCI_CFGDATA_OFS)
+#define MSC01_PCI_ID (MSC01_PCI_REG_BASE + MSC01_PCI_ID_OFS)
+#define MSC01_PCI_SC2PMBASL (MSC01_PCI_REG_BASE + MSC01_PCI_SC2PMBASL_OFS)
+#define MSC01_PCI_SC2PMMSKL (MSC01_PCI_REG_BASE + MSC01_PCI_SC2PMMSKL_OFS)
+#define MSC01_PCI_SC2PMMAPL (MSC01_PCI_REG_BASE + MSC01_PCI_SC2PMMAPL_OFS)
+#define MSC01_PCI_SC2PIOBASL (MSC01_PCI_REG_BASE + MSC01_PCI_SC2PIOBASL_OFS)
+#define MSC01_PCI_SC2PIOMSKL (MSC01_PCI_REG_BASE + MSC01_PCI_SC2PIOMSKL_OFS)
+#define MSC01_PCI_SC2PIOMAPL (MSC01_PCI_REG_BASE + MSC01_PCI_SC2PIOMAPL_OFS)
+#define MSC01_PCI_P2SCMSKL (MSC01_PCI_REG_BASE + MSC01_PCI_P2SCMSKL_OFS)
+#define MSC01_PCI_P2SCMAPL (MSC01_PCI_REG_BASE + MSC01_PCI_P2SCMAPL_OFS)
+#define MSC01_PCI_INTCFG (MSC01_PCI_REG_BASE + MSC01_PCI_INTCFG_OFS)
+#define MSC01_PCI_INTSTAT (MSC01_PCI_REG_BASE + MSC01_PCI_INTSTAT_OFS)
+#define MSC01_PCI_CFGADDR (MSC01_PCI_REG_BASE + MSC01_PCI_CFGADDR_OFS)
+#define MSC01_PCI_CFGDATA (MSC01_PCI_REG_BASE + MSC01_PCI_CFGDATA_OFS)
#define MSC01_PCI_IACK (MSC01_PCI_REG_BASE + MSC01_PCI_IACK_OFS)
#define MSC01_PCI_HEAD0 (MSC01_PCI_REG_BASE +
MSC01_PCI_HEAD0_OFS)
#define MSC01_PCI_HEAD1 (MSC01_PCI_REG_BASE +
MSC01_PCI_HEAD1_OFS)
@@ -249,7 +249,7 @@
#define MSC01_PCI_HEAD12 (MSC01_PCI_REG_BASE + MSC01_PCI_HEAD11_OFS)
#define MSC01_PCI_HEAD13 (MSC01_PCI_REG_BASE + MSC01_PCI_HEAD11_OFS)
#define MSC01_PCI_HEAD14 (MSC01_PCI_REG_BASE + MSC01_PCI_HEAD11_OFS)
-#define MSC01_PCI_HEAD15 (MSC01_PCI_REG_BASE + MSC01_PCI_HEAD11_OFS)
+#define MSC01_PCI_HEAD15 (MSC01_PCI_REG_BASE + MSC01_PCI_HEAD11_OFS)
#define MSC01_PCI_BAR0 (MSC01_PCI_REG_BASE + MSC01_PCI_BAR0_OFS)
#define MSC01_PCI_CFG (MSC01_PCI_REG_BASE + MSC01_PCI_CFG_OFS)
#define MSC01_PCI_SWAP (MSC01_PCI_REG_BASE + MSC01_PCI_SWAP_OFS)
diff -urN linux/sound/mips/au1x00.c linux/sound/mips/au1x00.c
--- linux/sound/mips/au1x00.c 2004/10/27 05:10:46 1.1
+++ linux/sound/mips/au1x00.c 2005/07/10 10:29:03 1.2
@@ -102,7 +102,7 @@
typedef struct snd_card_au1000 {
snd_card_t *card;
au1000_ac97_reg_t volatile *ac97_ioport;
-
+
struct resource *ac97_res_port;
spinlock_t ac97_lock;
ac97_t *ac97;
@@ -166,7 +166,7 @@
}
}
-static void
+static void
au1000_dma_start(audio_stream_t *stream)
{
snd_pcm_substream_t *substream = stream->substream;
@@ -179,12 +179,12 @@
if (stream->buffer == NULL) {
dma_start = virt_to_phys(runtime->dma_area);
- stream->period_size = frames_to_bytes(runtime,
+ stream->period_size = frames_to_bytes(runtime,
runtime->period_size);
stream->buffer = kmalloc(sizeof(au1000_period_t), GFP_KERNEL);
pointer = stream->buffer;
for (i = 0 ; i < runtime->periods ; i++) {
- pointer->start = (u32)(dma_start +
+ pointer->start = (u32)(dma_start +
(i * stream->period_size));
pointer->relative_end = (u32)
(((i+1) * stream->period_size) - 0x1);
@@ -195,7 +195,7 @@
}
}
pointer->next = stream->buffer;
-
+
spin_lock_irqsave(&stream->dma_lock, flags);
init_dma(stream->dma);
if (get_dma_active_buffer(stream->dma) == 0) {
@@ -247,7 +247,7 @@
spin_lock(&stream->dma_lock);
break;
case (~DMA_D0 & ~DMA_D1):
- printk(KERN_ERR "DMA %d empty irq.\n",stream->dma);
+ printk(KERN_ERR "DMA %d empty irq.\n",stream->dma);
}
spin_unlock(&stream->dma_lock);
snd_pcm_period_elapsed(substream);
@@ -268,7 +268,7 @@
.info = (SNDRV_PCM_INFO_INTERLEAVED | \
SNDRV_PCM_INFO_MMAP |
SNDRV_PCM_INFO_MMAP_VALID),
.formats = SNDRV_PCM_FMTBIT_S16_LE,
- .rates = (SNDRV_PCM_RATE_8000 | SNDRV_PCM_RATE_11025 |
+ .rates = (SNDRV_PCM_RATE_8000 | SNDRV_PCM_RATE_11025 |
SNDRV_PCM_RATE_16000 | SNDRV_PCM_RATE_22050),
.rate_min = 8000,
.rate_max = 22050,
@@ -364,7 +364,7 @@
{
audio_stream_t *stream = substream->private_data;
int err = 0;
-
+
switch (cmd) {
case SNDRV_PCM_TRIGGER_START:
au1000_dma_start(stream);
@@ -435,7 +435,7 @@
&snd_card_au1000_playback_ops);
snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE,
&snd_card_au1000_capture_ops);
-
+
pcm->private_data = au1000;
pcm->info_flags = 0;
strcpy(pcm->name, "Au1000 AC97 PCM");
@@ -468,7 +468,7 @@
/*-------------------------- AC97 CODEC Control
------------------------------*/
-static unsigned short
+static unsigned short
snd_au1000_ac97_read(ac97_t *ac97, unsigned short reg)
{
u32 volatile cmd;
@@ -500,7 +500,7 @@
spin_unlock(au1000->ac97_lock);
return data;
-
+
}
@@ -625,7 +625,7 @@
}
-static int __init
+static int __init
au1000_init(void)
{
int err;
diff -urN linux/sound/oss/au1000.c linux/sound/oss/au1000.c
--- linux/sound/oss/au1000.c 2004/10/25 20:44:49 1.12
+++ linux/sound/oss/au1000.c 2005/07/10 10:29:03 1.13
@@ -2123,7 +2123,7 @@
#ifdef CONFIG_MIPS_XXS1500
/* deassert eapd */
- wrcodec(&s->codec, AC97_POWER_CONTROL,
+ wrcodec(&s->codec, AC97_POWER_CONTROL,
rdcodec(&s->codec, AC97_POWER_CONTROL) & ~0x8000);
/* mute a number of signals which seem to be causing problems
* if not muted.
diff -urN linux/sound/oss/au1550_ac97.c linux/sound/oss/au1550_ac97.c
--- linux/sound/oss/au1550_ac97.c 2005/04/14 12:47:15 1.4
+++ linux/sound/oss/au1550_ac97.c 2005/07/10 10:29:03 1.5
@@ -333,7 +333,7 @@
*/
temp = rdcodec(codec, AC97_POWER_CONTROL);
}
-
+
/* Check if Codec REF,ANL,DAC,ADC ready
*/
if ((temp & 0x7f0f) != 0x000f)
@@ -1123,7 +1123,7 @@
count *= db->cnt_factor;
- down(&s->sem);
+ down(&s->sem);
add_wait_queue(&db->wait, &wait);
while (count > 0) {
@@ -1222,7 +1222,7 @@
}
spin_lock_irqsave(&s->lock, flags);
-
+
if (file->f_mode & FMODE_READ) {
if (s->dma_adc.count >= (signed)s->dma_adc.dma_fragsize)
mask |= POLLIN | POLLRDNORM;
@@ -1230,7 +1230,7 @@
if (file->f_mode & FMODE_WRITE) {
if (s->dma_dac.mapped) {
if (s->dma_dac.count >=
- (signed)s->dma_dac.dma_fragsize)
+ (signed)s->dma_dac.dma_fragsize)
mask |= POLLOUT | POLLWRNORM;
} else {
if ((signed) s->dma_dac.dmasize >=
@@ -1781,7 +1781,7 @@
else
pr_debug("open: blocking\n");
#endif
-
+
file->private_data = s;
/* wait for device to become free */
down(&s->open_sem);
@@ -1845,7 +1845,7 @@
struct au1550_state *s = (struct au1550_state *)file->private_data;
lock_kernel();
-
+
if (file->f_mode & FMODE_WRITE) {
unlock_kernel();
drain_dac(s, file->f_flags & O_NONBLOCK);
diff -urN linux/sound/oss/nec_vrc5477.c linux/sound/oss/nec_vrc5477.c
--- linux/sound/oss/nec_vrc5477.c 2004/09/19 12:30:26 1.18
+++ linux/sound/oss/nec_vrc5477.c 2005/07/10 10:29:03 1.19
@@ -397,10 +397,10 @@
static int ac97_codec_not_present(struct ac97_codec *codec)
{
- struct vrc5477_ac97_state *s =
+ struct vrc5477_ac97_state *s =
(struct vrc5477_ac97_state *)codec->private_data;
unsigned long flags;
- unsigned short count = 0xffff;
+ unsigned short count = 0xffff;
spin_lock_irqsave(&s->lock, flags);
@@ -419,8 +419,8 @@
outl((AC97_RESET << 16) | 0, s->io + VRC5477_CODEC_WR);
/* test whether we get a response from ac97 chip */
- count = 0xffff;
- do {
+ count = 0xffff;
+ do {
if (!(inl(s->io + VRC5477_CODEC_WR) & 0x80000000))
break;
} while (--count);
@@ -435,7 +435,7 @@
/* --------------------------------------------------------------------- */
-extern inline void
+extern inline void
stop_dac(struct vrc5477_ac97_state *s)
{
struct dmabuf* db = &s->dma_dac;
@@ -652,7 +652,7 @@
#define DMABUF_DEFAULTORDER (16-PAGE_SHIFT)
#define DMABUF_MINORDER 1
-extern inline void dealloc_dmabuf(struct vrc5477_ac97_state *s,
+extern inline void dealloc_dmabuf(struct vrc5477_ac97_state *s,
struct dmabuf *db)
{
if (db->lbuf) {
|