diff options
| author | Scott Wood <scottwood@freescale.com> | 2007-09-14 15:30:44 -0500 |
|---|---|---|
| committer | Kumar Gala <galak@kernel.crashing.org> | 2007-10-04 11:02:04 -0500 |
| commit | 449012daa92a60e42f0d55478641cfa796d51528 (patch) | |
| tree | 0d79f3259147e7fda762ab1e07586697c22641a2 /include/asm-powerpc/fs_pd.h | |
| parent | 544cdabe642e5508e784de709530a74d0775d070 (diff) | |
| download | blackbird-op-linux-449012daa92a60e42f0d55478641cfa796d51528.tar.gz blackbird-op-linux-449012daa92a60e42f0d55478641cfa796d51528.zip | |
[POWERPC] cpm2: Infrastructure code cleanup.
Mostly sparse fixes (__iomem annotations, etc); also, cpm2_immr
is used rather than creating many temporary mappings.
Signed-off-by: Scott Wood <scottwood@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Diffstat (limited to 'include/asm-powerpc/fs_pd.h')
| -rw-r--r-- | include/asm-powerpc/fs_pd.h | 19 |
1 files changed, 3 insertions, 16 deletions
diff --git a/include/asm-powerpc/fs_pd.h b/include/asm-powerpc/fs_pd.h index 77e04d01749c..64706a0532d3 100644 --- a/include/asm-powerpc/fs_pd.h +++ b/include/asm-powerpc/fs_pd.h @@ -23,22 +23,9 @@ #include <asm/mpc85xx.h> #endif -#define cpm2_map(member) \ -({ \ - u32 offset = offsetof(cpm2_map_t, member); \ - void *addr = ioremap (CPM_MAP_ADDR + offset, \ - sizeof( ((cpm2_map_t*)0)->member)); \ - addr; \ -}) - -#define cpm2_map_size(member, size) \ -({ \ - u32 offset = offsetof(cpm2_map_t, member); \ - void *addr = ioremap (CPM_MAP_ADDR + offset, size); \ - addr; \ -}) - -#define cpm2_unmap(addr) iounmap(addr) +#define cpm2_map(member) (&cpm2_immr->member) +#define cpm2_map_size(member, size) (&cpm2_immr->member) +#define cpm2_unmap(addr) do {} while(0) #endif #ifdef CONFIG_8xx |
