diff options
| author | Michal Marek <mmarek@suse.cz> | 2011-08-31 15:31:01 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-09-06 16:49:30 -0700 |
| commit | ce92b7ad6c718b1e228e83137af87ed8c558d358 (patch) | |
| tree | 4fd8d28b8ca9752fd8e950624072bfa4e25462f8 /drivers/staging/cxt1e1 | |
| parent | f19885fadfdb0bf410b5e31c7dc2f2be7815e454 (diff) | |
| download | linux-ce92b7ad6c718b1e228e83137af87ed8c558d358.tar.gz linux-ce92b7ad6c718b1e228e83137af87ed8c558d358.tar.xz linux-ce92b7ad6c718b1e228e83137af87ed8c558d358.zip | |
staging/cxt1e1: Header cleanup
Remove dead and unused code in sbecom_inline_linux.h. This also fixes a
build failure under Turkish locale, where include/config/modversions.h
is incorrectly named as modversIons.h (an unrelated kbuild bug) and the
driver tries to needlessly include the empty file.
Reported-by: Serdar KÖYLÜ <s.koylux@gmail.com>
Cc: Bob Beers <bob.beers@gmail.com>
Signed-off-by: Michal Marek <mmarek@suse.cz>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/cxt1e1')
| -rw-r--r-- | drivers/staging/cxt1e1/sbecom_inline_linux.h | 64 |
1 files changed, 0 insertions, 64 deletions
diff --git a/drivers/staging/cxt1e1/sbecom_inline_linux.h b/drivers/staging/cxt1e1/sbecom_inline_linux.h index c0563e68997b..9ea2c0c2061f 100644 --- a/drivers/staging/cxt1e1/sbecom_inline_linux.h +++ b/drivers/staging/cxt1e1/sbecom_inline_linux.h @@ -43,81 +43,17 @@ */ -#if defined (__FreeBSD__) || defined (__NetBSD__) -#include <sys/types.h> -#else #include <linux/types.h> -#if defined(CONFIG_SMP) && ! defined(__SMP__) -#define __SMP__ -#endif -#if defined(CONFIG_MODVERSIONS) && defined(MODULE) && ! defined(MODVERSIONS) -#define MODVERSIONS -#endif - -#ifdef MODULE -#ifdef MODVERSIONS -#include <config/modversions.h> -#endif #include <linux/module.h> -#endif -#endif - #include <linux/kernel.h> /* resolves kmalloc references */ #include <linux/skbuff.h> /* resolves skb references */ #include <linux/netdevice.h> /* resolves dev_kree_skb_any */ #include <asm/byteorder.h> /* resolves cpu_to_le32 */ -#if 0 - -/*** PORT POINT WARNING - *** - *** Under Linux 2.6 it has been found that compiler is re-ordering - *** in-lined pci_write_32() functions to the detrement of correct - *** hardware setup. Therefore, inlining of PCI accesses has been - *** de-implemented, and subroutine calls have been implemented. - ***/ - -static inline u_int32_t -pci_read_32 (u_int32_t *p) -{ -#ifdef FLOW_DEBUG - u_int32_t v; - - FLUSH_PCI_READ (); - v = le32_to_cpu (*p); - if (cxt1e1_log_level >= LOG_DEBUG) - pr_info("pci_read : %x = %x\n", (u_int32_t) p, v); - return v; -#else - FLUSH_PCI_READ (); /* */ - return le32_to_cpu (*p); -#endif -} - -static inline void -pci_write_32 (u_int32_t *p, u_int32_t v) -{ -#ifdef FLOW_DEBUG - if (cxt1e1_log_level >= LOG_DEBUG) - pr_info("pci_write: %x = %x\n", (u_int32_t) p, v); -#endif - *p = cpu_to_le32 (v); - FLUSH_PCI_WRITE (); /* This routine is called from routines - * which do multiple register writes - * which themselves need flushing between - * writes in order to guarantee write - * ordering. It is less code-cumbersome - * to flush here-in then to investigate - * and code the many other register - * writing routines. */ -} -#else /* forward reference */ u_int32_t pci_read_32 (u_int32_t *p); void pci_write_32 (u_int32_t *p, u_int32_t v); -#endif - /* * system dependent callbacks |