Skip to contentSkip to conversation

IDE: palm_bk3710: use ioremap instead of arch-specific IO_ADDRESS()

PATCH Applied Kevin Hilman 3 participants 3 messages Jan 30, 2009 – Feb 1, 2009 libata

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 IDE: palm_bk3710: use ioremap instead of arch-specific IO_ADDRESS()

Cc Sergei Shtylyov <[email protected]>
---
 drivers/ide/palm_bk3710.c |   12 +++++++++---
 1 files changed, 9 insertions(+), 3 deletions(-)
drivers/ide/palm_bk3710.c +9 -3
index f38aac7..6196f76 100644
@@ -347,7 +347,7 @@ static int __init palm_bk3710_probe(struct platform_device *pdev)
 	struct clk *clk;
 	struct resource *mem, *irq;
 	void __iomem *base;
-	unsigned long rate;
+	unsigned long rate, mem_size;
 	int i, rc;
 	hw_regs_t hw, *hws[] = { &hw, NULL, NULL, NULL };
 
@@ -374,13 +374,19 @@ static int __init palm_bk3710_probe(struct platform_device *pdev)
 		return -ENODEV;
 	}
 
-	if (request_mem_region(mem->start, mem->end - mem->start + 1,
+	mem_size = mem->end - mem->start + 1;
+	if (request_mem_region(mem->start, mem_size,
 			       "palm_bk3710") == NULL) {
 		printk(KERN_ERR "failed to request memory region\n");
 		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 */
 	palm_bk3710_chipinit(base);
Signature · 1 line
1.6.1
Acked-by on v2 1/1
#1 lore raw
Quoted 1 line · Kevin Hilman
Quoted 14 lines
drivers/ide/palm_bk3710.c +1 -1
index f38aac7..6196f76 100644
@@ -347,7 +347,7 @@ static int __init palm_bk3710_probe(struct platform_device *pdev)
 	struct clk *clk;
 	struct resource *mem, *irq;
 	void __iomem *base;
-	unsigned long rate;
+	unsigned long rate, mem_size;
 	int i, rc;
 	hw_regs_t hw, *hws[] = { &hw, NULL, NULL, NULL };
 

drivers/ide/palm_bk3710.c static int __init palm_bk3710_probe(struct platform_device *pdev) · line 379

Quoted 7 lines
drivers/ide/palm_bk3710.c +2 -1
@@ -374,13 +374,19 @@ static int __init palm_bk3710_probe(struct platform_device *pdev)
 		return -ENODEV;
 	}
 
-	if (request_mem_region(mem->start, mem->end - mem->start + 1,
+	mem_size = mem->end - mem->start + 1;
+	if (request_mem_region(mem->start, mem_size,
 			       "palm_bk3710") == NULL) {

No point in keeping *if* occupying 2 lines, I think...

MBR, Sergei

#2 lore raw
Quoted 5 lines · Sergei Shtylyov
Quoted 1 line · Kevin Hilman

applied

[ yay, this driver builds on x86 again :) ]

Quoted 17 lines
Quoted 17 lines
drivers/ide/palm_bk3710.c +1 -1
index f38aac7..6196f76 100644
@@ -347,7 +347,7 @@ static int __init palm_bk3710_probe(struct platform_device *pdev)
 	struct clk *clk;
 	struct resource *mem, *irq;
 	void __iomem *base;
-	unsigned long rate;
+	unsigned long rate, mem_size;
 	int i, rc;
 	hw_regs_t hw, *hws[] = { &hw, NULL, NULL, NULL };
 
@@ -374,13 +374,19 @@ static int __init palm_bk3710_probe(struct platform_device *pdev)
 		return -ENODEV;
 	}
 
Quoted 6 lines

drivers/ide/palm_bk3710.c static int __init palm_bk3710_probe(struct platform_device *pdev) · line 379

Quoted 4 lines
drivers/ide/palm_bk3710.c +2 -1
-	if (request_mem_region(mem->start, mem->end - mem->start + 1,
+	mem_size = mem->end - mem->start + 1;
+	if (request_mem_region(mem->start, mem_size,
 			       "palm_bk3710") == NULL) {

No point in keeping *if* occupying 2 lines, I think...

I fixed it while merging the patch.