From 5c9df9258ad660ab44f4c692c1577c8a6915347d Mon Sep 17 00:00:00 2001 From: Seung-Woo Kim Date: Tue, 2 Jan 2018 15:38:12 +0900 Subject: [PATCH] spi: sprd: remove build warnings Remove build warnings from sprd spi driver. Change-Id: I59d195f8ff6b2d21d1c2ae7b7eb6fbcfabc5198b Signed-off-by: Seung-Woo Kim --- arch/arm/include/asm/arch-sc8830/sprd_spi.h | 2 +- drivers/spi/sprd_spi.c | 17 ++++------------- 2 files changed, 5 insertions(+), 14 deletions(-) diff --git a/arch/arm/include/asm/arch-sc8830/sprd_spi.h b/arch/arm/include/asm/arch-sc8830/sprd_spi.h index aa6277f..d1b2bad 100644 --- a/arch/arm/include/asm/arch-sc8830/sprd_spi.h +++ b/arch/arm/include/asm/arch-sc8830/sprd_spi.h @@ -214,7 +214,7 @@ extern "C" PUBLIC void SPI_SetRxLen(uint32 data_len, uint32 dummy_bitlen); PUBLIC void SPI_TxReq( void ); PUBLIC void SPI_RxReq( void ); - PUBLIC void SPI_WaitTxFinish(); + PUBLIC void SPI_WaitTxFinish(void); PUBLIC void SPI_Init(SPI_INIT_PARM *spi_parm); PUBLIC void SPI_WriteData(uint32 data, uint32 data_len, uint32 dummy_bitlen); diff --git a/drivers/spi/sprd_spi.c b/drivers/spi/sprd_spi.c index 1fffaf7..6cbddfa 100644 --- a/drivers/spi/sprd_spi.c +++ b/drivers/spi/sprd_spi.c @@ -91,10 +91,10 @@ PUBLIC void SPI_Enable( uint32 spi_id, BOOLEAN is_en) PUBLIC void SPI_Reset( uint32 spi_id, uint32 ms) { - uint32 i = 0; #if defined(CONFIG_SC8830) || defined(CONFIG_SC9630) - #else + uint32 i = 0; + if(spi_id == 0) { *(volatile uint32 *)GR_SOFT_RST |= (1 << 14); @@ -116,12 +116,6 @@ PUBLIC void SPI_Reset( uint32 spi_id, uint32 ms) #endif } - -LOCAL void SPI_PinConfig(void) -{ -} - - // The dividend is clk_spiX_div[1:0] + 1 PUBLIC void SPI_ClkSetting(uint32 spi_id, uint32 clk_src, uint32 clk_div) { @@ -150,7 +144,6 @@ PUBLIC void SPI_ClkSetting(uint32 spi_id, uint32 clk_src, uint32 clk_div) PUBLIC void SPI_SetCsLow( uint32 spi_sel_csx , BOOLEAN is_low) { volatile SPI_CTL_REG_T *spi_ctr_ptr = (volatile SPI_CTL_REG_T*)(SPI_USED_BASE); - uint32 temp; if(is_low) { //spi_ctl0[11:8]:cs3<->cs0 chip select, 0-selected;1-none @@ -332,7 +325,6 @@ PUBLIC void SPI_Init(SPI_INIT_PARM *spi_parm) { volatile SPI_CTL_REG_T *spi_ctr_ptr = (volatile SPI_CTL_REG_T *)(SPI_USED_BASE); uint32 temp; - uint32 ctl0, ctl1, ctl2, ctl3; /*default clk is 500k 192M /(0xc0 * 2)*/ spi_ctr_ptr->clkd =0xc0; @@ -363,11 +355,11 @@ PUBLIC void SPI_Init(SPI_INIT_PARM *spi_parm) #endif } -PUBLIC void SPI_WaitTxFinish() +PUBLIC void SPI_WaitTxFinish(void) { volatile SPI_CTL_REG_T *spi_ctr_ptr = (volatile SPI_CTL_REG_T *)(SPI_USED_BASE); - while( !(spi_ctr_ptr->iraw)&BIT_8 ) // IS tx finish + while( !((spi_ctr_ptr->iraw)&BIT_8) ) // IS tx finish { } spi_ctr_ptr->iclr |= BIT_8; @@ -384,7 +376,6 @@ PUBLIC void SPI_WaitTxFinish() PUBLIC void SPI_WriteData(uint32 data, uint32 data_len, uint32 dummy_bitlen) { - uint32 command; volatile SPI_CTL_REG_T *spi_ctr_ptr = (volatile SPI_CTL_REG_T *)(SPI_USED_BASE); // The unit of data_len is identical with buswidth -- 2.7.4