Commit 2769d942 authored by Glen Lee's avatar Glen Lee Committed by Greg Kroah-Hartman

staging: wilc1000: remove unneeded function

wilc_spi_init in linux_wlan_spi.c is unneeded. It just return true. Rename
_wilc_spi_init in wlan_spi.c to wilc_spi_init.
Signed-off-by: default avatarGlen Lee <glen.lee@atmel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent d4312b6f
...@@ -61,11 +61,6 @@ struct spi_driver wilc1000_spi_driver = { ...@@ -61,11 +61,6 @@ struct spi_driver wilc1000_spi_driver = {
module_spi_driver(wilc1000_spi_driver); module_spi_driver(wilc1000_spi_driver);
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
int wilc_spi_init(void)
{
return 1;
}
int wilc_spi_tx(struct wilc *wilc, u8 *b, u32 len) int wilc_spi_tx(struct wilc *wilc, u8 *b, u32 len)
{ {
struct spi_device *spi = to_spi_device(wilc->dev); struct spi_device *spi = to_spi_device(wilc->dev);
......
...@@ -4,7 +4,6 @@ ...@@ -4,7 +4,6 @@
#include <linux/spi/spi.h> #include <linux/spi/spi.h>
#include "wilc_wfi_netdevice.h" #include "wilc_wfi_netdevice.h"
int wilc_spi_init(void);
int wilc_spi_tx(struct wilc *wilc, u8 *b, u32 len); int wilc_spi_tx(struct wilc *wilc, u8 *b, u32 len);
int wilc_spi_rx(struct wilc *wilc, u8 *rb, u32 rlen); int wilc_spi_rx(struct wilc *wilc, u8 *rb, u32 rlen);
int wilc_spi_tx_rx(struct wilc *wilc, u8 *wb, u8 *rb, u32 rlen); int wilc_spi_tx_rx(struct wilc *wilc, u8 *wb, u8 *rb, u32 rlen);
......
...@@ -676,7 +676,7 @@ static int _wilc_spi_deinit(struct wilc *wilc) ...@@ -676,7 +676,7 @@ static int _wilc_spi_deinit(struct wilc *wilc)
return 1; return 1;
} }
static int _wilc_spi_init(struct wilc *wilc) static int wilc_spi_init(struct wilc *wilc)
{ {
struct spi_device *spi = to_spi_device(wilc->dev); struct spi_device *spi = to_spi_device(wilc->dev);
u32 reg; u32 reg;
...@@ -695,13 +695,6 @@ static int _wilc_spi_init(struct wilc *wilc) ...@@ -695,13 +695,6 @@ static int _wilc_spi_init(struct wilc *wilc)
memset(&g_spi, 0, sizeof(wilc_spi_t)); memset(&g_spi, 0, sizeof(wilc_spi_t));
if (!wilc_spi_init()) {
dev_err(&spi->dev, "Failed io init bus...\n");
return 0;
} else {
return 0;
}
/** /**
* configure protocol * configure protocol
**/ **/
...@@ -994,7 +987,7 @@ static int wilc_spi_sync_ext(struct wilc *wilc, int nint) ...@@ -994,7 +987,7 @@ static int wilc_spi_sync_ext(struct wilc *wilc, int nint)
* *
********************************************/ ********************************************/
const struct wilc_hif_func wilc_hif_spi = { const struct wilc_hif_func wilc_hif_spi = {
.hif_init = _wilc_spi_init, .hif_init = wilc_spi_init,
.hif_deinit = _wilc_spi_deinit, .hif_deinit = _wilc_spi_deinit,
.hif_read_reg = wilc_spi_read_reg, .hif_read_reg = wilc_spi_read_reg,
.hif_write_reg = wilc_spi_write_reg, .hif_write_reg = wilc_spi_write_reg,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment