Skip to content

Commit ad496f8

Browse files
chleroympe
authored andcommitted
powerpc: Remove cpm_dp...() macros
Since commit d3c511a ("powerpc/cpm: Remove !CONFIG_PPC_CPM_NEW_BINDING code") cpm_dp...() macros have no added value anymore. Last user of those macros were fixed by commit 5e6cb39 ("net: fs_enet: Use cpm_muram_xxx() functions instead of cpm_dpxxx() macros") Remove them. Signed-off-by: Christophe Leroy <[email protected]> Signed-off-by: Michael Ellerman <[email protected]> Link: https://msgid.link/3aaa40bf706afeab8fe9a74b8437704a4269a6a2.1697005615.git.christophe.leroy@csgroup.eu
1 parent b629b54 commit ad496f8

File tree

3 files changed

+2
-11
lines changed

3 files changed

+2
-11
lines changed

arch/powerpc/include/asm/cpm1.h

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -49,11 +49,6 @@
4949
*/
5050
extern cpm8xx_t __iomem *cpmp; /* Pointer to comm processor */
5151

52-
#define cpm_dpalloc cpm_muram_alloc
53-
#define cpm_dpfree cpm_muram_free
54-
#define cpm_dpram_addr cpm_muram_addr
55-
#define cpm_dpram_phys cpm_muram_dma
56-
5752
extern void cpm_setbrg(uint brg, uint rate);
5853

5954
extern void __init cpm_load_patch(cpm8xx_t *cp);

arch/powerpc/include/asm/cpm2.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -87,10 +87,6 @@
8787
*/
8888
extern cpm_cpm2_t __iomem *cpmp; /* Pointer to comm processor */
8989

90-
#define cpm_dpalloc cpm_muram_alloc
91-
#define cpm_dpfree cpm_muram_free
92-
#define cpm_dpram_addr cpm_muram_addr
93-
9490
extern void cpm2_reset(void);
9591

9692
/* Baud rate generators.

drivers/soc/fsl/qe/qe_common.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ static s32 cpm_muram_alloc_common(unsigned long size,
141141
*
142142
* This function returns a non-negative offset into the muram area, or
143143
* a negative errno on failure.
144-
* Use cpm_dpram_addr() to get the virtual address of the area.
144+
* Use cpm_muram_addr() to get the virtual address of the area.
145145
* Use cpm_muram_free() to free the allocation.
146146
*/
147147
s32 cpm_muram_alloc(unsigned long size, unsigned long align)
@@ -193,7 +193,7 @@ EXPORT_SYMBOL(cpm_muram_free);
193193
* @size: number of bytes to allocate
194194
* This function returns @offset if the area was available, a negative
195195
* errno otherwise.
196-
* Use cpm_dpram_addr() to get the virtual address of the area.
196+
* Use cpm_muram_addr() to get the virtual address of the area.
197197
* Use cpm_muram_free() to free the allocation.
198198
*/
199199
s32 cpm_muram_alloc_fixed(unsigned long offset, unsigned long size)

0 commit comments

Comments
 (0)