From patchwork Wed Aug 31 13:31:01 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Michal Marek X-Patchwork-Id: 1116212 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter2.kernel.org (8.14.4/8.14.4) with ESMTP id p7VDT30D007104 for ; Wed, 31 Aug 2011 13:31:31 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755436Ab1HaNba (ORCPT ); Wed, 31 Aug 2011 09:31:30 -0400 Received: from cantor2.suse.de ([195.135.220.15]:46515 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755548Ab1HaNba (ORCPT ); Wed, 31 Aug 2011 09:31:30 -0400 Received: from relay1.suse.de (charybdis-ext.suse.de [195.135.221.2]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx2.suse.de (Postfix) with ESMTP id 037E08B2F9; Wed, 31 Aug 2011 15:31:29 +0200 (CEST) Received: by sepie.suse.cz (Postfix, from userid 10020) id 5DFB8764BD; Wed, 31 Aug 2011 15:31:27 +0200 (CEST) From: Michal Marek To: Greg Kroah-Hartman Cc: devel@driverdev.osuosl.org, Arnaud Lacombe , s.koylux@gmail.com, linux-kbuild@vger.kernel.org, Bob Beers Subject: [PATCH] staging/cxt1e1: Header cleanup Date: Wed, 31 Aug 2011 15:31:01 +0200 Message-Id: <1314797461-29837-1-git-send-email-mmarek@suse.cz> X-Mailer: git-send-email 1.7.6 In-Reply-To: <4E5E26B8.5030606@suse.cz> References: <4E5E26B8.5030606@suse.cz> MIME-Version: 1.0 Sender: linux-kbuild-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kbuild@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter2.kernel.org [140.211.167.43]); Wed, 31 Aug 2011 13:31:31 +0000 (UTC) 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Ü Cc: Bob Beers Signed-off-by: Michal Marek --- 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 c0563e6..9ea2c0c 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 -#else #include -#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 -#endif #include -#endif -#endif - #include /* resolves kmalloc references */ #include /* resolves skb references */ #include /* resolves dev_kree_skb_any */ #include /* 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