powerpc/cpm2: Remove cpm2_map() and cpm2_unmap()

Since commit 449012daa92a ("[POWERPC] cpm2: Infrastructure code
cleanup.") cpm2_map() is just returning cpm2_immr pointer and
cpm2_unmap() does nothing.

We already have parts of code that use cpm2_immr directly so get rid
of cpm2_map() and cpm2_unmap() by using cpm2_immr directly. And avoid
going through local pointers that hide the pointed structure.

Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://msgid.link/9fe6ff7284e9f968b12abe7de7c08d7ea40e29d6.1691474658.git.christophe.leroy@csgroup.eu

authored by

Christophe Leroy and committed by

Michael Ellerman 2 years ago 7768716d fbbf4280

+12 -31

3 changed files

expand all

arch

powerpc

include

asm

fs_pd.h

sysdev

cpm2.c

cpm2_pic.c

-8

arch/powerpc/include/asm/fs_pd.h

··· 14 14 #include <sysdev/fsl_soc.h> 15 15 #include <asm/time.h> 16 16 17 - #ifdef CONFIG_CPM2 18 - #include <asm/cpm2.h> 19 - 20 - #define cpm2_map(member) (&cpm2_immr->member) 21 - #define cpm2_map_size(member, size) (&cpm2_immr->member) 22 - #define cpm2_unmap(addr) do {} while(0) 23 - #endif 24 - 25 17 static inline int uart_baudrate(void) 26 18 { 27 19 return get_baudrate();

+11 -21

arch/powerpc/sysdev/cpm2.c

··· 40 40 #include <asm/page.h> 41 41 #include <asm/cpm2.h> 42 42 #include <asm/rheap.h> 43 - #include <asm/fs_pd.h> 44 43 45 44 #include <sysdev/fsl_soc.h> 46 45 ··· 117 118 /* This is good enough to get SMCs running..... 118 119 */ 119 120 if (brg < 4) { 120 - bp = cpm2_map_size(im_brgc1, 16); 121 + bp = &cpm2_immr->im_brgc1; 121 122 } else { 122 - bp = cpm2_map_size(im_brgc5, 16); 123 + bp = &cpm2_immr->im_brgc5; 123 124 brg -= 4; 124 125 } 125 126 bp += brg; ··· 129 130 val |= CPM_BRG_DIV16; 130 131 131 132 out_be32(bp, val); 132 - cpm2_unmap(bp); 133 133 } 134 134 EXPORT_SYMBOL(__cpm2_setbrg); 135 135 ··· 137 139 int ret = 0; 138 140 int shift; 139 141 int i, bits = 0; 140 - cpmux_t __iomem *im_cpmux; 141 142 u32 __iomem *reg; 142 143 u32 mask = 7; 143 144 ··· 199 202 {CPM_CLK_SCC4, CPM_CLK8, 7}, 200 203 }; 201 204 202 - im_cpmux = cpm2_map(im_cpmux); 203 - 204 205 switch (target) { 205 206 case CPM_CLK_SCC1: 206 - reg = &im_cpmux->cmx_scr; 207 + reg = &cpm2_immr->im_cpmux.cmx_scr; 207 208 shift = 24; 208 209 break; 209 210 case CPM_CLK_SCC2: 210 - reg = &im_cpmux->cmx_scr; 211 + reg = &cpm2_immr->im_cpmux.cmx_scr; 211 212 shift = 16; 212 213 break; 213 214 case CPM_CLK_SCC3: 214 - reg = &im_cpmux->cmx_scr; 215 + reg = &cpm2_immr->im_cpmux.cmx_scr; 215 216 shift = 8; 216 217 break; 217 218 case CPM_CLK_SCC4: 218 - reg = &im_cpmux->cmx_scr; 219 + reg = &cpm2_immr->im_cpmux.cmx_scr; 219 220 shift = 0; 220 221 break; 221 222 case CPM_CLK_FCC1: 222 - reg = &im_cpmux->cmx_fcr; 223 + reg = &cpm2_immr->im_cpmux.cmx_fcr; 223 224 shift = 24; 224 225 break; 225 226 case CPM_CLK_FCC2: 226 - reg = &im_cpmux->cmx_fcr; 227 + reg = &cpm2_immr->im_cpmux.cmx_fcr; 227 228 shift = 16; 228 229 break; 229 230 case CPM_CLK_FCC3: 230 - reg = &im_cpmux->cmx_fcr; 231 + reg = &cpm2_immr->im_cpmux.cmx_fcr; 231 232 shift = 8; 232 233 break; 233 234 default: ··· 255 260 256 261 out_be32(reg, (in_be32(reg) & ~mask) | bits); 257 262 258 - cpm2_unmap(im_cpmux); 259 263 return ret; 260 264 } 261 265 ··· 263 269 int ret = 0; 264 270 int shift; 265 271 int i, bits = 0; 266 - cpmux_t __iomem *im_cpmux; 267 272 u8 __iomem *reg; 268 273 u8 mask = 3; 269 274 ··· 277 284 {CPM_CLK_SMC2, CPM_CLK15, 3}, 278 285 }; 279 286 280 - im_cpmux = cpm2_map(im_cpmux); 281 - 282 287 switch (target) { 283 288 case CPM_CLK_SMC1: 284 - reg = &im_cpmux->cmx_smr; 289 + reg = &cpm2_immr->im_cpmux.cmx_smr; 285 290 mask = 3; 286 291 shift = 4; 287 292 break; 288 293 case CPM_CLK_SMC2: 289 - reg = &im_cpmux->cmx_smr; 294 + reg = &cpm2_immr->im_cpmux.cmx_smr; 290 295 mask = 3; 291 296 shift = 0; 292 297 break; ··· 307 316 308 317 out_8(reg, (in_8(reg) & ~mask) | bits); 309 318 310 - cpm2_unmap(im_cpmux); 311 319 return ret; 312 320 } 313 321

+1 -2

arch/powerpc/sysdev/cpm2_pic.c

··· 34 34 35 35 #include <asm/immap_cpm2.h> 36 36 #include <asm/io.h> 37 - #include <asm/fs_pd.h> 38 37 39 38 #include "cpm2_pic.h" 40 39 ··· 229 230 { 230 231 int i; 231 232 232 - cpm2_intctl = cpm2_map(im_intctl); 233 + cpm2_intctl = &cpm2_immr->im_intctl; 233 234 234 235 /* Clear the CPM IRQ controller, in case it has any bits set 235 236 * from the bootloader

Configure Feed

Configure Feed