mtd/drivers/mtd/nand au1550nd.c, 1.10, 1.11 autcpu12.c, 1.21,
1.22 diskonchip.c, 1.39, 1.40 edb7312.c, 1.10, 1.11 h1910.c,
1.4, 1.5 ppchameleonevb.c, 1.4, 1.5 rtc_from4.c, 1.6,
1.7 spia.c, 1.23, 1.24
gleixner at infradead.org
gleixner at infradead.org
Thu Nov 4 07:53:14 EST 2004
- Previous message: mtd/drivers/mtd/nand diskonchip.c,1.38,1.39
- Next message: mtd/drivers/mtd/maps arctic-mtd.c, 1.12, 1.13 autcpu12-nvram.c, 1.7,
1.8 beech-mtd.c, 1.9, 1.10 cdb89712.c, 1.9, 1.10 cfi_flagadm.c,
1.13, 1.14 cstm_mips_ixx.c, 1.11, 1.12 db1550-flash.c, 1.6,
1.7 db1x00-flash.c, 1.5, 1.6 dbox2-flash.c, 1.12,
1.13 dilnetpc.c, 1.15, 1.16 dmv182.c, 1.4, 1.5 ebony.c, 1.12,
1.13 edb7312.c, 1.12, 1.13 elan-104nc.c, 1.22,
1.23 epxa10db-flash.c, 1.12, 1.13 fortunet.c, 1.8,
1.9 h720x-flash.c, 1.10, 1.11 impa7.c, 1.12, 1.13 ipaq-flash.c,
1.2, 1.3 iq80310.c, 1.19, 1.20 ixp2000.c, 1.3, 1.4 ixp4xx.c,
1.6, 1.7 l440gx.c, 1.14, 1.15 lasat.c, 1.8,
1.9 lubbock-flash.c, 1.18, 1.19 mbx860.c, 1.7, 1.8 netsc520.c,
1.11, 1.12 nettel.c, 1.7, 1.8 ocelot.c, 1.14, 1.15 ocotea.c,
1.2, 1.3 pb1550-flash.c, 1.5, 1.6 pb1xxx-flash.c, 1.13,
1.14 physmap.c, 1.35, 1.36 redwood.c, 1.9, 1.10 rpxlite.c,
1.21, 1.22 sbc_gxx.c, 1.30, 1.31 sc520cdp.c, 1.17,
1.18 scx200_docflash.c, 1.7, 1.8 sun_uflash.c, 1.10,
1.11 uclinux.c, 1.8, 1.9 wr_sbc82xx_flash.c, 1.6, 1.7
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /home/cvs/mtd/drivers/mtd/nand
In directory phoenix.infradead.org:/tmp/cvs-serv32654
Modified Files:
au1550nd.c autcpu12.c diskonchip.c edb7312.c h1910.c
ppchameleonevb.c rtc_from4.c spia.c
Log Message:
Cleanup MODULE_PARAM. Remove params from boards, which have a fixed address anyway. Cleanup some iomem bloat
Index: au1550nd.c
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/nand/au1550nd.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- au1550nd.c 31 Oct 2004 23:48:33 -0000 1.10
+++ au1550nd.c 4 Nov 2004 12:53:10 -0000 1.11
@@ -409,7 +409,7 @@
MEM_STADDR1);
au_sync();
- p_nand = (void __iomem *)ioremap(NAND_PHYS_ADDR, 0x1000);
+ p_nand = ioremap(NAND_PHYS_ADDR, 0x1000);
/* Set address of hardware control function */
this->hwcontrol = au1550_hwcontrol;
Index: autcpu12.c
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/nand/autcpu12.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- autcpu12.c 16 Sep 2004 23:27:14 -0000 1.21
+++ autcpu12.c 4 Nov 2004 12:53:10 -0000 1.22
@@ -50,16 +50,6 @@
static int autcpu12_pedr = AUTCPU12_SMC_PORT_OFFSET;
static void __iomem * autcpu12_fio_base;
-#ifdef MODULE
-MODULE_PARM(autcpu12_fio_pbase, "i");
-MODULE_PARM(autcpu12_fio_ctrl, "i");
-MODULE_PARM(autcpu12_pedr, "i");
-
-__setup("autcpu12_fio_pbase=",autcpu12_fio_pbase);
-__setup("autcpu12_fio_ctrl=",autcpu12_fio_ctrl);
-__setup("autcpu12_pedr=",autcpu12_pedr);
-#endif
-
/*
* Define partitions for flash devices
*/
@@ -150,7 +140,7 @@
}
/* map physical adress */
- autcpu12_fio_base=(void __iomem *)ioremap(autcpu12_fio_pbase,SZ_1K);
+ autcpu12_fio_base = ioremap(autcpu12_fio_pbase,SZ_1K);
if(!autcpu12_fio_base){
printk("Ioremap autcpu12 SmartMedia Card failed\n");
err = -EIO;
Index: diskonchip.c
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/nand/diskonchip.c,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- diskonchip.c 3 Nov 2004 20:07:15 -0000 1.39
+++ diskonchip.c 4 Nov 2004 12:53:10 -0000 1.40
@@ -102,17 +102,17 @@
static void doc200x_select_chip(struct mtd_info *mtd, int chip);
static int debug=0;
-MODULE_PARM(debug, "i");
+module_param(debug, int, 0);
static int try_dword=1;
-MODULE_PARM(try_dword, "i");
+module_param(try_dword, int, 0);
static int no_ecc_failures=0;
-MODULE_PARM(no_ecc_failures, "i");
+module_param(no_ecc_failures, int, 0);
#ifdef CONFIG_MTD_PARTITIONS
static int no_autopart=0;
-MODULE_PARM(no_autopart, "i");
+module_param(no_autopart, int, 0);
#endif
#ifdef MTD_NAND_DISKONCHIP_BBTWRITE
@@ -120,10 +120,10 @@
#else
static int inftl_bbt_write=0;
#endif
-MODULE_PARM(inftl_bbt_write, "i");
+module_param(inftl_bbt_write, int, 0);
static unsigned long doc_config_location = CONFIG_MTD_DISKONCHIP_PROBE_ADDRESS;
-MODULE_PARM(doc_config_location, "l");
+module_param(doc_config_location, u_long, 0);
MODULE_PARM_DESC(doc_config_location, "Physical memory address at which to probe for DiskOnChip");
@@ -1505,7 +1505,7 @@
int reg, len, numchips;
int ret = 0;
- virtadr = (void __iomem *)ioremap(physadr, DOC_IOREMAP_LEN);
+ virtadr = ioremap(physadr, DOC_IOREMAP_LEN);
if (!virtadr) {
printk(KERN_ERR "Diskonchip ioremap failed: 0x%x bytes at 0x%lx\n", DOC_IOREMAP_LEN, physadr);
return -EIO;
Index: edb7312.c
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/nand/edb7312.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- edb7312.c 5 Oct 2004 13:50:20 -0000 1.10
+++ edb7312.c 4 Nov 2004 12:53:10 -0000 1.11
@@ -57,16 +57,6 @@
static void __iomem * ep7312_pxdr = (void __iomem *) EP7312_PXDR;
static void __iomem * ep7312_pxddr = (void __iomem *) EP7312_PXDDR;
-#ifdef MODULE
-MODULE_PARM(ep7312_fio_pbase, "i");
-MODULE_PARM(ep7312_pxdr, "i");
-MODULE_PARM(ep7312_pxddr, "i");
-
-__setup("ep7312_fio_pbase=",ep7312_fio_pbase);
-__setup("ep7312_pxdr=",ep7312_pxdr);
-__setup("ep7312_pxddr=",ep7312_pxddr);
-#endif
-
#ifdef CONFIG_MTD_PARTITIONS
/*
* Define static partitions for flash device
@@ -143,7 +133,7 @@
}
/* map physical adress */
- ep7312_fio_base = (void __iomem *)ioremap(ep7312_fio_pbase, SZ_1K);
+ ep7312_fio_base = ioremap(ep7312_fio_pbase, SZ_1K);
if(!ep7312_fio_base) {
printk("ioremap EDB7312 NAND flash failed\n");
kfree(ep7312_mtd);
Index: h1910.c
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/nand/h1910.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- h1910.c 5 Oct 2004 13:50:20 -0000 1.4
+++ h1910.c 4 Nov 2004 12:53:10 -0000 1.5
@@ -112,7 +112,7 @@
if (!machine_is_h1900())
return -ENODEV;
- nandaddr = (void __iomem *)__ioremap(0x08000000, 0x1000, 0, 1);
+ nandaddr = __ioremap(0x08000000, 0x1000, 0, 1);
if (!nandaddr) {
printk("Failed to ioremap nand flash.\n");
return -ENOMEM;
Index: ppchameleonevb.c
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/nand/ppchameleonevb.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ppchameleonevb.c 5 Oct 2004 13:50:20 -0000 1.4
+++ ppchameleonevb.c 4 Nov 2004 12:53:10 -0000 1.5
@@ -64,13 +64,14 @@
/*
* Module stuff
*/
-static int ppchameleon_fio_pbase = CFG_NAND0_PADDR;
-static int ppchameleonevb_fio_pbase = CFG_NAND1_PADDR;
+static unsigned long ppchameleon_fio_pbase = CFG_NAND0_PADDR;
+static unsigned long ppchameleonevb_fio_pbase = CFG_NAND1_PADDR;
#ifdef MODULE
-MODULE_PARM(ppchameleon_fio_pbase, "i");
+module_param(ppchameleon_fio_pbase, u_long, 0);
+module_param(ppchameleonevb_fio_pbase, u_long, 0);
+#else
__setup("ppchameleon_fio_pbase=",ppchameleon_fio_pbase);
-MODULE_PARM(ppchameleonevb_fio_pbase, "i");
__setup("ppchameleonevb_fio_pbase=",ppchameleonevb_fio_pbase);
#endif
@@ -206,7 +207,7 @@
}
/* map physical address */
- ppchameleon_fio_base = (void __iomem *) ioremap(ppchameleon_fio_pbase, SZ_4M);
+ ppchameleon_fio_base = ioremap(ppchameleon_fio_pbase, SZ_4M);
if(!ppchameleon_fio_base) {
printk("ioremap PPChameleon NAND flash failed\n");
kfree(ppchameleon_mtd);
@@ -305,7 +306,7 @@
}
/* map physical address */
- ppchameleonevb_fio_base = (void __iomem *)ioremap(ppchameleonevb_fio_pbase, SZ_4M);
+ ppchameleonevb_fio_base = ioremap(ppchameleonevb_fio_pbase, SZ_4M);
if(!ppchameleonevb_fio_base) {
printk("ioremap PPChameleonEVB NAND flash failed\n");
kfree(ppchameleonevb_mtd);
Index: rtc_from4.c
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/nand/rtc_from4.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- rtc_from4.c 5 Oct 2004 22:11:46 -0000 1.6
+++ rtc_from4.c 4 Nov 2004 12:53:10 -0000 1.7
@@ -91,8 +91,6 @@
*/
static void __iomem *rtc_from4_fio_base = P2SEGADDR(RTC_FROM4_FIO_BASE);
-MODULE_PARM(rtc_from4_fio_base, "i");
-
const static struct mtd_partition partition_info[] = {
{
.name = "Renesas flash partition 1",
Index: spia.c
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/nand/spia.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- spia.c 5 Oct 2004 13:50:20 -0000 1.23
+++ spia.c 4 Nov 2004 12:53:10 -0000 1.24
@@ -59,10 +59,10 @@
static int spia_pedr = SPIA_PEDR;
static int spia_peddr = SPIA_PEDDR;
-MODULE_PARM(spia_io_base, "i");
-MODULE_PARM(spia_fio_base, "i");
-MODULE_PARM(spia_pedr, "i");
-MODULE_PARM(spia_peddr, "i");
+module_param(spia_io_base, int, 0);
+module_param(spia_fio_base, int, 0);
+module_param(spia_pedr, int, 0);
+module_param(spia_peddr, int, 0);
/*
* Define partitions for flash device
- Previous message: mtd/drivers/mtd/nand diskonchip.c,1.38,1.39
- Next message: mtd/drivers/mtd/maps arctic-mtd.c, 1.12, 1.13 autcpu12-nvram.c, 1.7,
1.8 beech-mtd.c, 1.9, 1.10 cdb89712.c, 1.9, 1.10 cfi_flagadm.c,
1.13, 1.14 cstm_mips_ixx.c, 1.11, 1.12 db1550-flash.c, 1.6,
1.7 db1x00-flash.c, 1.5, 1.6 dbox2-flash.c, 1.12,
1.13 dilnetpc.c, 1.15, 1.16 dmv182.c, 1.4, 1.5 ebony.c, 1.12,
1.13 edb7312.c, 1.12, 1.13 elan-104nc.c, 1.22,
1.23 epxa10db-flash.c, 1.12, 1.13 fortunet.c, 1.8,
1.9 h720x-flash.c, 1.10, 1.11 impa7.c, 1.12, 1.13 ipaq-flash.c,
1.2, 1.3 iq80310.c, 1.19, 1.20 ixp2000.c, 1.3, 1.4 ixp4xx.c,
1.6, 1.7 l440gx.c, 1.14, 1.15 lasat.c, 1.8,
1.9 lubbock-flash.c, 1.18, 1.19 mbx860.c, 1.7, 1.8 netsc520.c,
1.11, 1.12 nettel.c, 1.7, 1.8 ocelot.c, 1.14, 1.15 ocotea.c,
1.2, 1.3 pb1550-flash.c, 1.5, 1.6 pb1xxx-flash.c, 1.13,
1.14 physmap.c, 1.35, 1.36 redwood.c, 1.9, 1.10 rpxlite.c,
1.21, 1.22 sbc_gxx.c, 1.30, 1.31 sc520cdp.c, 1.17,
1.18 scx200_docflash.c, 1.7, 1.8 sun_uflash.c, 1.10,
1.11 uclinux.c, 1.8, 1.9 wr_sbc82xx_flash.c, 1.6, 1.7
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the linux-mtd-cvs
mailing list