redonkable
/
remarkable-linux
1
0
Fork 0
Code Releases Activity

staging: ctx1e1: remove checks for three macros 

When the ctx1e1 driver was added in v2.6.35 it contained checks for
CONFIG_SBE_HDLC_V7, CONFIG_SBE_WAN256T3_HDLC_V7, and
CONFIG_SBE_WAN256T3_NCOMM (and MODULE variants). The related Kconfig
symbols didn't exist then. They still don't exist now. Remove these
checks.

Do some related cleaning up and remove the unused V7() macro too.

Signed-off-by: Paul Bolle <pebolle@tiscali.nl>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
wifi-calibration
Paul Bolle 2014-05-26 21:18:01 +02:00 committed by Greg Kroah-Hartman
parent 3746cfb684
commit 464ae880a3
3 changed files with 0 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/staging/cxt1e1/functions.c
View File

@ -24,24 +24,6 @@
#include "libsbew.h"
#include "pmcc4.h"
#if defined(CONFIG_SBE_HDLC_V7) || defined(CONFIG_SBE_WAN256T3_HDLC_V7) || \
defined(CONFIG_SBE_HDLC_V7_MODULE) || \
defined(CONFIG_SBE_WAN256T3_HDLC_V7_MODULE)
#define _v7_hdlc_ 1
#else
#define _v7_hdlc_ 0
#endif
#if _v7_hdlc_
#define V7(x) (x ## _v7)
extern int hdlc_netif_rx_v7(hdlc_device *, struct sk_buff *);
extern int register_hdlc_device_v7(hdlc_device *);
extern int unregister_hdlc_device_v7(hdlc_device *);
#else
#define V7(x) x
#endif
#ifndef USE_MAX_INT_DELAY
static int dummy = 0;

17
drivers/staging/cxt1e1/linux.c
View File

@ -83,23 +83,6 @@ int musycc_start_xmit(ci_t *, int, void *);
extern ci_t *CI;
extern struct s_hdw_info hdw_info[];
#if defined(CONFIG_SBE_HDLC_V7) || defined(CONFIG_SBE_WAN256T3_HDLC_V7) || \
defined(CONFIG_SBE_HDLC_V7_MODULE) || defined(CONFIG_SBE_WAN256T3_HDLC_V7_MODULE)
#define _v7_hdlc_ 1
#else
#define _v7_hdlc_ 0
#endif
#if _v7_hdlc_
#define V7(x) (x ## _v7)
extern int hdlc_netif_rx_v7(hdlc_device *, struct sk_buff *);
extern int register_hdlc_device_v7(hdlc_device *);
extern int unregister_hdlc_device_v7(hdlc_device *);
#else
#define V7(x) x
#endif
int error_flag; /* module load error reporting */
int cxt1e1_log_level = LOG_ERROR;
static int log_level_default = LOG_ERROR;

30
drivers/staging/cxt1e1/musycc.c
View File

@ -918,9 +918,6 @@ musycc_bh_tx_eom(mpi_t *pi, int gchan)
md->data = 0;
if (md->mem_token) {
#ifdef CONFIG_SBE_WAN256T3_NCOMM
int hdlcnum = 0;
#endif
/* upcount channel */
atomic_sub(OS_mem_token_tlen(md->mem_token),
&ch->tx_pending);
@ -931,18 +928,6 @@ musycc_bh_tx_eom(mpi_t *pi, int gchan)
if (!atomic_read(&pi->up->tx_pending))
wan256t3_led(pi->up, LED_TX, 0);
#endif
#ifdef CONFIG_SBE_WAN256T3_NCOMM
/* callback that our packet was sent */
hdlcnum = (pi->portnum * 32 + gchan);
if (hdlcnum >= 228) {
if (nciProcess_TX_complete)
(*nciProcess_TX_complete) (hdlcnum,
getuserbychan(gchan));
}
#endif /* CONFIG_SBE_WAN256T3_NCOMM */
OS_mem_token_free_irq(md->mem_token);
md->mem_token = NULL;
}
@ -1039,21 +1024,6 @@ musycc_bh_rx_eom(mpi_t *pi, int gchan)
m = md->mem_token;
error = (status >> 16) & 0xf;
if (error == 0) {
#ifdef CONFIG_SBE_WAN256T3_NCOMM
int hdlcnum = (pi->portnum * 32 + gchan);
/*
* if the packet number belongs to NCOMM, then send it to the TMS
* driver
*/
if (hdlcnum >= 228) {
if (nciProcess_RX_packet)
(*nciProcess_RX_packet)(hdlcnum,
status & 0x3fff,
m, ch->user);
} else
#endif /*** CONFIG_SBE_WAN256T3_NCOMM ***/
{
m2 = OS_mem_token_alloc(cxt1e1_max_mru);
if (m2) {