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
gleixner at infradead.org
gleixner at infradead.org
Thu Nov 4 08:24:19 EST 2004
- Previous message: 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
- Next message: mtd/fs/jffs2 os-linux.h,1.48,1.49 wbuf.c,1.73,1.74
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /home/cvs/mtd/drivers/mtd/maps
In directory phoenix.infradead.org:/tmp/cvs-serv501
Modified Files:
arctic-mtd.c autcpu12-nvram.c beech-mtd.c cdb89712.c
cfi_flagadm.c cstm_mips_ixx.c db1550-flash.c db1x00-flash.c
dbox2-flash.c dilnetpc.c dmv182.c ebony.c edb7312.c
elan-104nc.c epxa10db-flash.c fortunet.c h720x-flash.c impa7.c
ipaq-flash.c iq80310.c ixp2000.c ixp4xx.c l440gx.c lasat.c
lubbock-flash.c mbx860.c netsc520.c nettel.c ocelot.c ocotea.c
pb1550-flash.c pb1xxx-flash.c physmap.c redwood.c rpxlite.c
sbc_gxx.c sc520cdp.c scx200_docflash.c sun_uflash.c uclinux.c
wr_sbc82xx_flash.c
Log Message:
Cleanup bogus iomem type casts
Index: arctic-mtd.c
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/maps/arctic-mtd.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- arctic-mtd.c 16 Sep 2004 23:27:12 -0000 1.12
+++ arctic-mtd.c 4 Nov 2004 13:24:14 -0000 1.13
@@ -98,7 +98,7 @@
{
printk("%s: 0x%08x at 0x%08x\n", NAME, SIZE, PADDR);
- arctic_mtd_map.virt = (void __iomem *) ioremap(PADDR, SIZE);
+ arctic_mtd_map.virt = ioremap(PADDR, SIZE);
if (!arctic_mtd_map.virt) {
printk("%s: failed to ioremap 0x%x\n", NAME, PADDR);
Index: autcpu12-nvram.c
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/maps/autcpu12-nvram.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- autcpu12-nvram.c 16 Sep 2004 23:27:12 -0000 1.7
+++ autcpu12-nvram.c 4 Nov 2004 13:24:14 -0000 1.8
@@ -47,7 +47,7 @@
{
int err, save0, save1;
- autcpu12_sram_map.virt = (void __iomem *)ioremap(0x12000000, SZ_128K);
+ autcpu12_sram_map.virt = ioremap(0x12000000, SZ_128K);
if (!autcpu12_sram_map.virt) {
printk("Failed to ioremap autcpu12 NV-RAM space\n");
err = -EIO;
Index: beech-mtd.c
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/maps/beech-mtd.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- beech-mtd.c 16 Sep 2004 23:27:12 -0000 1.9
+++ beech-mtd.c 4 Nov 2004 13:24:14 -0000 1.10
@@ -74,7 +74,7 @@
{
printk("%s: 0x%08x at 0x%08x\n", NAME, SIZE, PADDR);
- beech_mtd_map.virt = (void __iomem *) ioremap(PADDR, SIZE);
+ beech_mtd_map.virt = ioremap(PADDR, SIZE);
if (!beech_mtd_map.virt) {
printk("%s: failed to ioremap 0x%x\n", NAME, PADDR);
Index: cdb89712.c
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/maps/cdb89712.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- cdb89712.c 16 Sep 2004 23:27:12 -0000 1.9
+++ cdb89712.c 4 Nov 2004 13:24:14 -0000 1.10
@@ -44,7 +44,7 @@
goto out;
}
- cdb89712_flash_map.virt = (void __iomem *)ioremap(FLASH_START, FLASH_SIZE);
+ cdb89712_flash_map.virt = ioremap(FLASH_START, FLASH_SIZE);
if (!cdb89712_flash_map.virt) {
printk(KERN_NOTICE "Failed to ioremap Cdb89712 FLASH space\n");
err = -EIO;
@@ -114,7 +114,7 @@
goto out;
}
- cdb89712_sram_map.virt = (void __iomem *)ioremap(SRAM_START, SRAM_SIZE);
+ cdb89712_sram_map.virt = ioremap(SRAM_START, SRAM_SIZE);
if (!cdb89712_sram_map.virt) {
printk(KERN_NOTICE "Failed to ioremap Cdb89712 SRAM space\n");
err = -EIO;
@@ -182,7 +182,7 @@
goto out;
}
- cdb89712_bootrom_map.virt = (void __iomem *)ioremap(BOOTROM_START, BOOTROM_SIZE);
+ cdb89712_bootrom_map.virt = ioremap(BOOTROM_START, BOOTROM_SIZE);
if (!cdb89712_bootrom_map.virt) {
printk(KERN_NOTICE "Failed to ioremap Cdb89712 BootROM space\n");
err = -EIO;
Index: cfi_flagadm.c
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/maps/cfi_flagadm.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- cfi_flagadm.c 16 Sep 2004 23:27:12 -0000 1.13
+++ cfi_flagadm.c 4 Nov 2004 13:24:14 -0000 1.14
@@ -96,7 +96,7 @@
FLASH_SIZE, FLASH_PHYS_ADDR);
flagadm_map.phys = FLASH_PHYS_ADDR;
- flagadm_map.virt = (void __iomem *s)ioremap(FLASH_PHYS_ADDR,
+ flagadm_map.virt = ioremap(FLASH_PHYS_ADDR,
FLASH_SIZE);
if (!flagadm_map.virt) {
Index: cstm_mips_ixx.c
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/maps/cstm_mips_ixx.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- cstm_mips_ixx.c 16 Sep 2004 23:27:12 -0000 1.11
+++ cstm_mips_ixx.c 4 Nov 2004 13:24:14 -0000 1.12
@@ -170,7 +170,7 @@
cstm_mips_ixx_map[i].phys = cstm_mips_ixx_board_desc[i].window_addr;
- cstm_mips_ixx_map[i].virt = (void __iomem *)ioremap(cstm_mips_ixx_board_desc[i].window_addr, cstm_mips_ixx_board_desc[i].window_size);
+ cstm_mips_ixx_map[i].virt = ioremap(cstm_mips_ixx_board_desc[i].window_addr, cstm_mips_ixx_board_desc[i].window_size);
if (!cstm_mips_ixx_map[i].virt) {
printk(KERN_WARNING "Failed to ioremap\n");
return -EIO;
Index: db1550-flash.c
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/maps/db1550-flash.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- db1550-flash.c 20 Oct 2004 05:50:19 -0000 1.6
+++ db1550-flash.c 4 Nov 2004 13:24:14 -0000 1.7
@@ -161,8 +161,7 @@
*/
printk(KERN_NOTICE "Db1550 flash: probing %d-bit flash bus\n",
db1550_map.bankwidth*8);
- db1550_map.virt =
- (void __iomem *)ioremap(window_addr, window_size);
+ db1550_map.virt = ioremap(window_addr, window_size);
mymtd = do_map_probe("cfi_probe", &db1550_map);
if (!mymtd) return -ENXIO;
mymtd->owner = THIS_MODULE;
Index: db1x00-flash.c
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/maps/db1x00-flash.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- db1x00-flash.c 18 Sep 2004 23:22:35 -0000 1.5
+++ db1x00-flash.c 4 Nov 2004 13:24:14 -0000 1.6
@@ -199,7 +199,7 @@
*/
printk(KERN_NOTICE "Db1xxx flash: probing %d-bit flash bus\n",
db1xxx_mtd_map.bankwidth*8);
- db1xxx_mtd_map.virt = (void __iomem *)ioremap(window_addr, window_size);
+ db1xxx_mtd_map.virt = ioremap(window_addr, window_size);
db1xxx_mtd = do_map_probe("cfi_probe", &db1xxx_mtd_map);
if (!db1xxx_mtd) return -ENXIO;
db1xxx_mtd->owner = THIS_MODULE;
Index: dbox2-flash.c
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/maps/dbox2-flash.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- dbox2-flash.c 16 Sep 2004 23:27:12 -0000 1.12
+++ dbox2-flash.c 4 Nov 2004 13:24:14 -0000 1.13
@@ -75,7 +75,7 @@
int __init init_dbox2_flash(void)
{
printk(KERN_NOTICE "D-Box 2 flash driver (size->0x%X mem->0x%X)\n", WINDOW_SIZE, WINDOW_ADDR);
- dbox2_flash_map.virt = (void __iomem *)ioremap(WINDOW_ADDR, WINDOW_SIZE);
+ dbox2_flash_map.virt = ioremap(WINDOW_ADDR, WINDOW_SIZE);
if (!dbox2_flash_map.virt) {
printk("Failed to ioremap\n");
Index: dilnetpc.c
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/maps/dilnetpc.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- dilnetpc.c 21 Oct 2004 08:31:32 -0000 1.15
+++ dilnetpc.c 4 Nov 2004 13:24:14 -0000 1.16
@@ -403,7 +403,7 @@
printk(KERN_NOTICE "DIL/Net %s flash: 0x%lx at 0x%lx\n",
is_dnp ? "DNPC" : "ADNP", dnpc_map.size, dnpc_map.phys);
- dnpc_map.virt = (void __iomem *)ioremap_nocache(dnpc_map.phys, dnpc_map.size);
+ dnpc_map.virt = ioremap_nocache(dnpc_map.phys, dnpc_map.size);
dnpc_map_flash(dnpc_map.phys, dnpc_map.size);
Index: dmv182.c
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/maps/dmv182.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- dmv182.c 16 Sep 2004 23:27:13 -0000 1.4
+++ dmv182.c 4 Nov 2004 13:24:14 -0000 1.5
@@ -103,8 +103,7 @@
partitions = svme182_partitions;
- svme182_map.virt =
- (void __iomem *)ioremap(FLASH_BASE_ADDR, svme182_map.size);
+ svme182_map.virt = ioremap(FLASH_BASE_ADDR, svme182_map.size);
if (svme182_map.virt == 0) {
printk("Failed to ioremap FLASH memory area.\n");
Index: ebony.c
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/maps/ebony.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- ebony.c 16 Sep 2004 23:27:13 -0000 1.12
+++ ebony.c 4 Nov 2004 13:24:14 -0000 1.13
@@ -93,8 +93,7 @@
large_flash_base = EBONY_LARGE_FLASH_HIGH;
ebony_small_map.phys = small_flash_base;
- ebony_small_map.virt =
- (void __iomem *)ioremap64(small_flash_base,
+ ebony_small_map.virt = ioremap64(small_flash_base,
ebony_small_map.size);
if (!ebony_small_map.virt) {
Index: edb7312.c
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/maps/edb7312.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- edb7312.c 16 Sep 2004 23:27:13 -0000 1.12
+++ edb7312.c 4 Nov 2004 13:24:14 -0000 1.13
@@ -82,8 +82,7 @@
printk(KERN_NOTICE MSG_PREFIX "0x%08x at 0x%08x\n",
WINDOW_SIZE, WINDOW_ADDR);
- edb7312nor_map.virt = (void __iomem *)
- ioremap(WINDOW_ADDR, WINDOW_SIZE);
+ edb7312nor_map.virt = ioremap(WINDOW_ADDR, WINDOW_SIZE);
if (!edb7312nor_map.virt) {
printk(MSG_PREFIX "failed to ioremap\n");
Index: elan-104nc.c
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/maps/elan-104nc.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- elan-104nc.c 16 Sep 2004 23:27:13 -0000 1.22
+++ elan-104nc.c 4 Nov 2004 13:24:14 -0000 1.23
@@ -190,7 +190,7 @@
/* Urg! We use I/O port 0x22 without request_region()ing it,
because it's already allocated to the PIC. */
- iomapadr = (void __iomem *)ioremap(WINDOW_START, WINDOW_LENGTH);
+ iomapadr = ioremap(WINDOW_START, WINDOW_LENGTH);
if (!iomapadr) {
printk( KERN_ERR"%s: failed to ioremap memory region\n",
elan_104nc_map.name );
Index: epxa10db-flash.c
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/maps/epxa10db-flash.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- epxa10db-flash.c 16 Sep 2004 23:27:13 -0000 1.12
+++ epxa10db-flash.c 4 Nov 2004 13:24:14 -0000 1.13
@@ -62,7 +62,7 @@
printk(KERN_NOTICE "%s flash device: 0x%x at 0x%x\n", BOARD_NAME, FLASH_SIZE, FLASH_START);
- epxa_map.virt = (void __iomem *)ioremap(FLASH_START, FLASH_SIZE);
+ epxa_map.virt = ioremap(FLASH_START, FLASH_SIZE);
if (!epxa_map.virt) {
printk("Failed to ioremap %s flash\n",BOARD_NAME);
return -EIO;
Index: fortunet.c
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/maps/fortunet.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- fortunet.c 16 Sep 2004 23:27:13 -0000 1.8
+++ fortunet.c 4 Nov 2004 13:24:14 -0000 1.9
@@ -209,8 +209,8 @@
map_regions[ix].map_info.phys = map_regions[ix].window_addr_physical,
- map_regions[ix].map_info.virt =
- (void __iomem *)ioremap_nocache(
+ map_regions[ix].map_info.virt =
+ ioremap_nocache(
map_regions[ix].window_addr_physical,
map_regions[ix].map_info.size);
if(!map_regions[ix].map_info.virt)
Index: h720x-flash.c
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/maps/h720x-flash.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- h720x-flash.c 16 Sep 2004 23:27:13 -0000 1.10
+++ h720x-flash.c 4 Nov 2004 13:24:14 -0000 1.11
@@ -73,7 +73,7 @@
char *part_type = NULL;
- h720x_map.virt = (void __iomem *)ioremap(FLASH_PHYS, FLASH_SIZE);
+ h720x_map.virt = ioremap(FLASH_PHYS, FLASH_SIZE);
if (!h720x_map.virt) {
printk(KERN_ERR "H720x-MTD: ioremap failed\n");
Index: impa7.c
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/maps/impa7.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- impa7.c 16 Sep 2004 23:27:13 -0000 1.12
+++ impa7.c 4 Nov 2004 13:24:14 -0000 1.13
@@ -91,8 +91,7 @@
pt[i].size, pt[i].addr);
impa7_map[i].phys = pt[i].addr;
- impa7_map[i].virt = (void __iomem *)
- ioremap(pt[i].addr, pt[i].size);
+ impa7_map[i].virt = ioremap(pt[i].addr, pt[i].size);
if (!impa7_map[i].virt) {
printk(MSG_PREFIX "failed to ioremap\n");
return -EIO;
Index: ipaq-flash.c
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/maps/ipaq-flash.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ipaq-flash.c 16 Sep 2004 23:27:13 -0000 1.2
+++ ipaq-flash.c 4 Nov 2004 13:24:15 -0000 1.3
@@ -246,7 +246,7 @@
ipaq_map[i].size = h3xxx_max_flash_size;
ipaq_map[i].set_vpp = h3xxx_set_vpp;
ipaq_map[i].phys = cs_phys[i];
- ipaq_map[i].virt = (void __iomem *)__ioremap(cs_phys[i], 0x04000000, 0, 1);
+ ipaq_map[i].virt = __ioremap(cs_phys[i], 0x04000000, 0, 1);
if (machine_is_h3100 () || machine_is_h1900())
ipaq_map[i].bankwidth = 2;
}
@@ -443,7 +443,7 @@
ipaq_map[0].size = 0x80000;
ipaq_map[0].set_vpp = h3xxx_set_vpp;
ipaq_map[0].phys = 0x0;
- ipaq_map[0].virt = (void __iomem *)__ioremap(0x0, 0x04000000, 0, 1);
+ ipaq_map[0].virt = __ioremap(0x0, 0x04000000, 0, 1);
ipaq_map[0].bankwidth = 2;
printk(KERN_NOTICE "iPAQ flash: probing %d-bit flash bus, window=%lx with JEDEC.\n", ipaq_map[0].bankwidth*8, ipaq_map[0].virt);
Index: iq80310.c
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/maps/iq80310.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- iq80310.c 16 Sep 2004 23:27:13 -0000 1.19
+++ iq80310.c 4 Nov 2004 13:24:15 -0000 1.20
@@ -68,7 +68,7 @@
int parsed_nr_parts = 0;
int ret;
- iq80310_map.virt = (void __iomem *)ioremap(WINDOW_ADDR, WINDOW_SIZE);
+ iq80310_map.virt = ioremap(WINDOW_ADDR, WINDOW_SIZE);
if (!iq80310_map.virt) {
printk("Failed to ioremap\n");
return -EIO;
Index: ixp2000.c
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/maps/ixp2000.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ixp2000.c 16 Sep 2004 23:27:13 -0000 1.3
+++ ixp2000.c 4 Nov 2004 13:24:15 -0000 1.4
@@ -208,9 +208,8 @@
goto Error;
}
- info->map.map_priv_1 =
- (void __iomem *) ioremap(dev->resource->start,
- dev->resource->end - dev->resource->start + 1);
+ info->map.map_priv_1 = ioremap(dev->resource->start,
+ dev->resource->end - dev->resource->start + 1);
if (!info->map.map_priv_1) {
dev_err(_dev, "Failed to ioremap flash region\n");
err = -EIO;
Index: ixp4xx.c
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/maps/ixp4xx.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ixp4xx.c 17 Sep 2004 00:25:06 -0000 1.6
+++ ixp4xx.c 4 Nov 2004 13:24:15 -0000 1.7
@@ -196,9 +196,8 @@
goto Error;
}
- info->map.map_priv_1 =
- (void __iomem *) ioremap(dev->resource->start,
- dev->resource->end - dev->resource->start + 1);
+ info->map.map_priv_1 = ioremap(dev->resource->start,
+ dev->resource->end - dev->resource->start + 1);
if (!info->map.map_priv_1) {
printk(KERN_ERR "IXP4XXFlash: Failed to ioremap region\n");
err = -EIO;
Index: l440gx.c
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/maps/l440gx.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- l440gx.c 16 Sep 2004 23:27:13 -0000 1.14
+++ l440gx.c 4 Nov 2004 13:24:15 -0000 1.15
@@ -73,7 +73,7 @@
return -ENODEV;
}
- l440gx_map.virt = (void __iomem *)ioremap_nocache(WINDOW_ADDR, WINDOW_SIZE);
+ l440gx_map.virt = ioremap_nocache(WINDOW_ADDR, WINDOW_SIZE);
if (!l440gx_map.virt) {
printk(KERN_WARNING "Failed to ioremap L440GX flash region\n");
Index: lasat.c
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/maps/lasat.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- lasat.c 16 Sep 2004 23:27:13 -0000 1.8
+++ lasat.c 4 Nov 2004 13:24:15 -0000 1.9
@@ -50,7 +50,7 @@
ENABLE_VPP((&lasat_map));
lasat_map.phys = lasat_flash_partition_start(LASAT_MTD_BOOTLOADER);
- lasat_map.virt = (void __iomem *)ioremap_nocache(
+ lasat_map.virt = ioremap_nocache(
lasat_map.phys, lasat_board_info.li_flash_size);
lasat_map.size = lasat_board_info.li_flash_size;
Index: lubbock-flash.c
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/maps/lubbock-flash.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- lubbock-flash.c 28 Sep 2004 18:54:40 -0000 1.18
+++ lubbock-flash.c 4 Nov 2004 13:24:15 -0000 1.19
@@ -84,7 +84,7 @@
lubbock_maps[flashboot].name = "Lubbock Boot ROM";
for (i = 0; i < 2; i++) {
- lubbock_maps[i].virt = (void __iomem *)ioremap(lubbock_maps[i].phys, WINDOW_SIZE);
+ lubbock_maps[i].virt = ioremap(lubbock_maps[i].phys, WINDOW_SIZE);
if (!lubbock_maps[i].virt) {
printk(KERN_WARNING "Failed to ioremap %s\n", lubbock_maps[i].name);
if (!ret)
Index: mbx860.c
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/maps/mbx860.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- mbx860.c 16 Sep 2004 23:27:13 -0000 1.7
+++ mbx860.c 4 Nov 2004 13:24:15 -0000 1.8
@@ -60,7 +60,7 @@
int __init init_mbx(void)
{
printk(KERN_NOTICE "Motorola MBX flash device: 0x%x at 0x%x\n", WINDOW_SIZE*4, WINDOW_ADDR);
- mbx_map.virt = (void __iomem *)ioremap(WINDOW_ADDR, WINDOW_SIZE * 4);
+ mbx_map.virt = ioremap(WINDOW_ADDR, WINDOW_SIZE * 4);
if (!mbx_map.virt) {
printk("Failed to ioremap\n");
Index: netsc520.c
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/maps/netsc520.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- netsc520.c 16 Sep 2004 23:27:13 -0000 1.11
+++ netsc520.c 4 Nov 2004 13:24:15 -0000 1.12
@@ -95,7 +95,7 @@
static int __init init_netsc520(void)
{
printk(KERN_NOTICE "NetSc520 flash device: 0x%lx at 0x%lx\n", netsc520_map.size, netsc520_map.phys);
- netsc520_map.virt = (void __iomem *)ioremap_nocache(netsc520_map.phys, netsc520_map.size);
+ netsc520_map.virt = ioremap_nocache(netsc520_map.phys, netsc520_map.size);
if (!netsc520_map.virt) {
printk("Failed to ioremap_nocache\n");
Index: nettel.c
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/maps/nettel.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- nettel.c 20 Oct 2004 22:17:30 -0000 1.7
+++ nettel.c 4 Nov 2004 13:24:15 -0000 1.8
@@ -273,7 +273,7 @@
__asm__ ("wbinvd");
nettel_amd_map.phys = amdaddr;
- nettel_amd_map.virt = (void __iomem *) ioremap_nocache(amdaddr, maxsize);
+ nettel_amd_map.virt = ioremap_nocache(amdaddr, maxsize);
if (!nettel_amd_map.virt) {
printk("SNAPGEAR: failed to ioremap() BOOTCS\n");
return(-EIO);
Index: ocelot.c
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/maps/ocelot.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- ocelot.c 16 Sep 2004 23:27:13 -0000 1.14
+++ ocelot.c 4 Nov 2004 13:24:15 -0000 1.15
@@ -81,7 +81,7 @@
iounmap(pld);
/* Now ioremap the NVRAM space */
- ocelot_nvram_map.virt = (void __iomem *)ioremap_nocache(NVRAM_WINDOW_ADDR, NVRAM_WINDOW_SIZE);
+ ocelot_nvram_map.virt = ioremap_nocache(NVRAM_WINDOW_ADDR, NVRAM_WINDOW_SIZE);
if (!ocelot_nvram_map.virt) {
printk(KERN_NOTICE "Failed to ioremap Ocelot NVRAM space\n");
return -EIO;
@@ -101,7 +101,7 @@
nvram_mtd->write = ocelot_ram_write;
/* Now map the flash space */
- ocelot_flash_map.virt = (void __iomem *)ioremap_nocache(FLASH_WINDOW_ADDR, FLASH_WINDOW_SIZE);
+ ocelot_flash_map.virt = ioremap_nocache(FLASH_WINDOW_ADDR, FLASH_WINDOW_SIZE);
if (!ocelot_flash_map.virt) {
printk(KERN_NOTICE "Failed to ioremap Ocelot flash space\n");
goto fail_2;
Index: ocotea.c
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/maps/ocotea.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ocotea.c 16 Sep 2004 23:27:13 -0000 1.2
+++ ocotea.c 4 Nov 2004 13:24:15 -0000 1.3
@@ -84,8 +84,7 @@
}
ocotea_small_map.phys = small_flash_base;
- ocotea_small_map.virt =
- (void __iomem *)ioremap64(small_flash_base,
+ ocotea_small_map.virt = ioremap64(small_flash_base,
ocotea_small_map.size);
if (!ocotea_small_map.virt) {
@@ -106,8 +105,7 @@
}
ocotea_large_map.phys = large_flash_base;
- ocotea_large_map.virt =
- (void __iomem *)ioremap64(large_flash_base,
+ ocotea_large_map.virt = ioremap64(large_flash_base,
ocotea_large_map.size);
if (!ocotea_large_map.virt) {
Index: pb1550-flash.c
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/maps/pb1550-flash.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- pb1550-flash.c 16 Sep 2004 23:27:13 -0000 1.5
+++ pb1550-flash.c 4 Nov 2004 13:24:15 -0000 1.6
@@ -178,8 +178,7 @@
*/
printk(KERN_NOTICE "Pb1550 flash: probing %d-bit flash bus\n",
pb1550_map.bankwidth*8);
- pb1550_map.virt =
- (void __iomem *)ioremap(window_addr, window_size);
+ pb1550_map.virt = ioremap(window_addr, window_size);
mymtd = do_map_probe("cfi_probe", &pb1550_map);
if (!mymtd) return -ENXIO;
mymtd->owner = THIS_MODULE;
Index: pb1xxx-flash.c
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/maps/pb1xxx-flash.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- pb1xxx-flash.c 26 Sep 2004 07:33:01 -0000 1.13
+++ pb1xxx-flash.c 4 Nov 2004 13:24:15 -0000 1.14
@@ -149,7 +149,7 @@
*/
printk(KERN_NOTICE "Pb1xxx flash: probing %d-bit flash bus\n",
BUSWIDTH*8);
- pb1xxx_mtd_map.virt = (void __iomem *)ioremap(WINDOW_ADDR, WINDOW_SIZE);
+ pb1xxx_mtd_map.virt = ioremap(WINDOW_ADDR, WINDOW_SIZE);
simple_map_init(&pb1xxx_mtd_map);
Index: physmap.c
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/maps/physmap.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- physmap.c 16 Sep 2004 23:27:13 -0000 1.35
+++ physmap.c 4 Nov 2004 13:24:15 -0000 1.36
@@ -51,7 +51,7 @@
const char **type;
printk(KERN_NOTICE "physmap flash device: %lx at %lx\n", physmap_map.size, physmap_map.phys);
- physmap_map.virt = (void __iomem *)ioremap(physmap_map.phys, physmap_map.size);
+ physmap_map.virt = ioremap(physmap_map.phys, physmap_map.size);
if (!physmap_map.virt) {
printk("Failed to ioremap\n");
Index: redwood.c
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/maps/redwood.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- redwood.c 16 Sep 2004 23:27:13 -0000 1.9
+++ redwood.c 4 Nov 2004 13:24:15 -0000 1.10
@@ -131,8 +131,7 @@
printk(KERN_NOTICE "redwood: flash mapping: %x at %x\n",
WINDOW_SIZE, WINDOW_ADDR);
- redwood_flash_map.virt =
- (void __iomem *)ioremap(WINDOW_ADDR, WINDOW_SIZE);
+ redwood_flash_map.virt = ioremap(WINDOW_ADDR, WINDOW_SIZE);
if (!redwood_flash_map.virt) {
printk("init_redwood_flash: failed to ioremap\n");
Index: rpxlite.c
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/maps/rpxlite.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- rpxlite.c 16 Sep 2004 23:27:13 -0000 1.21
+++ rpxlite.c 4 Nov 2004 13:24:15 -0000 1.22
@@ -28,7 +28,7 @@
int __init init_rpxlite(void)
{
printk(KERN_NOTICE "RPX Lite or CLLF flash device: %x at %x\n", WINDOW_SIZE*4, WINDOW_ADDR);
- rpxlite_map.virt = (void __iomem *)ioremap(WINDOW_ADDR, WINDOW_SIZE * 4);
+ rpxlite_map.virt = ioremap(WINDOW_ADDR, WINDOW_SIZE * 4);
if (!rpxlite_map.virt) {
printk("Failed to ioremap\n");
Index: sbc_gxx.c
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/maps/sbc_gxx.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- sbc_gxx.c 16 Sep 2004 23:27:14 -0000 1.30
+++ sbc_gxx.c 4 Nov 2004 13:24:15 -0000 1.31
@@ -195,7 +195,7 @@
int __init init_sbc_gxx(void)
{
- iomapadr = (void __iomem *)ioremap(WINDOW_START, WINDOW_LENGTH);
+ iomapadr = ioremap(WINDOW_START, WINDOW_LENGTH);
if (!iomapadr) {
printk( KERN_ERR"%s: failed to ioremap memory region\n",
sbc_gxx_map.name );
Index: sc520cdp.c
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/maps/sc520cdp.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sc520cdp.c 16 Sep 2004 23:27:14 -0000 1.17
+++ sc520cdp.c 4 Nov 2004 13:24:15 -0000 1.18
@@ -241,7 +241,7 @@
printk(KERN_NOTICE "SC520 CDP flash device: 0x%lx at 0x%lx\n",
sc520cdp_map[i].size, sc520cdp_map[i].phys);
- sc520cdp_map[i].virt = (void __iomem *)ioremap_nocache(sc520cdp_map[i].phys, sc520cdp_map[i].size);
+ sc520cdp_map[i].virt = ioremap_nocache(sc520cdp_map[i].phys, sc520cdp_map[i].size);
if (!sc520cdp_map[i].virt) {
printk("Failed to ioremap_nocache\n");
Index: scx200_docflash.c
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/maps/scx200_docflash.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- scx200_docflash.c 16 Sep 2004 23:27:14 -0000 1.7
+++ scx200_docflash.c 4 Nov 2004 13:24:15 -0000 1.8
@@ -180,7 +180,7 @@
simple_map_init(&scx200_docflash_map);
scx200_docflash_map.phys = docmem.start;
- scx200_docflash_map.virt = (void __iomem *)ioremap(docmem.start, scx200_docflash_map.size);
+ scx200_docflash_map.virt = ioremap(docmem.start, scx200_docflash_map.size);
if (!scx200_docflash_map.virt) {
printk(KERN_ERR NAME ": failed to ioremap the flash\n");
release_resource(&docmem);
Index: sun_uflash.c
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/maps/sun_uflash.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sun_uflash.c 16 Sep 2004 23:27:14 -0000 1.10
+++ sun_uflash.c 4 Nov 2004 13:24:15 -0000 1.11
@@ -96,8 +96,7 @@
pdev->map.name = pdev->name;
}
pdev->map.phys = edev->resource[0].start;
- pdev->map.virt =
- (void __iomem *)ioremap_nocache(edev->resource[0].start, pdev->map.size);
+ pdev->map.virt = ioremap_nocache(edev->resource[0].start, pdev->map.size);
if(0 == pdev->map.virt) {
printk("%s: failed to map device\n", __FUNCTION__);
kfree(pdev->name);
Index: uclinux.c
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/maps/uclinux.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- uclinux.c 16 Sep 2004 23:27:14 -0000 1.8
+++ uclinux.c 4 Nov 2004 13:24:15 -0000 1.9
@@ -69,8 +69,7 @@
printk("uclinux[mtd]: RAM probe address=0x%x size=0x%x\n",
(int) mapp->map_priv_2, (int) mapp->size);
- mapp->virt = (void __iomem *)
- ioremap_nocache(mapp->phys, mapp->size);
+ mapp->virt = ioremap_nocache(mapp->phys, mapp->size);
if (mapp->virt == 0) {
printk("uclinux[mtd]: ioremap_nocache() failed\n");
Index: wr_sbc82xx_flash.c
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/maps/wr_sbc82xx_flash.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- wr_sbc82xx_flash.c 16 Sep 2004 23:27:14 -0000 1.6
+++ wr_sbc82xx_flash.c 4 Nov 2004 13:24:15 -0000 1.7
@@ -116,7 +116,7 @@
}
printk(" at %08lx)\n", sbc82xx_flash_map[i].phys);
- sbc82xx_flash_map[i].virt = (void __iomem *)ioremap(sbc82xx_flash_map[i].phys, sbc82xx_flash_map[i].size);
+ sbc82xx_flash_map[i].virt = ioremap(sbc82xx_flash_map[i].phys, sbc82xx_flash_map[i].size);
if (!sbc82xx_flash_map[i].virt) {
printk("Failed to ioremap\n");
- Previous message: 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
- Next message: mtd/fs/jffs2 os-linux.h,1.48,1.49 wbuf.c,1.73,1.74
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the linux-mtd-cvs
mailing list