diff options
| author | Michael Ellerman <michael@ellerman.id.au> | 2007-10-15 13:34:37 +0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2007-10-15 22:29:49 +0400 |
| commit | cdbd3865acc2e98a349b41d130985e6f5f2dfc19 (patch) | |
| tree | 8df0ce10364d82c205ed6ec7d8ab9af9a2fe2989 | |
| parent | 83f34df4e7c8794a5a81ede663fe184f4201308a (diff) | |
| download | linux-cdbd3865acc2e98a349b41d130985e6f5f2dfc19.tar.xz | |
Use dcr_host_t.base in dcr_unmap()
With the base stored in dcr_host_t, there's no need for callers to pass
the dcr_n into dcr_unmap(). In fact this removes the possibility of them
passing the incorrect value, which would then be iounmap()'ed.
Signed-off-by: Michael Ellerman <michael@ellerman.id.au>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
| -rw-r--r-- | arch/powerpc/sysdev/dcr.c | 4 | ||||
| -rw-r--r-- | drivers/net/ibm_newemac/mal.c | 2 | ||||
| -rw-r--r-- | include/asm-powerpc/dcr-mmio.h | 2 | ||||
| -rw-r--r-- | include/asm-powerpc/dcr-native.h | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/arch/powerpc/sysdev/dcr.c b/arch/powerpc/sysdev/dcr.c index ab11c0b29024..427027c7ea0f 100644 --- a/arch/powerpc/sysdev/dcr.c +++ b/arch/powerpc/sysdev/dcr.c @@ -126,13 +126,13 @@ dcr_host_t dcr_map(struct device_node *dev, unsigned int dcr_n, } EXPORT_SYMBOL_GPL(dcr_map); -void dcr_unmap(dcr_host_t host, unsigned int dcr_n, unsigned int dcr_c) +void dcr_unmap(dcr_host_t host, unsigned int dcr_c) { dcr_host_t h = host; if (h.token == NULL) return; - h.token += dcr_n * h.stride; + h.token += host.base * h.stride; iounmap(h.token); h.token = NULL; } diff --git a/drivers/net/ibm_newemac/mal.c b/drivers/net/ibm_newemac/mal.c index 748a86969d73..39f4cb6b0cf3 100644 --- a/drivers/net/ibm_newemac/mal.c +++ b/drivers/net/ibm_newemac/mal.c @@ -627,7 +627,7 @@ static int __devinit mal_probe(struct of_device *ofdev, fail2: dma_free_coherent(&ofdev->dev, bd_size, mal->bd_virt, mal->bd_dma); fail_unmap: - dcr_unmap(mal->dcr_host, dcr_base, 0x100); + dcr_unmap(mal->dcr_host, 0x100); fail: kfree(mal); diff --git a/include/asm-powerpc/dcr-mmio.h b/include/asm-powerpc/dcr-mmio.h index a7d9eaf22702..08532ff1899c 100644 --- a/include/asm-powerpc/dcr-mmio.h +++ b/include/asm-powerpc/dcr-mmio.h @@ -33,7 +33,7 @@ typedef struct { extern dcr_host_t dcr_map(struct device_node *dev, unsigned int dcr_n, unsigned int dcr_c); -extern void dcr_unmap(dcr_host_t host, unsigned int dcr_n, unsigned int dcr_c); +extern void dcr_unmap(dcr_host_t host, unsigned int dcr_c); static inline u32 dcr_read(dcr_host_t host, unsigned int dcr_n) { diff --git a/include/asm-powerpc/dcr-native.h b/include/asm-powerpc/dcr-native.h index 3bc780f6513a..8dbb1ab0aa04 100644 --- a/include/asm-powerpc/dcr-native.h +++ b/include/asm-powerpc/dcr-native.h @@ -29,7 +29,7 @@ typedef struct { #define DCR_MAP_OK(host) (1) #define dcr_map(dev, dcr_n, dcr_c) ((dcr_host_t){ .base = (dcr_n) }) -#define dcr_unmap(host, dcr_n, dcr_c) do {} while (0) +#define dcr_unmap(host, dcr_c) do {} while (0) #define dcr_read(host, dcr_n) mfdcr(dcr_n + host.base) #define dcr_write(host, dcr_n, value) mtdcr(dcr_n + host.base, value) |