mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-24 17:59:32 +00:00
[MTD] Cleanup of 'ioremap balanced with iounmap for drivers/mtd subsystem'
Updated version of patch, in response to comments from Francois Romieu <romieu@fr.zoreil.com> Remove gratuitous casts from iounmap and initialisation of variables. Signed-off-by: Amol Lad <amol@verismonetworks.com> Signed-off-by: David Woodhouse <dwmw2@infradead.org>
This commit is contained in:
parent
553a801208
commit
76a5027c37
6 changed files with 13 additions and 13 deletions
|
@ -96,7 +96,7 @@ static struct mtd_partition arctic_partitions[PARTITIONS] = {
|
|||
static int __init
|
||||
init_arctic_mtd(void)
|
||||
{
|
||||
int err = 0;
|
||||
int err;
|
||||
|
||||
printk("%s: 0x%08x at 0x%08x\n", NAME, SIZE, PADDR);
|
||||
|
||||
|
@ -112,7 +112,7 @@ init_arctic_mtd(void)
|
|||
arctic_mtd = do_map_probe("cfi_probe", &arctic_mtd_map);
|
||||
|
||||
if (!arctic_mtd) {
|
||||
iounmap((void *) arctic_mtd_map.virt);
|
||||
iounmap(arctic_mtd_map.virt);
|
||||
return -ENXIO;
|
||||
}
|
||||
|
||||
|
@ -121,7 +121,7 @@ init_arctic_mtd(void)
|
|||
err = add_mtd_partitions(arctic_mtd, arctic_partitions, PARTITIONS);
|
||||
if (err) {
|
||||
printk("%s: add_mtd_partitions failed\n", NAME);
|
||||
iounmap((void *) arctic_mtd_map.virt);
|
||||
iounmap(arctic_mtd_map.virt);
|
||||
}
|
||||
|
||||
return err;
|
||||
|
|
|
@ -72,7 +72,7 @@ static struct mtd_partition beech_partitions[2] = {
|
|||
static int __init
|
||||
init_beech_mtd(void)
|
||||
{
|
||||
int err = 0;
|
||||
int err;
|
||||
|
||||
printk("%s: 0x%08x at 0x%08x\n", NAME, SIZE, PADDR);
|
||||
|
||||
|
@ -89,7 +89,7 @@ init_beech_mtd(void)
|
|||
beech_mtd = do_map_probe("cfi_probe", &beech_mtd_map);
|
||||
|
||||
if (!beech_mtd) {
|
||||
iounmap((void *) beech_mtd_map.virt);
|
||||
iounmap(beech_mtd_map.virt);
|
||||
return -ENXIO;
|
||||
}
|
||||
|
||||
|
@ -98,7 +98,7 @@ init_beech_mtd(void)
|
|||
err = add_mtd_partitions(beech_mtd, beech_partitions, 2);
|
||||
if (err) {
|
||||
printk("%s: add_mtd_partitions failed\n", NAME);
|
||||
iounmap((void *) beech_mtd_map.virt);
|
||||
iounmap(beech_mtd_map.virt);
|
||||
}
|
||||
|
||||
return err;
|
||||
|
|
|
@ -175,8 +175,8 @@ int __init init_cstm_mips_ixx(void)
|
|||
printk(KERN_WARNING "Failed to ioremap\n");
|
||||
for (j = 0; j < i; j++) {
|
||||
if (cstm_mips_ixx_map[j].virt) {
|
||||
iounmap((void *)cstm_mips_ixx_map[j].virt);
|
||||
cstm_mips_ixx_map[j].virt = 0;
|
||||
iounmap(cstm_mips_ixx_map[j].virt);
|
||||
cstm_mips_ixx_map[j].virt = NULL;
|
||||
}
|
||||
}
|
||||
return -EIO;
|
||||
|
@ -214,8 +214,8 @@ int __init init_cstm_mips_ixx(void)
|
|||
else {
|
||||
for (i = 0; i < PHYSMAP_NUMBER; i++) {
|
||||
if (cstm_mips_ixx_map[i].virt) {
|
||||
iounmap((void *)cstm_mips_ixx_map[i].virt);
|
||||
cstm_mips_ixx_map[i].virt = 0;
|
||||
iounmap(cstm_mips_ixx_map[i].virt);
|
||||
cstm_mips_ixx_map[i].virt = NULL;
|
||||
}
|
||||
}
|
||||
return -ENXIO;
|
||||
|
|
|
@ -463,7 +463,7 @@ int __init nettel_init(void)
|
|||
|
||||
#ifdef CONFIG_MTD_CFI_INTELEXT
|
||||
out_unmap1:
|
||||
iounmap((void *) nettel_intel_map.virt);
|
||||
iounmap(nettel_intel_map.virt);
|
||||
#endif
|
||||
|
||||
out_unmap2:
|
||||
|
|
|
@ -126,7 +126,7 @@ static struct mtd_info *redwood_mtd;
|
|||
|
||||
int __init init_redwood_flash(void)
|
||||
{
|
||||
int err = 0;
|
||||
int err;
|
||||
|
||||
printk(KERN_NOTICE "redwood: flash mapping: %x at %x\n",
|
||||
WINDOW_SIZE, WINDOW_ADDR);
|
||||
|
|
|
@ -199,7 +199,7 @@ static void __exit ep7312_cleanup(void)
|
|||
nand_release(ap7312_mtd);
|
||||
|
||||
/* Release io resource */
|
||||
iounmap((void *)this->IO_ADDR_R);
|
||||
iounmap(this->IO_ADDR_R);
|
||||
|
||||
/* Free the MTD device structure */
|
||||
kfree(ep7312_mtd);
|
||||
|
|
Loading…
Reference in a new issue