renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2025-01-06 04:33:58 +08:00
Code

Staging: cxt1e1: rename global log_level variable

Browse Source 
The driver should not have such a generic global variable name.

Reported-by: Zimny Lech <napohybelskurwysynom2010@gmail.com>
Cc: Bob Beers <bob.beers@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Greg Kroah-Hartman 2010-12-10 10:46:30 -08:00
parent bc657f6e91
commit b8b739941e
7 changed files with 69 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/staging/cxt1e1/comet.c
View File

@ -29,7 +29,7 @@
#endif #endif
extern int log_level; extern int cxt1e1_log_level;
#define COMET_NUM_SAMPLES 24 /* Number of entries in the waveform table */ #define COMET_NUM_SAMPLES 24 /* Number of entries in the waveform table */
#define COMET_NUM_UNITS 5 /* Number of points per entry in table */ #define COMET_NUM_UNITS 5 /* Number of points per entry in table */
@ -292,12 +292,12 @@ init_comet (void *ci, comet_t * comet, u_int32_t port_mode, int clockmaster,
* i.e.FPMODE=0 (@0x20) */ * i.e.FPMODE=0 (@0x20) */
if ((moreParams & CFG_CLK_PORT_MASK) == CFG_CLK_PORT_INTERNAL) if ((moreParams & CFG_CLK_PORT_MASK) == CFG_CLK_PORT_INTERNAL)
{ {
if (log_level >= LOG_SBEBUG12) if (cxt1e1_log_level >= LOG_SBEBUG12)
pr_info(">> %s: clockmaster internal clock\n", __func__); pr_info(">> %s: clockmaster internal clock\n", __func__);
pci_write_32 ((u_int32_t *) &comet->tx_time, 0x0d); /* internal oscillator */ pci_write_32 ((u_int32_t *) &comet->tx_time, 0x0d); /* internal oscillator */
} else /* external clock source */ } else /* external clock source */
{ {
if (log_level >= LOG_SBEBUG12) if (cxt1e1_log_level >= LOG_SBEBUG12)
pr_info(">> %s: clockmaster external clock\n", __func__); pr_info(">> %s: clockmaster external clock\n", __func__);
pci_write_32 ((u_int32_t *) &comet->tx_time, 0x09); /* loop timing pci_write_32 ((u_int32_t *) &comet->tx_time, 0x09); /* loop timing
* (external) */ * (external) */
@ -312,7 +312,7 @@ init_comet (void *ci, comet_t * comet, u_int32_t port_mode, int clockmaster,
pci_write_32 ((u_int32_t *) &comet->brif_cfg, 0x21); /* Slave Mode (CMODE=1) */ pci_write_32 ((u_int32_t *) &comet->brif_cfg, 0x21); /* Slave Mode (CMODE=1) */
pci_write_32 ((u_int32_t *) &comet->brif_fpcfg, 0x20); /* Slave Mode i.e. pci_write_32 ((u_int32_t *) &comet->brif_fpcfg, 0x20); /* Slave Mode i.e.
* FPMODE=1 (@0x20) */ * FPMODE=1 (@0x20) */
if (log_level >= LOG_SBEBUG12) if (cxt1e1_log_level >= LOG_SBEBUG12)
pr_info(">> %s: clockslave internal clock\n", __func__); pr_info(">> %s: clockslave internal clock\n", __func__);
pci_write_32 ((u_int32_t *) &comet->tx_time, 0x0d); /* oscillator timing */ pci_write_32 ((u_int32_t *) &comet->tx_time, 0x0d); /* oscillator timing */
} }

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

@ -54,7 +54,7 @@ static int dummy = 0;
#endif #endif
extern int log_level; extern int cxt1e1_log_level;
extern int drvr_state; extern int drvr_state;
@ -67,7 +67,7 @@ pci_read_32 (u_int32_t *p)
FLUSH_PCI_READ (); FLUSH_PCI_READ ();
v = le32_to_cpu (*p); v = le32_to_cpu (*p);
if (log_level >= LOG_DEBUG) if (cxt1e1_log_level >= LOG_DEBUG)
pr_info("pci_read : %x = %x\n", (u_int32_t) p, v); pr_info("pci_read : %x = %x\n", (u_int32_t) p, v);
return v; return v;
#else #else
@ -80,7 +80,7 @@ void
pci_write_32 (u_int32_t *p, u_int32_t v) pci_write_32 (u_int32_t *p, u_int32_t v)
{ {
#ifdef FLOW_DEBUG #ifdef FLOW_DEBUG
if (log_level >= LOG_DEBUG) if (cxt1e1_log_level >= LOG_DEBUG)
pr_info("pci_write: %x = %x\n", (u_int32_t) p, v); pr_info("pci_write: %x = %x\n", (u_int32_t) p, v);
#endif #endif
*p = cpu_to_le32 (v); *p = cpu_to_le32 (v);
@ -118,7 +118,7 @@ watchdog_func (unsigned long arg)
if (drvr_state != SBE_DRVR_AVAILABLE) if (drvr_state != SBE_DRVR_AVAILABLE)
{ {
if (log_level >= LOG_MONITOR) if (cxt1e1_log_level >= LOG_MONITOR)
pr_warning("%s: drvr not available (%x)\n", __func__, drvr_state); pr_warning("%s: drvr not available (%x)\n", __func__, drvr_state);
return; return;
} }

4
drivers/staging/cxt1e1/hwprobe.c
View File

@ -37,7 +37,7 @@
#define STATIC static #define STATIC static
#endif #endif
extern int log_level; extern int cxt1e1_log_level;
extern int error_flag; extern int error_flag;
extern int drvr_state; extern int drvr_state;
@ -143,7 +143,7 @@ hdw_sn_get (hdw_info_t * hi, int brdno)
if ((hi->promfmt = pmc_verify_cksum (&hi->mfg_info.data)) == PROM_FORMAT_Unk) if ((hi->promfmt = pmc_verify_cksum (&hi->mfg_info.data)) == PROM_FORMAT_Unk)
{ {
/* bad crc, data is suspect */ /* bad crc, data is suspect */
if (log_level >= LOG_WARN) if (cxt1e1_log_level >= LOG_WARN)
pr_info("%s: EEPROM cksum error\n", hi->devname); pr_info("%s: EEPROM cksum error\n", hi->devname);
hi->mfg_info_sts = EEPROM_CRCERR; hi->mfg_info_sts = EEPROM_CRCERR;
} else } else

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

@ -108,9 +108,9 @@ extern int unregister_hdlc_device_v7 (hdlc_device *);
#endif #endif
int error_flag; /* module load error reporting */ int error_flag; /* module load error reporting */
int log_level = LOG_ERROR; int cxt1e1_log_level = LOG_ERROR;
int log_level_default = LOG_ERROR; int log_level_default = LOG_ERROR;
module_param(log_level, int, 0444); module_param(cxt1e1_log_level, int, 0444);
int cxt1e1_max_mru = MUSYCC_MRU; int cxt1e1_max_mru = MUSYCC_MRU;
int max_mru_default = MUSYCC_MRU; int max_mru_default = MUSYCC_MRU;
@ -497,7 +497,7 @@ create_chan (struct net_device * ndev, ci_t * ci,
rtnl_lock (); /* needed due to Ioctl calling sequence */ rtnl_lock (); /* needed due to Ioctl calling sequence */
if (ret) if (ret)
{ {
if (log_level >= LOG_WARN) if (cxt1e1_log_level >= LOG_WARN)
pr_info("%s: create_chan[%d] registration error = %d.\n", pr_info("%s: create_chan[%d] registration error = %d.\n",
ci->devname, cp->channum, ret); ci->devname, cp->channum, ret);
free_netdev (dev); /* cleanup */ free_netdev (dev); /* cleanup */
@ -722,11 +722,11 @@ do_get_chan_stats (struct net_device * ndev, void *data)
STATIC status_t STATIC status_t
do_set_loglevel (struct net_device * ndev, void *data) do_set_loglevel (struct net_device * ndev, void *data)
{ {
unsigned int log_level; unsigned int cxt1e1_log_level;
if (copy_from_user (&log_level, data, sizeof (int))) if (copy_from_user (&cxt1e1_log_level, data, sizeof (int)))
return -EFAULT; return -EFAULT;
sbecom_set_loglevel (log_level); sbecom_set_loglevel (cxt1e1_log_level);
return 0; return 0;
} }
@ -1115,9 +1115,9 @@ c4_mod_init (void)
return -rtn; /* installation failure - see system log */ return -rtn; /* installation failure - see system log */
/* housekeeping notifications */ /* housekeeping notifications */
if (log_level != log_level_default) if (cxt1e1_log_level != log_level_default)
pr_info("NOTE: driver parameter <log_level> changed from default %d to %d.\n", pr_info("NOTE: driver parameter <cxt1e1_log_level> changed from default %d to %d.\n",
log_level_default, log_level); log_level_default, cxt1e1_log_level);
if (cxt1e1_max_mru != max_mru_default) if (cxt1e1_max_mru != max_mru_default)
pr_info("NOTE: driver parameter <cxt1e1_max_mru> changed from default %d to %d.\n", pr_info("NOTE: driver parameter <cxt1e1_max_mru> changed from default %d to %d.\n",
max_mru_default, cxt1e1_max_mru); max_mru_default, cxt1e1_max_mru);

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

@ -97,7 +97,7 @@ char SBEid_pmcc4_musyccc[] =
/* global driver variables */ /* global driver variables */
extern ci_t *c4_list; extern ci_t *c4_list;
extern int drvr_state; extern int drvr_state;
extern int log_level; extern int cxt1e1_log_level;
extern int cxt1e1_max_mru; extern int cxt1e1_max_mru;
extern int cxt1e1_max_mtu; extern int cxt1e1_max_mtu;
@ -627,7 +627,7 @@ rewrite:
if ((r != req) && (req != SR_CHIP_RESET) && (++rcnt <= MUSYCC_SR_RETRY_CNT)) if ((r != req) && (req != SR_CHIP_RESET) && (++rcnt <= MUSYCC_SR_RETRY_CNT))
{ {
if (log_level >= LOG_MONITOR) if (cxt1e1_log_level >= LOG_MONITOR)
pr_info("%s: %d - reissue srv req/last %x/%x (hdw reads %x), Chan %d.\n", pr_info("%s: %d - reissue srv req/last %x/%x (hdw reads %x), Chan %d.\n",
pi->up->devname, rcnt, req, pi->sr_last, r, pi->up->devname, rcnt, req, pi->sr_last, r,
(pi->portnum * MUSYCC_NCHANS) + (req & 0x1f)); (pi->portnum * MUSYCC_NCHANS) + (req & 0x1f));
@ -951,7 +951,7 @@ musycc_bh_tx_eom (mpi_t * pi, int gchan)
ch = pi->chan[gchan]; ch = pi->chan[gchan];
if (ch == 0 || ch->state != UP) if (ch == 0 || ch->state != UP)
{ {
if (log_level >= LOG_ERROR) if (cxt1e1_log_level >= LOG_ERROR)
pr_info("%s: intr: xmit EOM on uninitialized channel %d\n", pr_info("%s: intr: xmit EOM on uninitialized channel %d\n",
pi->up->devname, gchan); pi->up->devname, gchan);
} }
@ -1002,7 +1002,7 @@ musycc_bh_tx_eom (mpi_t * pi, int gchan)
} }
if (status & MUSYCC_TX_OWNED) if (status & MUSYCC_TX_OWNED)
{ {
if (log_level >= LOG_MONITOR) if (cxt1e1_log_level >= LOG_MONITOR)
{ {
pr_info("%s: Port %d Chan %2d - unexpected TX msg ownership intr (md %p sts %x)\n", pr_info("%s: Port %d Chan %2d - unexpected TX msg ownership intr (md %p sts %x)\n",
pi->up->devname, pi->portnum, ch->channum, pi->up->devname, pi->portnum, ch->channum,
@ -1016,7 +1016,7 @@ musycc_bh_tx_eom (mpi_t * pi, int gchan)
break; /* Not our mdesc, done */ break; /* Not our mdesc, done */
} else } else
{ {
if (log_level >= LOG_MONITOR) if (cxt1e1_log_level >= LOG_MONITOR)
pr_info("%s: Port %d Chan %2d - recovered TX msg ownership [%d] (md %p sts %x)\n", pr_info("%s: Port %d Chan %2d - recovered TX msg ownership [%d] (md %p sts %x)\n",
pi->up->devname, pi->portnum, ch->channum, readCount, md, status); pi->up->devname, pi->portnum, ch->channum, readCount, md, status);
} }
@ -1054,7 +1054,7 @@ musycc_bh_tx_eom (mpi_t * pi, int gchan)
} }
md->status = 0; md->status = 0;
#ifdef RLD_TXFULL_DEBUG #ifdef RLD_TXFULL_DEBUG
if (log_level >= LOG_MONITOR2) if (cxt1e1_log_level >= LOG_MONITOR2)
pr_info("~~ tx_eom: tx_full %x txd_free %d -> %d\n", pr_info("~~ tx_eom: tx_full %x txd_free %d -> %d\n",
ch->tx_full, ch->txd_free, ch->txd_free + 1); ch->tx_full, ch->txd_free, ch->txd_free + 1);
#endif #endif
@ -1063,7 +1063,7 @@ musycc_bh_tx_eom (mpi_t * pi, int gchan)
if ((ch->p.chan_mode != CFG_CH_PROTO_TRANS) && (status & EOBIRQ_ENABLE)) if ((ch->p.chan_mode != CFG_CH_PROTO_TRANS) && (status & EOBIRQ_ENABLE))
{ {
if (log_level >= LOG_MONITOR) if (cxt1e1_log_level >= LOG_MONITOR)
pr_info("%s: Mode (%x) incorrect EOB status (%x)\n", pr_info("%s: Mode (%x) incorrect EOB status (%x)\n",
pi->up->devname, ch->p.chan_mode, status); pi->up->devname, ch->p.chan_mode, status);
if ((status & EOMIRQ_ENABLE) == 0) if ((status & EOMIRQ_ENABLE) == 0)
@ -1094,7 +1094,7 @@ musycc_bh_tx_eom (mpi_t * pi, int gchan)
{ {
#ifdef RLD_TXFULL_DEBUG #ifdef RLD_TXFULL_DEBUG
if (log_level >= LOG_MONITOR2) if (cxt1e1_log_level >= LOG_MONITOR2)
pr_info("tx_eom[%d]: enable xmit tx_full no more, txd_free %d txd_num/2 %d\n", pr_info("tx_eom[%d]: enable xmit tx_full no more, txd_free %d txd_num/2 %d\n",
ch->channum, ch->channum,
ch->txd_free, ch->txd_num / 2); ch->txd_free, ch->txd_num / 2);
@ -1108,7 +1108,7 @@ musycc_bh_tx_eom (mpi_t * pi, int gchan)
#ifdef RLD_TXFULL_DEBUG #ifdef RLD_TXFULL_DEBUG
else if (ch->tx_full) else if (ch->tx_full)
{ {
if (log_level >= LOG_MONITOR2) if (cxt1e1_log_level >= LOG_MONITOR2)
pr_info("tx_eom[%d]: bypass TX enable though room available? (txd_free %d txd_num/2 %d)\n", pr_info("tx_eom[%d]: bypass TX enable though room available? (txd_free %d txd_num/2 %d)\n",
ch->channum, ch->channum,
ch->txd_free, ch->txd_num / 2); ch->txd_free, ch->txd_num / 2);
@ -1138,7 +1138,7 @@ musycc_bh_rx_eom (mpi_t * pi, int gchan)
ch = pi->chan[gchan]; ch = pi->chan[gchan];
if (ch == 0 || ch->state != UP) if (ch == 0 || ch->state != UP)
{ {
if (log_level > LOG_ERROR) if (cxt1e1_log_level > LOG_ERROR)
pr_info("%s: intr: receive EOM on uninitialized channel %d\n", pr_info("%s: intr: receive EOM on uninitialized channel %d\n",
pi->up->devname, gchan); pi->up->devname, gchan);
return; return;
@ -1269,7 +1269,7 @@ musycc_intr_th_handler (void *devp)
if (nextInt != INTRPTS_NEXTINT (ci->intlog.this_status_new)) if (nextInt != INTRPTS_NEXTINT (ci->intlog.this_status_new))
{ {
if (log_level >= LOG_MONITOR) if (cxt1e1_log_level >= LOG_MONITOR)
{ {
pr_info("%s: note - updated ISD from %08x to %08x\n", pr_info("%s: note - updated ISD from %08x to %08x\n",
ci->devname, status, ci->devname, status,
@ -1337,11 +1337,11 @@ musycc_intr_th_handler (void *devp)
ci->intlog.last_status_new = ci->intlog.this_status_new; ci->intlog.last_status_new = ci->intlog.this_status_new;
ci->intlog.this_status_new = currInt; ci->intlog.this_status_new = currInt;
if ((log_level >= LOG_WARN) && (status & INTRPTS_INTFULL_M)) if ((cxt1e1_log_level >= LOG_WARN) && (status & INTRPTS_INTFULL_M))
{ {
pr_info("%s: Interrupt queue full condition occurred\n", ci->devname); pr_info("%s: Interrupt queue full condition occurred\n", ci->devname);
} }
if (log_level >= LOG_DEBUG) if (cxt1e1_log_level >= LOG_DEBUG)
pr_info("%s: interrupts pending, isd @ 0x%p: %x curr %d cnt %d NEXT %d\n", pr_info("%s: interrupts pending, isd @ 0x%p: %x curr %d cnt %d NEXT %d\n",
ci->devname, &ci->reg->isd, ci->devname, &ci->reg->isd,
status, nextInt, intCnt, (intCnt + nextInt) & (INT_QUEUE_SIZE - 1)); status, nextInt, intCnt, (intCnt + nextInt) & (INT_QUEUE_SIZE - 1));
@ -1448,7 +1448,7 @@ musycc_intr_bh_tasklet (ci_t * ci)
if ((currInt == badInt) || (currInt == badInt2)) /* catch failure of Bug if ((currInt == badInt) || (currInt == badInt2)) /* catch failure of Bug
* Fix checking */ * Fix checking */
{ {
if (log_level >= LOG_WARN) if (cxt1e1_log_level >= LOG_WARN)
pr_info("%s: Illegal Interrupt Detected @ 0x%p, mod %d.)\n", pr_info("%s: Illegal Interrupt Detected @ 0x%p, mod %d.)\n",
ci->devname, &ci->iqd_p[headx], headx); ci->devname, &ci->iqd_p[headx], headx);
@ -1483,7 +1483,7 @@ musycc_intr_bh_tasklet (ci_t * ci)
ci->iqd_p[headx] = __constant_cpu_to_le32 (INT_EMPTY_ENTRY); ci->iqd_p[headx] = __constant_cpu_to_le32 (INT_EMPTY_ENTRY);
FLUSH_MEM_WRITE (); FLUSH_MEM_WRITE ();
if (log_level >= LOG_DEBUG) if (cxt1e1_log_level >= LOG_DEBUG)
{ {
if (err != 0) if (err != 0)
pr_info(" %08x -> err: %2d,", currInt, err); pr_info(" %08x -> err: %2d,", currInt, err);
@ -1497,7 +1497,7 @@ musycc_intr_bh_tasklet (ci_t * ci)
switch (event) switch (event)
{ {
case EVE_SACK: /* Service Request Acknowledge */ case EVE_SACK: /* Service Request Acknowledge */
if (log_level >= LOG_DEBUG) if (cxt1e1_log_level >= LOG_DEBUG)
{ {
volatile u_int32_t r; volatile u_int32_t r;
@ -1534,7 +1534,7 @@ musycc_intr_bh_tasklet (ci_t * ci)
} }
break; break;
default: default:
if (log_level >= LOG_WARN) if (cxt1e1_log_level >= LOG_WARN)
pr_info("%s: unexpected interrupt event: %d, iqd[%d]: %08x, port: %d\n", ci->devname, pr_info("%s: unexpected interrupt event: %d, iqd[%d]: %08x, port: %d\n", ci->devname,
event, headx, currInt, group); event, headx, currInt, group);
break; break;
@ -1573,9 +1573,9 @@ musycc_intr_bh_tasklet (ci_t * ci)
{ {
#ifdef RLD_TRANS_DEBUG #ifdef RLD_TRANS_DEBUG
if (1 || log_level >= LOG_MONITOR) if (1 || cxt1e1_log_level >= LOG_MONITOR)
#else #else
if (log_level >= LOG_MONITOR) if (cxt1e1_log_level >= LOG_MONITOR)
#endif #endif
{ {
pr_info("%s: TX buffer underflow [ONR] on channel %d, mode %x QStopped %x free %d\n", pr_info("%s: TX buffer underflow [ONR] on channel %d, mode %x QStopped %x free %d\n",
@ -1605,7 +1605,7 @@ musycc_intr_bh_tasklet (ci_t * ci)
ch->s.rx_over_errors++; ch->s.rx_over_errors++;
ch->ch_start_rx = CH_START_RX_ONR; ch->ch_start_rx = CH_START_RX_ONR;
if (log_level >= LOG_WARN) if (cxt1e1_log_level >= LOG_WARN)
{ {
pr_info("%s: RX buffer overflow [ONR] on channel %d, mode %x\n", pr_info("%s: RX buffer overflow [ONR] on channel %d, mode %x\n",
ci->devname, ch->channum, ch->p.chan_mode); ci->devname, ch->channum, ch->p.chan_mode);
@ -1623,7 +1623,7 @@ musycc_intr_bh_tasklet (ci_t * ci)
* Per MUSYCC manual, Section 6.4.8.3 [Transmit Errors], * Per MUSYCC manual, Section 6.4.8.3 [Transmit Errors],
* this BUFF error requires Transmit channel reactivation. * this BUFF error requires Transmit channel reactivation.
*/ */
if (log_level >= LOG_MONITOR) if (cxt1e1_log_level >= LOG_MONITOR)
pr_info("%s: TX buffer underrun [BUFF] on channel %d, mode %x\n", pr_info("%s: TX buffer underrun [BUFF] on channel %d, mode %x\n",
ci->devname, ch->channum, ch->p.chan_mode); ci->devname, ch->channum, ch->p.chan_mode);
} else /* RX buffer overrun */ } else /* RX buffer overrun */
@ -1636,7 +1636,7 @@ musycc_intr_bh_tasklet (ci_t * ci)
* space for this channel. Receive channel reactivation is * space for this channel. Receive channel reactivation is
* not required, but data has been lost. * not required, but data has been lost.
*/ */
if (log_level >= LOG_WARN) if (cxt1e1_log_level >= LOG_WARN)
pr_info("%s: RX buffer overrun [BUFF] on channel %d, mode %x\n", pr_info("%s: RX buffer overrun [BUFF] on channel %d, mode %x\n",
ci->devname, ch->channum, ch->p.chan_mode); ci->devname, ch->channum, ch->p.chan_mode);
/* /*
@ -1658,7 +1658,7 @@ musycc_intr_bh_tasklet (ci_t * ci)
} /* switch on err */ } /* switch on err */
/* Check for interrupt lost condition */ /* Check for interrupt lost condition */
if ((currInt & INTRPT_ILOST_M) && (log_level >= LOG_ERROR)) if ((currInt & INTRPT_ILOST_M) && (cxt1e1_log_level >= LOG_ERROR))
{ {
pr_info("%s: Interrupt queue overflow - ILOST asserted\n", pr_info("%s: Interrupt queue overflow - ILOST asserted\n",
ci->devname); ci->devname);
@ -1667,7 +1667,7 @@ musycc_intr_bh_tasklet (ci_t * ci)
FLUSH_MEM_WRITE (); FLUSH_MEM_WRITE ();
FLUSH_MEM_READ (); FLUSH_MEM_READ ();
} /* while */ } /* while */
if ((log_level >= LOG_MONITOR2) && (ci->iqp_headx != ci->iqp_tailx)) if ((cxt1e1_log_level >= LOG_MONITOR2) && (ci->iqp_headx != ci->iqp_tailx))
{ {
int bh; int bh;
@ -1821,9 +1821,9 @@ musycc_start_xmit (ci_t * ci, int channum, void *mem_token)
return EROFS; /* how else to flag unwritable state ? */ return EROFS; /* how else to flag unwritable state ? */
#ifdef RLD_TRANS_DEBUGx #ifdef RLD_TRANS_DEBUGx
if (1 || log_level >= LOG_MONITOR2) if (1 || cxt1e1_log_level >= LOG_MONITOR2)
#else #else
if (log_level >= LOG_MONITOR2) if (cxt1e1_log_level >= LOG_MONITOR2)
#endif #endif
{ {
pr_info("++ start_xmt[%d]: state %x start %x full %d free %d required %d stopped %x\n", pr_info("++ start_xmt[%d]: state %x start %x full %d free %d required %d stopped %x\n",
@ -1846,7 +1846,7 @@ musycc_start_xmit (ci_t * ci, int channum, void *mem_token)
if (txd_need_cnt == 0) if (txd_need_cnt == 0)
{ {
if (log_level >= LOG_MONITOR2) if (cxt1e1_log_level >= LOG_MONITOR2)
pr_info("%s channel %d: no TX data in User buffer\n", ci->devname, channum); pr_info("%s channel %d: no TX data in User buffer\n", ci->devname, channum);
OS_mem_token_free (mem_token); OS_mem_token_free (mem_token);
return 0; /* no data to send */ return 0; /* no data to send */
@ -1857,7 +1857,7 @@ musycc_start_xmit (ci_t * ci, int channum, void *mem_token)
if (txd_need_cnt > ch->txd_num) /* never enough descriptors for this if (txd_need_cnt > ch->txd_num) /* never enough descriptors for this
* large a buffer */ * large a buffer */
{ {
if (log_level >= LOG_DEBUG) if (cxt1e1_log_level >= LOG_DEBUG)
{ {
pr_info("start_xmit: discarding buffer, insufficient descriptor cnt %d, need %d.\n", pr_info("start_xmit: discarding buffer, insufficient descriptor cnt %d, need %d.\n",
ch->txd_num, txd_need_cnt + 1); ch->txd_num, txd_need_cnt + 1);
@ -1874,7 +1874,7 @@ musycc_start_xmit (ci_t * ci, int channum, void *mem_token)
/************************************************************/ /************************************************************/
if (txd_need_cnt > ch->txd_free) if (txd_need_cnt > ch->txd_free)
{ {
if (log_level >= LOG_MONITOR2) if (cxt1e1_log_level >= LOG_MONITOR2)
{ {
pr_info("start_xmit[%d]: EBUSY - need more descriptors, have %d of %d need %d\n", pr_info("start_xmit[%d]: EBUSY - need more descriptors, have %d of %d need %d\n",
channum, ch->txd_free, ch->txd_num, txd_need_cnt); channum, ch->txd_free, ch->txd_num, txd_need_cnt);

38
drivers/staging/cxt1e1/pmcc4_drv.c
View File

@ -135,7 +135,7 @@ void musycc_serv_req (mpi_t *, u_int32_t);
void musycc_update_timeslots (mpi_t *); void musycc_update_timeslots (mpi_t *);
extern void musycc_update_tx_thp (mch_t *); extern void musycc_update_tx_thp (mch_t *);
extern int log_level; extern int cxt1e1_log_level;
extern int cxt1e1_max_mru; extern int cxt1e1_max_mru;
extern int cxt1e1_max_mtu; extern int cxt1e1_max_mtu;
extern int max_rxdesc_used, max_rxdesc_default; extern int max_rxdesc_used, max_rxdesc_default;
@ -168,12 +168,12 @@ sbecom_set_loglevel (int d)
* for card 0 only */ * for card 0 only */
} else } else
{ {
if (log_level != d) if (cxt1e1_log_level != d)
{ {
pr_info("log level changed from %d to %d\n", log_level, d); pr_info("log level changed from %d to %d\n", cxt1e1_log_level, d);
log_level = d; /* set new */ cxt1e1_log_level = d; /* set new */
} else } else
pr_info("log level is %d\n", log_level); pr_info("log level is %d\n", cxt1e1_log_level);
} }
} }
@ -513,7 +513,7 @@ checkPorts (ci_t * ci)
if ((value == 0x1c) || (value == 0x19) || (value == 0x12)) if ((value == 0x1c) || (value == 0x19) || (value == 0x12))
c4_loop_port (ci, portnum, COMET_MDIAG_LBOFF); /* take port out of any c4_loop_port (ci, portnum, COMET_MDIAG_LBOFF); /* take port out of any
* loopbk mode */ * loopbk mode */
if (log_level >= LOG_DEBUG) if (cxt1e1_log_level >= LOG_DEBUG)
if (value != 0x3f) if (value != 0x3f)
pr_warning("%s: BOC value = %x on Port %d\n", pr_warning("%s: BOC value = %x on Port %d\n",
ci->devname, value, portnum); ci->devname, value, portnum);
@ -533,7 +533,7 @@ c4_watchdog (ci_t * ci)
{ {
if (drvr_state != SBE_DRVR_AVAILABLE) if (drvr_state != SBE_DRVR_AVAILABLE)
{ {
if (log_level >= LOG_MONITOR) if (cxt1e1_log_level >= LOG_MONITOR)
pr_info("drvr not available (%x)\n", drvr_state); pr_info("drvr not available (%x)\n", drvr_state);
return; return;
} }
@ -794,19 +794,19 @@ c4_loop_port (ci_t * ci, int portnum, u_int8_t cmd)
} }
pci_write_32 ((u_int32_t *) &comet->mdiag, cmd); pci_write_32 ((u_int32_t *) &comet->mdiag, cmd);
if (log_level >= LOG_WARN) if (cxt1e1_log_level >= LOG_WARN)
pr_info("%s: loopback mode changed to %2x from %2x on Port %d\n", pr_info("%s: loopback mode changed to %2x from %2x on Port %d\n",
ci->devname, cmd, loopValue, portnum); ci->devname, cmd, loopValue, portnum);
loopValue = pci_read_32 ((u_int32_t *) &comet->mdiag) & COMET_MDIAG_LBMASK; loopValue = pci_read_32 ((u_int32_t *) &comet->mdiag) & COMET_MDIAG_LBMASK;
if (loopValue != cmd) if (loopValue != cmd)
{ {
if (log_level >= LOG_ERROR) if (cxt1e1_log_level >= LOG_ERROR)
pr_info("%s: write to loop register failed, unknown state for Port %d\n", pr_info("%s: write to loop register failed, unknown state for Port %d\n",
ci->devname, portnum); ci->devname, portnum);
} }
} else } else
{ {
if (log_level >= LOG_WARN) if (cxt1e1_log_level >= LOG_WARN)
pr_info("%s: loopback already in that mode (%2x)\n", pr_info("%s: loopback already in that mode (%2x)\n",
ci->devname, loopValue); ci->devname, loopValue);
} }
@ -997,7 +997,7 @@ c4_set_port (ci_t * ci, int portnum)
pi = &ci->port[portnum]; pi = &ci->port[portnum];
pp = &ci->port[portnum].p; pp = &ci->port[portnum].p;
e1mode = IS_FRAME_ANY_E1 (pp->port_mode); e1mode = IS_FRAME_ANY_E1 (pp->port_mode);
if (log_level >= LOG_MONITOR2) if (cxt1e1_log_level >= LOG_MONITOR2)
{ {
pr_info("%s: c4_set_port[%d]: entered, e1mode = %x, openchans %d.\n", pr_info("%s: c4_set_port[%d]: entered, e1mode = %x, openchans %d.\n",
ci->devname, ci->devname,
@ -1278,12 +1278,12 @@ c4_fifo_alloc (mpi_t * pi, int chan, int *len)
} }
if (max != *len) if (max != *len)
{ {
if (log_level >= LOG_WARN) if (cxt1e1_log_level >= LOG_WARN)
pr_info("%s: wanted to allocate %d fifo space, but got only %d\n", pr_info("%s: wanted to allocate %d fifo space, but got only %d\n",
pi->up->devname, *len, max); pi->up->devname, *len, max);
*len = max; *len = max;
} }
if (log_level >= LOG_DEBUG) if (cxt1e1_log_level >= LOG_DEBUG)
pr_info("%s: allocated %d fifo at %d for channel %d/%d\n", pr_info("%s: allocated %d fifo at %d for channel %d/%d\n",
pi->up->devname, max, start, chan, pi->p.portnum); pi->up->devname, max, start, chan, pi->p.portnum);
for (i = maxstart; i < (maxstart + max); i++) for (i = maxstart; i < (maxstart + max); i++)
@ -1296,7 +1296,7 @@ c4_fifo_free (mpi_t * pi, int chan)
{ {
int i; int i;
if (log_level >= LOG_DEBUG) if (cxt1e1_log_level >= LOG_DEBUG)
pr_info("%s: deallocated fifo for channel %d/%d\n", pr_info("%s: deallocated fifo for channel %d/%d\n",
pi->up->devname, chan, pi->p.portnum); pi->up->devname, chan, pi->p.portnum);
for (i = 0; i < 32; i++) for (i = 0; i < 32; i++)
@ -1321,7 +1321,7 @@ c4_chan_up (ci_t * ci, int channum)
return ENOENT; return ENOENT;
if (ch->state == UP) if (ch->state == UP)
{ {
if (log_level >= LOG_MONITOR) if (cxt1e1_log_level >= LOG_MONITOR)
pr_info("%s: channel already UP, graceful early exit\n", pr_info("%s: channel already UP, graceful early exit\n",
ci->devname); ci->devname);
return 0; return 0;
@ -1334,7 +1334,7 @@ c4_chan_up (ci_t * ci, int channum)
{ {
if (ch->p.bitmask[i] & pi->tsm[i]) if (ch->p.bitmask[i] & pi->tsm[i])
{ {
if (1 || log_level >= LOG_WARN) if (1 || cxt1e1_log_level >= LOG_WARN)
{ {
pr_info("%s: c4_chan_up[%d] EINVAL (attempt to cfg in-use or unavailable TimeSlot[%d])\n", pr_info("%s: c4_chan_up[%d] EINVAL (attempt to cfg in-use or unavailable TimeSlot[%d])\n",
ci->devname, channum, i); ci->devname, channum, i);
@ -1351,7 +1351,7 @@ c4_chan_up (ci_t * ci, int channum)
nbuf = nts / 8 ? nts / 8 : 1; nbuf = nts / 8 ? nts / 8 : 1;
if (!nbuf) if (!nbuf)
{ {
/* if( log_level >= LOG_WARN) */ /* if( cxt1e1_log_level >= LOG_WARN) */
pr_info("%s: c4_chan_up[%d] ENOBUFS (no TimeSlots assigned)\n", pr_info("%s: c4_chan_up[%d] ENOBUFS (no TimeSlots assigned)\n",
ci->devname, channum); ci->devname, channum);
return ENOBUFS; /* this should not happen */ return ENOBUFS; /* this should not happen */
@ -1420,7 +1420,7 @@ c4_chan_up (ci_t * ci, int channum)
#if 0 #if 0
/* DEBUG INFO */ /* DEBUG INFO */
if (log_level >= LOG_MONITOR) if (cxt1e1_log_level >= LOG_MONITOR)
pr_info("%s: mode %x rxnum %d (rxused %d def %d) txnum %d (txused %d def %d)\n", pr_info("%s: mode %x rxnum %d (rxused %d def %d) txnum %d (txused %d def %d)\n",
ci->devname, ch->p.chan_mode, ci->devname, ch->p.chan_mode,
rxnum, max_rxdesc_used, max_rxdesc_default, rxnum, max_rxdesc_used, max_rxdesc_default,
@ -1451,7 +1451,7 @@ c4_chan_up (ci_t * ci, int channum)
if (!(m = OS_mem_token_alloc (cxt1e1_max_mru))) if (!(m = OS_mem_token_alloc (cxt1e1_max_mru)))
{ {
if (log_level >= LOG_MONITOR) if (cxt1e1_log_level >= LOG_MONITOR)
pr_info("%s: c4_chan_up[%d] - token alloc failure, size = %d.\n", pr_info("%s: c4_chan_up[%d] - token alloc failure, size = %d.\n",
ci->devname, channum, cxt1e1_max_mru); ci->devname, channum, cxt1e1_max_mru);
goto errfree; goto errfree;

4
drivers/staging/cxt1e1/sbecom_inline_linux.h
View File

@ -86,7 +86,7 @@ pci_read_32 (u_int32_t *p)
FLUSH_PCI_READ (); FLUSH_PCI_READ ();
v = le32_to_cpu (*p); v = le32_to_cpu (*p);
if (log_level >= LOG_DEBUG) if (cxt1e1_log_level >= LOG_DEBUG)
pr_info("pci_read : %x = %x\n", (u_int32_t) p, v); pr_info("pci_read : %x = %x\n", (u_int32_t) p, v);
return v; return v;
#else #else
@ -99,7 +99,7 @@ static inline void
pci_write_32 (u_int32_t *p, u_int32_t v) pci_write_32 (u_int32_t *p, u_int32_t v)
{ {
#ifdef FLOW_DEBUG #ifdef FLOW_DEBUG
if (log_level >= LOG_DEBUG) if (cxt1e1_log_level >= LOG_DEBUG)
pr_info("pci_write: %x = %x\n", (u_int32_t) p, v); pr_info("pci_write: %x = %x\n", (u_int32_t) p, v);
#endif #endif
*p = cpu_to_le32 (v); *p = cpu_to_le32 (v);