diff options
| author | Christophe Leroy <christophe.leroy@csgroup.eu> | 2023-08-08 08:04:43 +0200 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2023-08-16 23:54:47 +1000 |
| commit | 7768716d2f1906c9258ed4b39584da6317020594 (patch) | |
| tree | 2da0a064edb42e8232402e18890e201bb375fb7a /arch/powerpc/sysdev/cpm2_pic.c | |
| parent | fbbf4280dae4c02d2f176a8fdac7a7d32fe76fc0 (diff) | |
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
Diffstat (limited to 'arch/powerpc/sysdev/cpm2_pic.c')
| -rw-r--r-- | arch/powerpc/sysdev/cpm2_pic.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/powerpc/sysdev/cpm2_pic.c b/arch/powerpc/sysdev/cpm2_pic.c index d6c1359ae89d..e14493685fe8 100644 --- a/arch/powerpc/sysdev/cpm2_pic.c +++ b/arch/powerpc/sysdev/cpm2_pic.c @@ -34,7 +34,6 @@ #include <asm/immap_cpm2.h> #include <asm/io.h> -#include <asm/fs_pd.h> #include "cpm2_pic.h" @@ -230,7 +229,7 @@ void cpm2_pic_init(struct device_node *node) { int i; - cpm2_intctl = cpm2_map(im_intctl); + cpm2_intctl = &cpm2_immr->im_intctl; /* Clear the CPM IRQ controller, in case it has any bits set * from the bootloader |