staging: wilc1000: remove spi speed control codes

This patch removes spi speed control codes. We are not using define SPEED to
specify speed of spi, it is not proper way of doing this. It will be
provided by the device tree.

The following functions and variable are removed.
MIN_SPEED, MAX_SPEED, SPEED
wilc_spi_set_max_speed
wilc_spi_max_bus_speed
wilc_spi_default_bus_speed
hif_set_max_bus_speed
hif_set_default_bus_speed

Signed-off-by: Glen Lee <glen.lee@atmel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/wilc1000/linux_wlan_spi.c b/drivers/staging/wilc1000/linux_wlan_spi.c
index 1d8922d6eb6ad715ce1840b6f1b74620f0f58479..5e3bff05a95fdb41cd1fb4b174bef064ac902964 100644 (file)
--- a/drivers/staging/wilc1000/linux_wlan_spi.c
+++ b/drivers/staging/wilc1000/linux_wlan_spi.c
@@ -17,33 +17,6 @@
 
 #define USE_SPI_DMA     0       /* johnny add */
 
-#ifdef WILC_ASIC_A0
- #if defined(PLAT_PANDA_ES_OMAP4460)
-  #define MIN_SPEED 12000000
-  #define MAX_SPEED 24000000
- #elif defined(PLAT_WMS8304)
-  #define MIN_SPEED 12000000
-  #define MAX_SPEED 24000000 /* 4000000 */
- #elif defined(CUSTOMER_PLATFORM)
-/*
-  TODO : define Clock speed under 48M.
- *
- * ex)
- * #define MIN_SPEED 24000000
- * #define MAX_SPEED 48000000
- */
- #else
-  #define MIN_SPEED 24000000
-  #define MAX_SPEED 48000000
- #endif
-#else /* WILC_ASIC_A0 */
-/* Limit clk to 6MHz on FPGA. */
- #define MIN_SPEED 6000000
- #define MAX_SPEED 6000000
-#endif /* WILC_ASIC_A0 */
-
-static u32 SPEED = MIN_SPEED;
-
 static const struct wilc1000_ops wilc1000_spi_ops;
 
 static int wilc_bus_probe(struct spi_device *spi)
@@ -119,7 +92,6 @@ int wilc_spi_write(u8 *b, u32 len)
                                struct spi_transfer tr = {
                                        .tx_buf = b + (i * TXRX_PHASE_SIZE),
                                        .len = TXRX_PHASE_SIZE,
-                                       .speed_hz = SPEED,
                                        .bits_per_word = 8,
                                        .delay_usecs = 0,
                                };
@@ -145,7 +117,6 @@ int wilc_spi_write(u8 *b, u32 len)
                        struct spi_transfer tr = {
                                .tx_buf = b + (blk * TXRX_PHASE_SIZE),
                                .len = remainder,
-                               .speed_hz = SPEED,
                                .bits_per_word = 8,
                                .delay_usecs = 0,
                        };
@@ -187,7 +158,6 @@ int wilc_spi_write(u8 *b, u32 len)
                struct spi_transfer tr = {
                        .tx_buf = b,
                        .len = len,
-                       .speed_hz = SPEED,
                        .delay_usecs = 0,
                };
                char *r_buffer = kzalloc(len, GFP_KERNEL);
@@ -249,7 +219,6 @@ int wilc_spi_read(u8 *rb, u32 rlen)
                                struct spi_transfer tr = {
                                        .rx_buf = rb + (i * TXRX_PHASE_SIZE),
                                        .len = TXRX_PHASE_SIZE,
-                                       .speed_hz = SPEED,
                                        .bits_per_word = 8,
                                        .delay_usecs = 0,
                                };
@@ -273,7 +242,6 @@ int wilc_spi_read(u8 *rb, u32 rlen)
                        struct spi_transfer tr = {
                                .rx_buf = rb + (blk * TXRX_PHASE_SIZE),
                                .len = remainder,
-                               .speed_hz = SPEED,
                                .bits_per_word = 8,
                                .delay_usecs = 0,
                        };
@@ -313,7 +281,6 @@ int wilc_spi_read(u8 *rb, u32 rlen)
                struct spi_transfer tr = {
                        .rx_buf = rb,
                        .len = rlen,
-                       .speed_hz = SPEED,
                        .delay_usecs = 0,
 
                };
@@ -359,7 +326,6 @@ int wilc_spi_write_read(u8 *wb, u8 *rb, u32 rlen)
                        .rx_buf = rb,
                        .tx_buf = wb,
                        .len = rlen,
-                       .speed_hz = SPEED,
                        .bits_per_word = 8,
                        .delay_usecs = 0,
 
@@ -384,11 +350,3 @@ int wilc_spi_write_read(u8 *wb, u8 *rb, u32 rlen)
 
        return ret;
 }
-
-int wilc_spi_set_max_speed(void)
-{
-       SPEED = MAX_SPEED;
-
-       PRINT_INFO(BUS_DBG, "@@@@@@@@@@@@ change SPI speed to %d @@@@@@@@@\n", SPEED);
-       return 1;
-}

diff --git a/drivers/staging/wilc1000/linux_wlan_spi.h b/drivers/staging/wilc1000/linux_wlan_spi.h
index f434f79913abc2612552b334a01a788178f9c913..baa98cc9a247e603b5bfcbd404f00fe35a6f19ab 100644 (file)
--- a/drivers/staging/wilc1000/linux_wlan_spi.h
+++ b/drivers/staging/wilc1000/linux_wlan_spi.h
@@ -7,6 +7,4 @@ int wilc_spi_init(void);
 int wilc_spi_write(u8 *b, u32 len);
 int wilc_spi_read(u8 *rb, u32 rlen);
 int wilc_spi_write_read(u8 *wb, u8 *rb, u32 rlen);
-int wilc_spi_set_max_speed(void);
-
 #endif

diff --git a/drivers/staging/wilc1000/wilc_spi.c b/drivers/staging/wilc1000/wilc_spi.c
index 39dd75665ba7425f010dfe5bfd3d863a6f143668..1c5dcda4b6345c548f45fcd5d112556483f996f3 100644 (file)
--- a/drivers/staging/wilc1000/wilc_spi.c
+++ b/drivers/staging/wilc1000/wilc_spi.c
@@ -793,15 +793,6 @@ static int _wilc_spi_init(struct wilc *wilc, wilc_debug_func func)
        return 1;
 }
 
-static void wilc_spi_max_bus_speed(void)
-{
-       wilc_spi_set_max_speed();
-}
-
-static void wilc_spi_default_bus_speed(void)
-{
-}
-
 static int wilc_spi_read_size(u32 *size)
 {
        int ret;
@@ -1036,6 +1027,4 @@ const struct wilc_hif_func wilc_hif_spi = {
        .hif_block_tx_ext = _wilc_spi_write,
        .hif_block_rx_ext = _wilc_spi_read,
        .hif_sync_ext = wilc_spi_sync_ext,
-       .hif_set_max_bus_speed = wilc_spi_max_bus_speed,
-       .hif_set_default_bus_speed = wilc_spi_default_bus_speed,
 };

diff --git a/drivers/staging/wilc1000/wilc_wlan.h b/drivers/staging/wilc1000/wilc_wlan.h
index 20bca44bc8ba59bd067e079bd3f2cc31b2a883f1..ee13771eb54cda4399a7faa8a9b3a4ef3db82030 100644 (file)
--- a/drivers/staging/wilc1000/wilc_wlan.h
+++ b/drivers/staging/wilc1000/wilc_wlan.h
@@ -251,8 +251,6 @@ struct wilc_hif_func {
        int (*hif_block_tx_ext)(u32, u8 *, u32);
        int (*hif_block_rx_ext)(u32, u8 *, u32);
        int (*hif_sync_ext)(int);
-       void (*hif_set_max_bus_speed)(void);
-       void (*hif_set_default_bus_speed)(void);
        int (*enable_interrupt)(struct wilc *nic);
        void (*disable_interrupt)(struct wilc *nic);
 };