libertas: remove remaining libertas_sbi_* unused functions
Marcelo Tosatti
mtosatti at redhat.unroutablecom
Wed Dec 20 16:01:15 EST 2006
Commit: b93d0141bf2277309baee120e6ab711ac720860d
Parent: 97799b0cebc9ab6576d36c00b2b2f08d063f1cc9
commit b93d0141bf2277309baee120e6ab711ac720860d
Author: Marcelo Tosatti <mtosatti at redhat.com>
AuthorDate: Mon Dec 11 19:14:17 2006 -0200
Commit: Andres Salomon <dilinger at debian.org>
CommitDate: Wed Dec 20 15:42:39 2006 -0500
libertas: remove remaining libertas_sbi_* unused functions
Signed-off-by: Marcelo Tosatti <mtosatti at redhat.com>
(cherry picked from 54aa3bf56874dcd3ee6e2fc0bbed98f6c0cd866a commit)
---
drivers/net/wireless/libertas/if_usb.c | 30 -----------------------------
drivers/net/wireless/libertas/sbi.h | 2 --
drivers/net/wireless/libertas/wlan_fw.c | 11 -----------
drivers/net/wireless/libertas/wlan_main.c | 3 ---
4 files changed, 0 insertions(+), 46 deletions(-)
diff --git a/drivers/net/wireless/libertas/if_usb.c b/drivers/net/wireless/libertas/if_usb.c
index eecb304..6db4d69 100644
--- a/drivers/net/wireless/libertas/if_usb.c
+++ b/drivers/net/wireless/libertas/if_usb.c
@@ -699,16 +699,6 @@ int libertas_sbi_read_event_cause(wlan_p
return WLAN_STATUS_SUCCESS;
}
-/**
- * @brief This is a dummy function
- * @param priv pointer to wlan_private
- * @return WLAN_STATUS_SUCCESS
- */
-int libertas_sbi_get_cis_info(wlan_private * priv)
-{
- return WLAN_STATUS_SUCCESS;
-}
-
extern int machine_is_olpc;
int reset_device(wlan_private *priv)
@@ -834,16 +824,6 @@ int libertas_sbi_register_dev(wlan_priva
}
/**
- * @brief stub function
- * @param priv pointer to wlan_private
- * @return WLAN_STATUS_SUCCESS
- */
-int libertas_sbi_verify_fw_download(wlan_private * priv)
-{
- return WLAN_STATUS_SUCCESS;
-}
-
-/**
* @brief This function download FW
* @param priv pointer to wlan_private
* @return WLAN_STATUS_SUCCESS
@@ -983,16 +963,6 @@ restart:
}
/**
- * @brief This is a dummy function
- * @param priv pointer to wlan_private
- * @return WLAN_STATUS_SUCCESS
- */
-int libertas_sbi_enable_host_int(wlan_private * priv)
-{
- return WLAN_STATUS_SUCCESS;
-}
-
-/**
* @brief Given a usb_card_rec return its wlan_private
* @param card pointer to a usb_card_rec
* @return pointer to wlan_private
diff --git a/drivers/net/wireless/libertas/sbi.h b/drivers/net/wireless/libertas/sbi.h
index 9e45aa5..76853ec 100644
--- a/drivers/net/wireless/libertas/sbi.h
+++ b/drivers/net/wireless/libertas/sbi.h
@@ -96,11 +96,9 @@ int libertas_sbi_get_int_status(wlan_pri
int *libertas_sbi_register(wlan_notifier_fn_add, wlan_notifier_fn_remove, void *);
void libertas_sbi_unregister(void);
int libertas_sbi_prog_firmware(wlan_private *);
-int libertas_sbi_verify_fw_download(wlan_private *);
int libertas_sbi_read_event_cause(wlan_private *);
int libertas_sbi_host_to_card(wlan_private * priv, u8 type, u8 * payload, u16 nb);
-int libertas_sbi_enable_host_int(wlan_private *);
wlan_private *libertas_sbi_get_priv(void *card);
#ifdef ENABLE_PM
diff --git a/drivers/net/wireless/libertas/wlan_fw.c b/drivers/net/wireless/libertas/wlan_fw.c
index 2b863b0..93df002 100644
--- a/drivers/net/wireless/libertas/wlan_fw.c
+++ b/drivers/net/wireless/libertas/wlan_fw.c
@@ -134,17 +134,6 @@ static int wlan_setup_station_hw(wlan_pr
goto done;
}
- /* check if the fimware is downloaded successfully or not */
- if (libertas_sbi_verify_fw_download(priv)) {
- dprintk(1, "Firmware failed to be active in time!\n");
- ret = WLAN_STATUS_FAILURE;
- goto done;
- }
-#define RF_REG_OFFSET 0x07
-#define RF_REG_VALUE 0xc8
-
- libertas_sbi_enable_host_int(priv);
-
/*
* Read MAC address from HW
*/
diff --git a/drivers/net/wireless/libertas/wlan_main.c b/drivers/net/wireless/libertas/wlan_main.c
index 623201e..8a85575 100644
--- a/drivers/net/wireless/libertas/wlan_main.c
+++ b/drivers/net/wireless/libertas/wlan_main.c
@@ -1012,9 +1012,6 @@ #endif /* REASSOCIATION */
goto err_registerdev;
}
- /* Get the CIS Table */
- libertas_sbi_get_cis_info(priv);
-
/* init FW and HW */
if (libertas_init_fw(priv)) {
dprintk(1, "Firmware Init Failed\n");
More information about the Commits-kernel
mailing list