From: Brett Rudley <brudley@broadcom.com>
Date: Tue, 2 Nov 2010 00:10:16 +0000 (-0700)
Subject: staging: brcm80211: Remove dead code from osl.h
X-Git-Tag: firefly_0821_release~7613^2~3069^2~438
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=683ab518a19fe55de9b9f682c94f672951315fe2;p=firefly-linux-kernel-4.4.55.git

staging: brcm80211: Remove dead code from osl.h

Signed-off-by: Brett Rudley <brudley@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---

diff --git a/drivers/staging/brcm80211/include/linux_osl.h b/drivers/staging/brcm80211/include/linux_osl.h
index e6d2f30c63ca..62afbe88f793 100644
--- a/drivers/staging/brcm80211/include/linux_osl.h
+++ b/drivers/staging/brcm80211/include/linux_osl.h
@@ -18,12 +18,6 @@
 #define _linux_osl_h_
 
 
-/* Linux Kernel: File Operations: start */
-extern void *osl_os_open_image(char *filename);
-extern int osl_os_get_image_block(char *buf, int len, void *image);
-extern void osl_os_close_image(void *image);
-/* Linux Kernel: File Operations: end */
-
 extern osl_t *osl_attach(void *pdev, uint bustype, bool pkttag);
 extern void osl_detach(osl_t *osh);
 
@@ -269,22 +263,6 @@ extern int osl_error(int bcmerror);
 #define OSL_CACHED(va)		((void *)va)
 #endif				/* mips */
 
-#if defined(mips)
-#define	OSL_GETCYCLES(x)	((x) = read_c0_count() * 2)
-#elif defined(__i386__)
-#define	OSL_GETCYCLES(x)	rdtscl((x))
-#else
-#define OSL_GETCYCLES(x)	((x) = 0)
-#endif				/* defined(mips) */
-
-/* dereference an address that may cause a bus exception */
-#ifdef mips
-#define	BUSPROBE(val, addr)	get_dbe((val), (addr))
-#include <asm/paccess.h>
-#else
-#define	BUSPROBE(val, addr)	({ (val) = R_REG(NULL, (addr)); 0; })
-#endif				/* mips */
-
 /* map/unmap physical to virtual I/O */
 #if !defined(CONFIG_MMC_MSM7X00A)
 #define	REG_MAP(pa, size)	ioremap_nocache((unsigned long)(pa), (unsigned long)(size))