IDE: palm_bk3710: use ioremap instead of arch-specific IO_ADDRESS()
Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com> Acked-by: Sergei Shtylyov <sshtylyov@ru.mvista.com> [bart: minor CodingStyle fixup per Sergei's suggestion] Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
This commit is contained in:
parent
f94116aeec
commit
13b8860d10
1 changed files with 9 additions and 4 deletions
|
@ -347,7 +347,7 @@ static int __init palm_bk3710_probe(struct platform_device *pdev)
|
||||||
struct clk *clk;
|
struct clk *clk;
|
||||||
struct resource *mem, *irq;
|
struct resource *mem, *irq;
|
||||||
void __iomem *base;
|
void __iomem *base;
|
||||||
unsigned long rate;
|
unsigned long rate, mem_size;
|
||||||
int i, rc;
|
int i, rc;
|
||||||
hw_regs_t hw, *hws[] = { &hw, NULL, NULL, NULL };
|
hw_regs_t hw, *hws[] = { &hw, NULL, NULL, NULL };
|
||||||
|
|
||||||
|
@ -374,13 +374,18 @@ static int __init palm_bk3710_probe(struct platform_device *pdev)
|
||||||
return -ENODEV;
|
return -ENODEV;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (request_mem_region(mem->start, mem->end - mem->start + 1,
|
mem_size = mem->end - mem->start + 1;
|
||||||
"palm_bk3710") == NULL) {
|
if (request_mem_region(mem->start, mem_size, "palm_bk3710") == NULL) {
|
||||||
printk(KERN_ERR "failed to request memory region\n");
|
printk(KERN_ERR "failed to request memory region\n");
|
||||||
return -EBUSY;
|
return -EBUSY;
|
||||||
}
|
}
|
||||||
|
|
||||||
base = IO_ADDRESS(mem->start);
|
base = ioremap(mem->start, mem_size);
|
||||||
|
if (!base) {
|
||||||
|
printk(KERN_ERR "failed to map IO memory\n");
|
||||||
|
release_mem_region(mem->start, mem_size);
|
||||||
|
return -ENOMEM;
|
||||||
|
}
|
||||||
|
|
||||||
/* Configure the Palm Chip controller */
|
/* Configure the Palm Chip controller */
|
||||||
palm_bk3710_chipinit(base);
|
palm_bk3710_chipinit(base);
|
||||||
|
|
Loading…
Add table
Reference in a new issue