From: Moritz Muehlenhoff <jmm@debian.org>
Date: Mon, 9 Feb 2009 18:33:41 +0000 (+0100)
Subject: Staging: wlan-ng: Remove more dead code from hfa384x_usb.c
X-Git-Tag: v2.6.30-rc1~202^2~572
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=e469ee7f561657e260690ae202a32adb60e26730;p=~shefty%2Frdma-dev.git

Staging: wlan-ng: Remove more dead code from hfa384x_usb.c

Signed-off-by: Moritz Muehlenhoff <jmm@debian.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---

diff --git a/drivers/staging/wlan-ng/hfa384x.h b/drivers/staging/wlan-ng/hfa384x.h
index 6364e9e5fab..ddfa566b67f 100644
--- a/drivers/staging/wlan-ng/hfa384x.h
+++ b/drivers/staging/wlan-ng/hfa384x.h
@@ -1132,7 +1132,6 @@ int hfa384x_drvr_flashdl_enable(hfa384x_t *hw);
 int hfa384x_drvr_flashdl_disable(hfa384x_t *hw);
 int hfa384x_drvr_flashdl_write(hfa384x_t *hw, u32 daddr, void *buf, u32 len);
 int hfa384x_drvr_getconfig(hfa384x_t *hw, u16 rid, void *buf, u16 len);
-int hfa384x_drvr_handover(hfa384x_t *hw, u8 *addr);
 int hfa384x_drvr_ramdl_enable(hfa384x_t *hw, u32 exeaddr);
 int hfa384x_drvr_ramdl_disable(hfa384x_t *hw);
 int hfa384x_drvr_ramdl_write(hfa384x_t *hw, u32 daddr, void *buf, u32 len);
@@ -1187,12 +1186,6 @@ int hfa384x_cmd_monitor(hfa384x_t *hw, u16 enable);
 int
 hfa384x_cmd_download(hfa384x_t *hw,
 		     u16 mode, u16 lowaddr, u16 highaddr, u16 codelen);
-void
-hfa384x_copy_from_aux(hfa384x_t *hw,
-		      u32 cardaddr, u32 auxctl, void *buf, unsigned int len);
-void
-hfa384x_copy_to_aux(hfa384x_t *hw,
-		    u32 cardaddr, u32 auxctl, void *buf, unsigned int len);
 
 #endif /* __KERNEL__ */
 
diff --git a/drivers/staging/wlan-ng/hfa384x_usb.c b/drivers/staging/wlan-ng/hfa384x_usb.c
index 67157dbbf7c..dd1e1d94996 100644
--- a/drivers/staging/wlan-ng/hfa384x_usb.c
+++ b/drivers/staging/wlan-ng/hfa384x_usb.c
@@ -1193,68 +1193,6 @@ int hfa384x_cmd_download(hfa384x_t *hw, u16 mode, u16 lowaddr,
 	return result;
 }
 
-/*----------------------------------------------------------------
-* hfa384x_copy_from_aux
-*
-* Copies a collection of bytes from the controller memory.  The
-* Auxiliary port MUST be enabled prior to calling this function.
-* We _might_ be in a download state.
-*
-* Arguments:
-*	hw		device structure
-*	cardaddr	address in hfa384x data space to read
-*	auxctl		address space select
-*	buf		ptr to destination host buffer
-*	len		length of data to transfer (in bytes)
-*
-* Returns:
-*	nothing
-*
-* Side effects:
-*	buf contains the data copied
-*
-* Call context:
-*	process
-*	interrupt
-----------------------------------------------------------------*/
-void
-hfa384x_copy_from_aux(hfa384x_t *hw, u32 cardaddr, u32 auxctl, void *buf,
-		      unsigned int len)
-{
-	printk(KERN_ERR "not used in USB.\n");
-}
-
-/*----------------------------------------------------------------
-* hfa384x_copy_to_aux
-*
-* Copies a collection of bytes to the controller memory.  The
-* Auxiliary port MUST be enabled prior to calling this function.
-* We _might_ be in a download state.
-*
-* Arguments:
-*	hw		device structure
-*	cardaddr	address in hfa384x data space to read
-*	auxctl		address space select
-*	buf		ptr to destination host buffer
-*	len		length of data to transfer (in bytes)
-*
-* Returns:
-*	nothing
-*
-* Side effects:
-*	Controller memory now contains a copy of buf
-*
-* Call context:
-*	process
-*	interrupt
-----------------------------------------------------------------*/
-void
-hfa384x_copy_to_aux(hfa384x_t *hw, u32 cardaddr, u32 auxctl, void *buf,
-		    unsigned int len)
-{
-	printk(KERN_ERR "not used in USB.\n");
-}
-
 /*----------------------------------------------------------------
 * hfa384x_corereset
 *
@@ -2295,31 +2233,6 @@ hfa384x_drvr_setconfig_async(hfa384x_t *hw,
 				    hfa384x_cb_status, usercb, usercb_data);
 }
 
-/*----------------------------------------------------------------
-* hfa384x_drvr_handover
-*
-* Sends a handover notification to the MAC.
-*
-* Arguments:
-*	hw		device structure
-*	addr		address of station that's left
-*
-* Returns:
-*	zero		success.
-*	-ERESTARTSYS	received signal while waiting for semaphore.
-*	-EIO		failed to write to bap, or failed in cmd.
-*
-* Side effects:
-*
-* Call context:
-*	process
-----------------------------------------------------------------*/
-int hfa384x_drvr_handover(hfa384x_t *hw, u8 *addr)
-{
-	printk(KERN_ERR "Not currently supported in USB!\n");
-	return -EIO;
-}
-
 /*----------------------------------------------------------------
 * hfa384x_drvr_ramdl_disable
 *