diff options
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/net/e1000_spi.c | 2 | ||||
-rw-r--r-- | drivers/spi/Kconfig | 7 | ||||
-rw-r--r-- | drivers/spi/cf_spi.c | 8 | ||||
-rw-r--r-- | drivers/spi/fsl_dspi.c | 10 |
4 files changed, 5 insertions, 22 deletions
diff --git a/drivers/net/e1000_spi.c b/drivers/net/e1000_spi.c index cb5f93d652..b38f4df9f3 100644 --- a/drivers/net/e1000_spi.c +++ b/drivers/net/e1000_spi.c @@ -78,8 +78,6 @@ static inline struct e1000_hw *e1000_hw_from_spi(struct spi_slave *spi) } /* Not sure why all of these are necessary */ -void spi_init_r(void) { /* Nothing to do */ } -void spi_init_f(void) { /* Nothing to do */ } void spi_init(void) { /* Nothing to do */ } struct spi_slave *spi_setup_slave(unsigned int bus, unsigned int cs, diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig index ec92b84ed2..6667f7321f 100644 --- a/drivers/spi/Kconfig +++ b/drivers/spi/Kconfig @@ -1,4 +1,7 @@ -menu "SPI Support" +menuconfig SPI + bool "SPI Support" + +if SPI config DM_SPI bool "Enable Driver Model for SPI drivers" @@ -312,4 +315,4 @@ config OMAP3_SPI (McSPI). This driver be used to access SPI chips on platforms embedding this OMAP3 McSPI IP core. -endmenu # menu "SPI Support" +endif # menu "SPI Support" diff --git a/drivers/spi/cf_spi.c b/drivers/spi/cf_spi.c index 7be9427781..68317ed633 100644 --- a/drivers/spi/cf_spi.c +++ b/drivers/spi/cf_spi.c @@ -288,14 +288,6 @@ int spi_cs_is_valid(unsigned int bus, unsigned int cs) return 0; } -void spi_init_f(void) -{ -} - -void spi_init_r(void) -{ -} - void spi_init(void) { cfspi_init(); diff --git a/drivers/spi/fsl_dspi.c b/drivers/spi/fsl_dspi.c index 42086197d9..41d1ba2fa5 100644 --- a/drivers/spi/fsl_dspi.c +++ b/drivers/spi/fsl_dspi.c @@ -396,16 +396,6 @@ void spi_init(void) /* Nothing to do */ } -void spi_init_f(void) -{ - /* Nothing to do */ -} - -void spi_init_r(void) -{ - /* Nothing to do */ -} - int spi_cs_is_valid(unsigned int bus, unsigned int cs) { if (((cs >= 0) && (cs < 8)) && ((bus >= 0) && (bus < 8))) |