aboutsummaryrefslogtreecommitdiffstats
path: root/arch/mips/au1000/common
diff options
context:
space:
mode:
Diffstat (limited to 'arch/mips/au1000/common')
-rw-r--r--arch/mips/au1000/common/dbdma.c4
-rw-r--r--arch/mips/au1000/common/dma.c2
-rw-r--r--arch/mips/au1000/common/platform.c4
-rw-r--r--arch/mips/au1000/common/setup.c2
-rw-r--r--arch/mips/au1000/common/time.c2
5 files changed, 7 insertions, 7 deletions
diff --git a/arch/mips/au1000/common/dbdma.c b/arch/mips/au1000/common/dbdma.c
index d00e8247d6c2..6ee090bd86c9 100644
--- a/arch/mips/au1000/common/dbdma.c
+++ b/arch/mips/au1000/common/dbdma.c
@@ -214,7 +214,7 @@ au1xxx_ddma_add_device(dbdev_tab_t *dev)
214 if ( NULL != p ) 214 if ( NULL != p )
215 { 215 {
216 memcpy(p, dev, sizeof(dbdev_tab_t)); 216 memcpy(p, dev, sizeof(dbdev_tab_t));
217 p->dev_id = DSCR_DEV2CUSTOM_ID(new_id,dev->dev_id); 217 p->dev_id = DSCR_DEV2CUSTOM_ID(new_id,dev->dev_id);
218 ret = p->dev_id; 218 ret = p->dev_id;
219 new_id++; 219 new_id++;
220#if 0 220#if 0
@@ -260,7 +260,7 @@ au1xxx_dbdma_chan_alloc(u32 srcid, u32 destid,
260 spin_lock_irqsave(&au1xxx_dbdma_spin_lock, flags); 260 spin_lock_irqsave(&au1xxx_dbdma_spin_lock, flags);
261 if (!(stp->dev_flags & DEV_FLAGS_INUSE) || 261 if (!(stp->dev_flags & DEV_FLAGS_INUSE) ||
262 (stp->dev_flags & DEV_FLAGS_ANYUSE)) { 262 (stp->dev_flags & DEV_FLAGS_ANYUSE)) {
263 /* Got source */ 263 /* Got source */
264 stp->dev_flags |= DEV_FLAGS_INUSE; 264 stp->dev_flags |= DEV_FLAGS_INUSE;
265 if (!(dtp->dev_flags & DEV_FLAGS_INUSE) || 265 if (!(dtp->dev_flags & DEV_FLAGS_INUSE) ||
266 (dtp->dev_flags & DEV_FLAGS_ANYUSE)) { 266 (dtp->dev_flags & DEV_FLAGS_ANYUSE)) {
diff --git a/arch/mips/au1000/common/dma.c b/arch/mips/au1000/common/dma.c
index 1905c6b104f2..1d82f2277517 100644
--- a/arch/mips/au1000/common/dma.c
+++ b/arch/mips/au1000/common/dma.c
@@ -174,7 +174,7 @@ int request_au1000_dma(int dev_id, const char *dev_str,
174 return -EINVAL; 174 return -EINVAL;
175#else 175#else
176 if (dev_id < 0 || dev_id >= DMA_NUM_DEV) 176 if (dev_id < 0 || dev_id >= DMA_NUM_DEV)
177 return -EINVAL; 177 return -EINVAL;
178#endif 178#endif
179 179
180 for (i = 0; i < NUM_AU1000_DMA_CHANNELS; i++) { 180 for (i = 0; i < NUM_AU1000_DMA_CHANNELS; i++) {
diff --git a/arch/mips/au1000/common/platform.c b/arch/mips/au1000/common/platform.c
index 48d3f54f88f8..d7a8f0a811fe 100644
--- a/arch/mips/au1000/common/platform.c
+++ b/arch/mips/au1000/common/platform.c
@@ -264,7 +264,7 @@ static struct resource smc91x_resources[] = {
264 264
265static struct platform_device smc91x_device = { 265static struct platform_device smc91x_device = {
266 .name = "smc91x", 266 .name = "smc91x",
267 .id = -1, 267 .id = -1,
268 .num_resources = ARRAY_SIZE(smc91x_resources), 268 .num_resources = ARRAY_SIZE(smc91x_resources),
269 .resource = smc91x_resources, 269 .resource = smc91x_resources,
270}; 270};
@@ -288,7 +288,7 @@ static struct platform_device *au1xxx_platform_devices[] __initdata = {
288 &au1xxx_mmc_device, 288 &au1xxx_mmc_device,
289#endif 289#endif
290#ifdef CONFIG_MIPS_DB1200 290#ifdef CONFIG_MIPS_DB1200
291 &smc91x_device, 291 &smc91x_device,
292#endif 292#endif
293}; 293};
294 294
diff --git a/arch/mips/au1000/common/setup.c b/arch/mips/au1000/common/setup.c
index eb155c071aa6..1080558c8100 100644
--- a/arch/mips/au1000/common/setup.c
+++ b/arch/mips/au1000/common/setup.c
@@ -90,7 +90,7 @@ void __init plat_setup(void)
90 else { 90 else {
91 /* Clear to obtain best system bus performance */ 91 /* Clear to obtain best system bus performance */
92 clear_c0_config(1<<19); /* Clear Config[OD] */ 92 clear_c0_config(1<<19); /* Clear Config[OD] */
93 } 93 }
94 94
95 argptr = prom_getcmdline(); 95 argptr = prom_getcmdline();
96 96
diff --git a/arch/mips/au1000/common/time.c b/arch/mips/au1000/common/time.c
index 883d3f3d8c53..f85f1524b366 100644
--- a/arch/mips/au1000/common/time.c
+++ b/arch/mips/au1000/common/time.c
@@ -359,7 +359,7 @@ static unsigned long do_fast_cp0_gettimeoffset(void)
359 : "hi", "lo", GCC_REG_ACCUM); 359 : "hi", "lo", GCC_REG_ACCUM);
360 360
361 /* 361 /*
362 * Due to possible jiffies inconsistencies, we need to check 362 * Due to possible jiffies inconsistencies, we need to check
363 * the result so that we'll get a timer that is monotonic. 363 * the result so that we'll get a timer that is monotonic.
364 */ 364 */
365 if (res >= USECS_PER_JIFFY) 365 if (res >= USECS_PER_JIFFY)