hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

staging: ozwpan: Remove old debug macro. 

Remove old oz_trace & oz_trace2 macro & related header files.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Rupesh Gujare <rupesh.gujare@atmel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Joe Perches 2013-07-23 13:45:01 +01:00 committed by Greg Kroah-Hartman
parent f724b58434
commit 05f608f237
13 changed files with 17 additions and 125 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/staging/ozwpan/Kbuild
View File

@ -2,6 +2,7 @@
# Copyright (c) 2011 Ozmo Inc
# Released under the GNU General Public License Version 2 (GPLv2).
# -----------------------------------------------------------------------------
obj-$(CONFIG_USB_WPAN_HCD) += ozwpan.o
ozwpan-y := \
ozmain.o \
@ -12,7 +13,4 @@ ozwpan-y := \
ozeltbuf.o \
ozproto.o \
ozcdev.o \
ozurbparanoia.o \
oztrace.o
ozurbparanoia.o

2
drivers/staging/ozwpan/ozcdev.c
View File

@ -11,10 +11,8 @@
#include <linux/etherdevice.h>
#include <linux/poll.h>
#include <linux/sched.h>
#include "ozconfig.h"
#include "ozdbg.h"
#include "ozprotocol.h"
#include "oztrace.h"
#include "ozappif.h"
#include "ozeltbuf.h"
#include "ozpd.h"

26
drivers/staging/ozwpan/ozconfig.h
View File

@ -1,26 +0,0 @@
/* -----------------------------------------------------------------------------
* Copyright (c) 2011 Ozmo Inc
* Released under the GNU General Public License Version 2 (GPLv2).
* ---------------------------------------------------------------------------*/
#ifndef _OZCONFIG_H
#define _OZCONFIG_H
/* #define WANT_TRACE */
#ifdef WANT_TRACE
#define WANT_VERBOSE_TRACE
#endif /* #ifdef WANT_TRACE */
/* #define WANT_URB_PARANOIA */
/* #define WANT_PRE_2_6_39 */
/* These defines determine what verbose trace is displayed. */
#ifdef WANT_VERBOSE_TRACE
/* #define WANT_TRACE_STREAM */
/* #define WANT_TRACE_URB */
/* #define WANT_TRACE_CTRL_DETAIL */
#define WANT_TRACE_HUB
/* #define WANT_TRACE_RX_FRAMES */
/* #define WANT_TRACE_TX_FRAMES */
#endif /* WANT_VERBOSE_TRACE */
#endif /* _OZCONFIG_H */

2
drivers/staging/ozwpan/ozeltbuf.c
View File

@ -6,12 +6,10 @@
#include <linux/init.h>
#include <linux/module.h>
#include <linux/netdevice.h>
#include "ozconfig.h"
#include "ozdbg.h"
#include "ozprotocol.h"
#include "ozeltbuf.h"
#include "ozpd.h"
#include "oztrace.h"
/*------------------------------------------------------------------------------
*/

7
drivers/staging/ozwpan/ozhcd.c
View File

@ -32,9 +32,7 @@
#include "linux/usb/hcd.h"
#include <asm/unaligned.h>
#include "ozdbg.h"
#include "ozconfig.h"
#include "ozusbif.h"
#include "oztrace.h"
#include "ozurbparanoia.h"
#include "ozhcd.h"
/*------------------------------------------------------------------------------
@ -797,7 +795,6 @@ void oz_hcd_get_desc_cnf(void *hport, u8 req_id, int status, const u8 *desc,
/*------------------------------------------------------------------------------
* Context: softirq
*/
#ifdef WANT_TRACE
static void oz_display_conf_type(u8 t)
{
switch (t) {
@ -836,9 +833,7 @@ static void oz_display_conf_type(u8 t)
break;
}
}
#else
#define oz_display_conf_type(__x)
#endif /* WANT_TRACE */
/*------------------------------------------------------------------------------
* Context: softirq
*/

7
drivers/staging/ozwpan/ozmain.c
View File

@ -3,6 +3,7 @@
* Released under the GNU General Public License Version 2 (GPLv2).
* -----------------------------------------------------------------------------
*/
#include <linux/init.h>
#include <linux/module.h>
#include <linux/timer.h>
@ -10,11 +11,13 @@
#include <linux/netdevice.h>
#include <linux/errno.h>
#include <linux/ieee80211.h>
#include "ozconfig.h"
#include "ozdbg.h"
#include "ozpd.h"
#include "ozproto.h"
#include "ozcdev.h"
#include "oztrace.h"
unsigned int oz_dbg_mask = OZ_DEFAULT_DBG_MASK;
/*------------------------------------------------------------------------------
* The name of the 802.11 mac device. Empty string is the default value but a
* value can be supplied as a parameter to the module. An empty string means

6
drivers/staging/ozwpan/ozpd.c
View File

@ -3,6 +3,7 @@
* Released under the GNU General Public License Version 2 (GPLv2).
* -----------------------------------------------------------------------------
*/
#include <linux/init.h>
#include <linux/module.h>
#include <linux/timer.h>
@ -10,17 +11,16 @@
#include <linux/netdevice.h>
#include <linux/errno.h>
#include "ozdbg.h"
#include "ozconfig.h"
#include "ozprotocol.h"
#include "ozeltbuf.h"
#include "ozpd.h"
#include "ozproto.h"
#include "oztrace.h"
#include "ozcdev.h"
#include "ozusbsvc.h"
#include <asm/unaligned.h>
#include <linux/uaccess.h>
#include <net/psnap.h>
/*------------------------------------------------------------------------------
*/
#define OZ_MAX_TX_POOL_SIZE 6
@ -121,7 +121,6 @@ static void oz_def_app_rx(struct oz_pd *pd, struct oz_elt *elt)
void oz_pd_set_state(struct oz_pd *pd, unsigned state)
{
pd->state = state;
#ifdef WANT_TRACE
switch (state) {
case OZ_PD_S_IDLE:
oz_pd_dbg(pd, ON, "PD State: OZ_PD_S_IDLE\n");
@ -136,7 +135,6 @@ void oz_pd_set_state(struct oz_pd *pd, unsigned state)
oz_pd_dbg(pd, ON, "PD State: OZ_PD_S_SLEEP\n");
break;
}
#endif /* WANT_TRACE */
}
/*------------------------------------------------------------------------------
* Context: softirq or process

4
drivers/staging/ozwpan/ozproto.c
View File

@ -3,6 +3,7 @@
* Released under the GNU General Public License Version 2 (GPLv2).
* -----------------------------------------------------------------------------
*/
#include <linux/init.h>
#include <linux/module.h>
#include <linux/timer.h>
@ -11,13 +12,12 @@
#include <linux/errno.h>
#include <linux/ieee80211.h>
#include "ozdbg.h"
#include "ozconfig.h"
#include "ozprotocol.h"
#include "ozeltbuf.h"
#include "ozpd.h"
#include "ozproto.h"
#include "ozusbsvc.h"
#include "oztrace.h"
#include "ozappif.h"
#include <asm/unaligned.h>
#include <linux/uaccess.h>

36
drivers/staging/ozwpan/oztrace.c
View File

@ -1,36 +0,0 @@
/* -----------------------------------------------------------------------------
* Copyright (c) 2011 Ozmo Inc
* Released under the GNU General Public License Version 2 (GPLv2).
* -----------------------------------------------------------------------------
*/
#include "ozconfig.h"
#include "oztrace.h"
#ifdef WANT_VERBOSE_TRACE
unsigned long trace_flags =
0
#ifdef WANT_TRACE_STREAM
| OZ_TRACE_STREAM
#endif /* WANT_TRACE_STREAM */
#ifdef WANT_TRACE_URB
| OZ_TRACE_URB
#endif /* WANT_TRACE_URB */
#ifdef WANT_TRACE_CTRL_DETAIL
| OZ_TRACE_CTRL_DETAIL
#endif /* WANT_TRACE_CTRL_DETAIL */
#ifdef WANT_TRACE_HUB
| OZ_TRACE_HUB
#endif /* WANT_TRACE_HUB */
#ifdef WANT_TRACE_RX_FRAMES
| OZ_TRACE_RX_FRAMES
#endif /* WANT_TRACE_RX_FRAMES */
#ifdef WANT_TRACE_TX_FRAMES
| OZ_TRACE_TX_FRAMES
#endif /* WANT_TRACE_TX_FRAMES */
;
#endif /* WANT_VERBOSE_TRACE */

35
drivers/staging/ozwpan/oztrace.h
View File

@ -1,35 +0,0 @@
/* -----------------------------------------------------------------------------
* Copyright (c) 2011 Ozmo Inc
* Released under the GNU General Public License Version 2 (GPLv2).
* -----------------------------------------------------------------------------
*/
#ifndef _OZTRACE_H_
#define _OZTRACE_H_
#include "ozconfig.h"
#define TRACE_PREFIX KERN_ALERT "OZWPAN: "
#ifdef WANT_TRACE
#define oz_trace(...) printk(TRACE_PREFIX __VA_ARGS__)
#ifdef WANT_VERBOSE_TRACE
extern unsigned long trace_flags;
#define oz_trace2(_flag, ...) \
do { if (trace_flags & _flag) printk(TRACE_PREFIX __VA_ARGS__); \
} while (0)
#else
#define oz_trace2(...)
#endif /* #ifdef WANT_VERBOSE_TRACE */
#else
#define oz_trace(...)
#define oz_trace2(...)
#endif /* #ifdef WANT_TRACE */
#define OZ_TRACE_STREAM 0x1
#define OZ_TRACE_URB 0x2
#define OZ_TRACE_CTRL_DETAIL 0x4
#define OZ_TRACE_HUB 0x8
#define OZ_TRACE_RX_FRAMES 0x10
#define OZ_TRACE_TX_FRAMES 0x20
#endif /* Sentry */

5
drivers/staging/ozwpan/ozurbparanoia.c
View File

@ -5,10 +5,11 @@
*/
#include <linux/usb.h>
#include "ozdbg.h"
#include "ozconfig.h"
#ifdef WANT_URB_PARANOIA
#include "ozurbparanoia.h"
#include "oztrace.h"
/*-----------------------------------------------------------------------------
*/
#define OZ_MAX_URBS 1000

4
drivers/staging/ozwpan/ozusbsvc.c
View File

@ -10,6 +10,7 @@
* The implementation of this service uses ozhcd.c to implement a USB HCD.
* -----------------------------------------------------------------------------
*/
#include <linux/init.h>
#include <linux/module.h>
#include <linux/timer.h>
@ -19,15 +20,14 @@
#include <linux/input.h>
#include <asm/unaligned.h>
#include "ozdbg.h"
#include "ozconfig.h"
#include "ozprotocol.h"
#include "ozeltbuf.h"
#include "ozpd.h"
#include "ozproto.h"
#include "ozusbif.h"
#include "ozhcd.h"
#include "oztrace.h"
#include "ozusbsvc.h"
/*------------------------------------------------------------------------------
* This is called once when the driver is loaded to initialise the USB service.
* Context: process

2
drivers/staging/ozwpan/ozusbsvc1.c
View File

@ -14,14 +14,12 @@
#include <linux/input.h>
#include <asm/unaligned.h>
#include "ozdbg.h"
#include "ozconfig.h"
#include "ozprotocol.h"
#include "ozeltbuf.h"
#include "ozpd.h"
#include "ozproto.h"
#include "ozusbif.h"
#include "ozhcd.h"
#include "oztrace.h"
#include "ozusbsvc.h"
/*------------------------------------------------------------------------------
*/