Commit ad496f8f authored by Christophe Leroy's avatar Christophe Leroy Committed by Michael Ellerman
Browse files

powerpc: Remove cpm_dp...() macros 



Since commit d3c511ac ("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 5e6cb39a ("net:
fs_enet: Use cpm_muram_xxx() functions instead of cpm_dpxxx() macros")

Remove them.

Signed-off-by: default avatarChristophe Leroy <christophe.leroy@csgroup.eu>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Link: https://msgid.link/3aaa40bf706afeab8fe9a74b8437704a4269a6a2.1697005615.git.christophe.leroy@csgroup.eu
parent b629b541

arch/powerpc/include/asm/cpm1.h

+0 −5
Original line number Diff line number Diff line
@@ -49,11 +49,6 @@ 
 */

extern cpm8xx_t __iomem *cpmp; /* Pointer to comm processor */



#define cpm_dpalloc cpm_muram_alloc

#define cpm_dpfree cpm_muram_free

#define cpm_dpram_addr cpm_muram_addr

#define cpm_dpram_phys cpm_muram_dma



extern void cpm_setbrg(uint brg, uint rate);



extern void __init cpm_load_patch(cpm8xx_t *cp);

arch/powerpc/include/asm/cpm2.h

+0 −4
Original line number Diff line number Diff line
@@ -87,10 +87,6 @@ 
 */

extern cpm_cpm2_t __iomem *cpmp; /* Pointer to comm processor */



#define cpm_dpalloc cpm_muram_alloc

#define cpm_dpfree cpm_muram_free

#define cpm_dpram_addr cpm_muram_addr



extern void cpm2_reset(void);



/* Baud rate generators.

drivers/soc/fsl/qe/qe_common.c

+2 −2
Original line number Diff line number Diff line
@@ -141,7 +141,7 @@ static s32 cpm_muram_alloc_common(unsigned long size, 
 *

 * This function returns a non-negative offset into the muram area, or

 * a negative errno on failure.

 * Use cpm_dpram_addr() to get the virtual address of the area.

 * Use cpm_muram_addr() to get the virtual address of the area.

 * Use cpm_muram_free() to free the allocation.

 */

s32 cpm_muram_alloc(unsigned long size, unsigned long align)
@@ -193,7 +193,7 @@ EXPORT_SYMBOL(cpm_muram_free); 
 * @size: number of bytes to allocate

 * This function returns @offset if the area was available, a negative

 * errno otherwise.

 * Use cpm_dpram_addr() to get the virtual address of the area.

 * Use cpm_muram_addr() to get the virtual address of the area.

 * Use cpm_muram_free() to free the allocation.

 */

s32 cpm_muram_alloc_fixed(unsigned long offset, unsigned long size)