git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
drivers
/
mtd
/
devices
/
ms02-nv.c
diff --git
a/drivers/mtd/devices/ms02-nv.c
b/drivers/mtd/devices/ms02-nv.c
index
380ff08
..
485f663
100644
(file)
--- a/
drivers/mtd/devices/ms02-nv.c
+++ b/
drivers/mtd/devices/ms02-nv.c
@@
-6,7
+6,7
@@
* as published by the Free Software Foundation; either version
* 2 of the License, or (at your option) any later version.
*
* as published by the Free Software Foundation; either version
* 2 of the License, or (at your option) any later version.
*
- * $Id: ms02-nv.c,v 1.
8 2005/01/05 18:05:12 dwmw2
Exp $
+ * $Id: ms02-nv.c,v 1.
11 2005/11/14 13:41:47 macro
Exp $
*/
#include <linux/init.h>
*/
#include <linux/init.h>
@@
-99,8
+99,8
@@
static inline uint ms02nv_probe_one(ulong addr)
* The firmware writes MS02NV_ID at MS02NV_MAGIC and also
* a diagnostic status at MS02NV_DIAG.
*/
* The firmware writes MS02NV_ID at MS02NV_MAGIC and also
* a diagnostic status at MS02NV_DIAG.
*/
- ms02nv_diagp = (ms02nv_uint *)(KSEG1ADDR(addr + MS02NV_DIAG));
- ms02nv_magicp = (ms02nv_uint *)(KSEG1ADDR(addr + MS02NV_MAGIC));
+ ms02nv_diagp = (ms02nv_uint *)(
C
KSEG1ADDR(addr + MS02NV_DIAG));
+ ms02nv_magicp = (ms02nv_uint *)(
C
KSEG1ADDR(addr + MS02NV_MAGIC));
err = get_dbe(ms02nv_magic, ms02nv_magicp);
if (err)
return 0;
err = get_dbe(ms02nv_magic, ms02nv_magicp);
if (err)
return 0;
@@
-233,7
+233,7
@@
static int __init ms02nv_init_one(ulong addr)
goto err_out_csr_res;
}
goto err_out_csr_res;
}
- printk(KERN_INFO "mtd%d: %s at 0x%08lx, size %uMiB.\n",
+ printk(KERN_INFO "mtd%d: %s at 0x%08lx, size %
z
uMiB.\n",
mtd->index, ms02nv_name, addr, size >> 20);
mp->next = root_ms02nv_mtd;
mtd->index, ms02nv_name, addr, size >> 20);
mp->next = root_ms02nv_mtd;
@@
-293,13
+293,13
@@
static int __init ms02nv_init(void)
switch (mips_machtype) {
case MACH_DS5000_200:
switch (mips_machtype) {
case MACH_DS5000_200:
- csr = (volatile u32 *)
KN02_CSR_BASE
;
+ csr = (volatile u32 *)
CKSEG1ADDR(KN02_SLOT_BASE + KN02_CSR)
;
if (*csr & KN02_CSR_BNK32M)
stride = 2;
break;
case MACH_DS5000_2X0:
case MACH_DS5900:
if (*csr & KN02_CSR_BNK32M)
stride = 2;
break;
case MACH_DS5000_2X0:
case MACH_DS5900:
- csr = (volatile u32 *)
KN03_MCR_BASE
;
+ csr = (volatile u32 *)
CKSEG1ADDR(KN03_SLOT_BASE + IOASIC_MCR)
;
if (*csr & KN03_MCR_BNK32M)
stride = 2;
break;
if (*csr & KN03_MCR_BNK32M)
stride = 2;
break;
@@
-308,7
+308,7
@@
static int __init ms02nv_init(void)
break;
}
break;
}
- for (i = 0; i <
(sizeof(ms02nv_addrs) / sizeof(*ms02nv_addrs)
); i++)
+ for (i = 0; i <
ARRAY_SIZE(ms02nv_addrs
); i++)
if (!ms02nv_init_one(ms02nv_addrs[i] << stride))
count++;
if (!ms02nv_init_one(ms02nv_addrs[i] << stride))
count++;