From 2df7b2aadf375fc3d2f336fab8eb41556b997567 Mon Sep 17 00:00:00 2001 From: Marek Vasut Date: Sat, 25 Jul 2015 09:33:28 +0200 Subject: arm: socfpga: scan: Staticize scan_mgr_io_scan_chain_prg() This function is never used outside of scan_manager.c , so make it static. Zap the prototype in scan_manager.h and move the documentation above the function. Make the documentation kerneldoc compliant. Signed-off-by: Marek Vasut --- arch/arm/mach-socfpga/include/mach/scan_manager.h | 11 ----------- arch/arm/mach-socfpga/scan_manager.c | 14 +++++++++----- 2 files changed, 9 insertions(+), 16 deletions(-) diff --git a/arch/arm/mach-socfpga/include/mach/scan_manager.h b/arch/arm/mach-socfpga/include/mach/scan_manager.h index 1155fd3dec..3602aceb07 100644 --- a/arch/arm/mach-socfpga/include/mach/scan_manager.h +++ b/arch/arm/mach-socfpga/include/mach/scan_manager.h @@ -68,17 +68,6 @@ struct socfpga_scan_manager { #define SCANMGR_STAT_ACTIVE_GET(x) (((x) & 0x80000000) >> 31) #define SCANMGR_STAT_WFIFOCNT_GET(x) (((x) & 0x70000000) >> 28) -/* - * Program HPS IO Scan Chain - * io_scan_chain_id - IO scan chain ID - * io_scan_chain_len_in_bits - IO scan chain length in bits - * iocsr_scan_chain - IO scan chain table - */ -uint32_t scan_mgr_io_scan_chain_prg( - uint32_t io_scan_chain_id, - uint32_t io_scan_chain_len_in_bits, - const uint32_t *iocsr_scan_chain); - extern const uint32_t iocsr_scan_chain0_table[ ((CONFIG_HPS_IOCSR_SCANCHAIN0_LENGTH / 32) + 1)]; extern const uint32_t iocsr_scan_chain1_table[ diff --git a/arch/arm/mach-socfpga/scan_manager.c b/arch/arm/mach-socfpga/scan_manager.c index a820b1b1bf..ab7aaecfb7 100644 --- a/arch/arm/mach-socfpga/scan_manager.c +++ b/arch/arm/mach-socfpga/scan_manager.c @@ -38,11 +38,15 @@ static inline uint32_t scan_chain_engine_is_idle(uint32_t max_iter) return 1; } -/* Program HPS IO Scan Chain */ -uint32_t scan_mgr_io_scan_chain_prg( - uint32_t io_scan_chain_id, - uint32_t io_scan_chain_len_in_bits, - const uint32_t *iocsr_scan_chain) +/** + * scan_mgr_io_scan_chain_prg() - Program HPS IO Scan Chain + * @io_scan_chain_id: IO scan chain ID + * @io_scan_chain_len_in_bits: IO scan chain length in bits + * @iocsr_scan_chain: IO scan chain table + */ +static int scan_mgr_io_scan_chain_prg(const unsigned int io_scan_chain_id, + uint32_t io_scan_chain_len_in_bits, + const uint32_t *iocsr_scan_chain) { uint16_t tdi_tdo_header; uint32_t io_program_iter; -- cgit