From e445fc651e204d1c7da411d80cbbc2e716710e4e Mon Sep 17 00:00:00 2001 From: Markus Helgesson Date: Fri, 28 Jan 2011 11:18:29 +0100 Subject: SPI: Fix of warnings and cleanup. Fixed coverity and compiler warning in drivers/spi/u8500_spi.c. Also removed a variable which is no longer needed after the GPIO-handling was removed from the driver. ST-Ericsson ID: None ST-Ericsson FOSS-OUT ID: Trivial Change-Id: Iea067014c2c2ea4bd4367eccbe1cde36c69e01da Signed-off-by: Markus Helgesson Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/13763 Reviewed-by: Michael BRANDT Reviewed-by: QATOOLS Reviewed-by: Joakim AXELSSON --- drivers/spi/u8500_spi.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/drivers/spi/u8500_spi.c b/drivers/spi/u8500_spi.c index a5f4422ce..dd5f3eaf9 100644 --- a/drivers/spi/u8500_spi.c +++ b/drivers/spi/u8500_spi.c @@ -149,7 +149,6 @@ struct stm_spi_slave { u8 *base_addr; u8 n_bytes; struct spi_regs regs; - char dev_name[4]; }; /* Clock parameters, to set SPI clock at a desired freq */ @@ -355,7 +354,6 @@ void spi_free_slave(struct spi_slave *slave) int spi_claim_bus(struct spi_slave *slave) { struct stm_spi_slave *sss = to_stm_spi_slave(slave); - int ret = 0; pr_dbg("slave 0x%p", slave); @@ -401,11 +399,6 @@ int spi_claim_bus(struct spi_slave *slave) return -1; } - /* Sets the device name, for instance "SPI2" */ - strcpy(sss->dev_name, "SPIx"); - sss->dev_name[3] = ('0' + sss->slave.bus); - - /* * 1. Clear SSE bit in SPI_CR1 register. This step is not required * after an hardware or software reset of the device. @@ -542,7 +535,7 @@ int spi_cs_is_valid(u32 bus, u32 cs) { pr_dbg("bus %u, cs %u", bus, cs); - if (((bus >= 0) && (bus < 4)) && (cs == 0)) + if ((bus < 4) && (cs == 0)) return 1; else return 0; -- cgit v1.2.3