diff options
| author | Nicolas Ferre <nicolas.ferre@atmel.com> | 2012-01-18 16:56:36 +0100 | 
|---|---|---|
| committer | Nicolas Ferre <nicolas.ferre@atmel.com> | 2012-03-01 13:38:48 +0100 | 
| commit | 298312971b2fe8b922a1a15e0a6f5b4da89677d8 (patch) | |
| tree | 25a6c8588077badac4d0092e3b81c5df0c8508d1 /drivers/misc/atmel_tclib.c | |
| parent | 986c265729cb798bb8414bd5d6c6006240a1011c (diff) | |
| download | olio-linux-3.10-298312971b2fe8b922a1a15e0a6f5b4da89677d8.tar.xz olio-linux-3.10-298312971b2fe8b922a1a15e0a6f5b4da89677d8.zip | |
ARM: at91/tclib: take iomem size from resource
Requesting iomem region and ioremaping is now done using
the resource size specified instead of a constant value.
Each <SoC>_device.c file is modified accordingly to reflect
actual user interface size.
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Acked-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Diffstat (limited to 'drivers/misc/atmel_tclib.c')
| -rw-r--r-- | drivers/misc/atmel_tclib.c | 17 | 
1 files changed, 9 insertions, 8 deletions
| diff --git a/drivers/misc/atmel_tclib.c b/drivers/misc/atmel_tclib.c index 4bcfc375973..7a6512a148d 100644 --- a/drivers/misc/atmel_tclib.c +++ b/drivers/misc/atmel_tclib.c @@ -9,10 +9,6 @@  #include <linux/slab.h>  #include <linux/export.h> -/* Number of bytes to reserve for the iomem resource */ -#define ATMEL_TC_IOMEM_SIZE	256 - -  /*   * This is a thin library to solve the problem of how to portably allocate   * one of the TC blocks.  For simplicity, it doesn't currently expect to @@ -48,6 +44,7 @@ struct atmel_tc *atmel_tc_alloc(unsigned block, const char *name)  	struct atmel_tc		*tc;  	struct platform_device	*pdev = NULL;  	struct resource		*r; +	size_t			size;  	spin_lock(&tc_list_lock);  	list_for_each_entry(tc, &tc_list, node) { @@ -61,11 +58,15 @@ struct atmel_tc *atmel_tc_alloc(unsigned block, const char *name)  		goto fail;  	r = platform_get_resource(pdev, IORESOURCE_MEM, 0); -	r = request_mem_region(r->start, ATMEL_TC_IOMEM_SIZE, name);  	if (!r)  		goto fail; -	tc->regs = ioremap(r->start, ATMEL_TC_IOMEM_SIZE); +	size = resource_size(r); +	r = request_mem_region(r->start, size, name); +	if (!r) +		goto fail; + +	tc->regs = ioremap(r->start, size);  	if (!tc->regs)  		goto fail_ioremap; @@ -76,7 +77,7 @@ out:  	return tc;  fail_ioremap: -	release_mem_region(r->start, ATMEL_TC_IOMEM_SIZE); +	release_mem_region(r->start, size);  fail:  	tc = NULL;  	goto out; @@ -96,7 +97,7 @@ void atmel_tc_free(struct atmel_tc *tc)  	spin_lock(&tc_list_lock);  	if (tc->regs) {  		iounmap(tc->regs); -		release_mem_region(tc->iomem->start, ATMEL_TC_IOMEM_SIZE); +		release_mem_region(tc->iomem->start, resource_size(tc->iomem));  		tc->regs = NULL;  		tc->iomem = NULL;  	} |