Unverified Commit a1afedbc authored by Aaro Koskinen's avatar Aaro Koskinen Committed by Paul Burton
Browse files

MIPS: OCTEON: cvmx-bootmem: make more functions static 



Make cvmx_bootmem_phy_named_block_find/free() static.

Signed-off-by: default avatarAaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: default avatarPaul Burton <paul.burton@mips.com>
Patchwork: https://patchwork.linux-mips.org/patch/21190/
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: James Hogan <jhogan@kernel.org>
Cc: linux-mips@linux-mips.org
parent bf2d401c

arch/mips/cavium-octeon/executive/cvmx-bootmem.c

+24 −2
Original line number Diff line number Diff line
@@ -557,7 +557,20 @@ int __cvmx_bootmem_phy_free(uint64_t phy_addr, uint64_t size, uint32_t flags) 


}



struct cvmx_bootmem_named_block_desc *

/**

 * Finds a named memory block by name.

 * Also used for finding an unused entry in the named block table.

 *

 * @name: Name of memory block to find.	 If NULL pointer given, then

 *	  finds unused descriptor, if available.

 *

 * @flags: Flags to control options for the allocation.

 *

 * Returns Pointer to memory block descriptor, NULL if not found.

 *	   If NULL returned when name parameter is NULL, then no memory

 *	   block descriptors are available.

 */

static struct cvmx_bootmem_named_block_desc *

	cvmx_bootmem_phy_named_block_find(char *name, uint32_t flags)

{

	unsigned int i;
@@ -651,7 +664,16 @@ struct cvmx_bootmem_named_block_desc *cvmx_bootmem_find_named_block(char *name) 
}

EXPORT_SYMBOL(cvmx_bootmem_find_named_block);



int cvmx_bootmem_phy_named_block_free(char *name, uint32_t flags)

/**

 * Frees a named block.

 *

 * @name:   name of block to free

 * @flags:  flags for passing options

 *

 * Returns 0 on failure

 *	   1 on success

 */

static int cvmx_bootmem_phy_named_block_free(char *name, uint32_t flags)

{

	struct cvmx_bootmem_named_block_desc *named_block_ptr;

arch/mips/include/asm/octeon/cvmx-bootmem.h

+0 −27
Original line number Diff line number Diff line
@@ -301,33 +301,6 @@ int64_t cvmx_bootmem_phy_named_block_alloc(uint64_t size, uint64_t min_addr, 
					   uint64_t alignment,

					   char *name, uint32_t flags);



/**

 * Finds a named memory block by name.

 * Also used for finding an unused entry in the named block table.

 *

 * @name: Name of memory block to find.	 If NULL pointer given, then

 *	  finds unused descriptor, if available.

 *

 * @flags: Flags to control options for the allocation.

 *

 * Returns Pointer to memory block descriptor, NULL if not found.

 *	   If NULL returned when name parameter is NULL, then no memory

 *	   block descriptors are available.

 */

struct cvmx_bootmem_named_block_desc *

cvmx_bootmem_phy_named_block_find(char *name, uint32_t flags);



/**

 * Frees a named block.

 *

 * @name:   name of block to free

 * @flags:  flags for passing options

 *

 * Returns 0 on failure

 *	   1 on success

 */

int cvmx_bootmem_phy_named_block_free(char *name, uint32_t flags);



/**

 * Frees a block to the bootmem allocator list.	 This must

 * be used with care, as the size provided must match the size