7f715626a9
When calling IWL_DEBUG_*() dev_dbg() is currently used, and this could result in the log being ignored no matter the internal loglevel, since dev_dbg() may get turned on or off based on the dynamic debug mechanism. Replace the dev_dbg() with dev_printk() since dynamic printing is pointless as we use our own debug level mechanism and there is just a single dev_dbg() call in the code. Signed-off-by: Liad Kaufman <liad.kaufman@intel.com> [rephrase commit message a bit] Signed-off-by: Johannes Berg <johannes.berg@intel.com> Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
136 lines
4.5 KiB
C
136 lines
4.5 KiB
C
/******************************************************************************
|
|
*
|
|
* This file is provided under a dual BSD/GPLv2 license. When using or
|
|
* redistributing this file, you may do so under either license.
|
|
*
|
|
* GPL LICENSE SUMMARY
|
|
*
|
|
* Copyright(c) 2007 - 2011 Intel Corporation. All rights reserved.
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of version 2 of the GNU General Public License as
|
|
* published by the Free Software Foundation.
|
|
*
|
|
* This program is distributed in the hope that it will be useful, but
|
|
* WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
* General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write to the Free Software
|
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110,
|
|
* USA
|
|
*
|
|
* The full GNU General Public License is included in this distribution
|
|
* in the file called COPYING.
|
|
*
|
|
* Contact Information:
|
|
* Intel Linux Wireless <ilw@linux.intel.com>
|
|
* Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
|
|
*
|
|
* BSD LICENSE
|
|
*
|
|
* Copyright(c) 2005 - 2011 Intel Corporation. All rights reserved.
|
|
* All rights reserved.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions
|
|
* are met:
|
|
*
|
|
* * Redistributions of source code must retain the above copyright
|
|
* notice, this list of conditions and the following disclaimer.
|
|
* * Redistributions in binary form must reproduce the above copyright
|
|
* notice, this list of conditions and the following disclaimer in
|
|
* the documentation and/or other materials provided with the
|
|
* distribution.
|
|
* * Neither the name Intel Corporation nor the names of its
|
|
* contributors may be used to endorse or promote products derived
|
|
* from this software without specific prior written permission.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
|
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
|
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
|
|
* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
|
|
* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
|
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
|
|
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
|
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
|
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
|
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
*
|
|
*****************************************************************************/
|
|
|
|
#include <linux/device.h>
|
|
#include <linux/interrupt.h>
|
|
#include <linux/export.h>
|
|
#include "iwl-drv.h"
|
|
#include "iwl-debug.h"
|
|
#include "iwl-devtrace.h"
|
|
|
|
#define __iwl_fn(fn) \
|
|
void __iwl_ ##fn(struct device *dev, const char *fmt, ...) \
|
|
{ \
|
|
struct va_format vaf = { \
|
|
.fmt = fmt, \
|
|
}; \
|
|
va_list args; \
|
|
\
|
|
va_start(args, fmt); \
|
|
vaf.va = &args; \
|
|
dev_ ##fn(dev, "%pV", &vaf); \
|
|
trace_iwlwifi_ ##fn(&vaf); \
|
|
va_end(args); \
|
|
}
|
|
|
|
__iwl_fn(warn)
|
|
IWL_EXPORT_SYMBOL(__iwl_warn);
|
|
__iwl_fn(info)
|
|
IWL_EXPORT_SYMBOL(__iwl_info);
|
|
__iwl_fn(crit)
|
|
IWL_EXPORT_SYMBOL(__iwl_crit);
|
|
|
|
void __iwl_err(struct device *dev, bool rfkill_prefix, bool trace_only,
|
|
const char *fmt, ...)
|
|
{
|
|
struct va_format vaf = {
|
|
.fmt = fmt,
|
|
};
|
|
va_list args;
|
|
|
|
va_start(args, fmt);
|
|
vaf.va = &args;
|
|
if (!trace_only) {
|
|
if (rfkill_prefix)
|
|
dev_err(dev, "(RFKILL) %pV", &vaf);
|
|
else
|
|
dev_err(dev, "%pV", &vaf);
|
|
}
|
|
trace_iwlwifi_err(&vaf);
|
|
va_end(args);
|
|
}
|
|
IWL_EXPORT_SYMBOL(__iwl_err);
|
|
|
|
#if defined(CONFIG_IWLWIFI_DEBUG) || defined(CONFIG_IWLWIFI_DEVICE_TRACING)
|
|
void __iwl_dbg(struct device *dev,
|
|
u32 level, bool limit, const char *function,
|
|
const char *fmt, ...)
|
|
{
|
|
struct va_format vaf = {
|
|
.fmt = fmt,
|
|
};
|
|
va_list args;
|
|
|
|
va_start(args, fmt);
|
|
vaf.va = &args;
|
|
#ifdef CONFIG_IWLWIFI_DEBUG
|
|
if (iwl_have_debug_level(level) &&
|
|
(!limit || net_ratelimit()))
|
|
dev_printk(KERN_DEBUG, dev, "%c %s %pV",
|
|
in_interrupt() ? 'I' : 'U', function, &vaf);
|
|
#endif
|
|
trace_iwlwifi_dbg(level, in_interrupt(), function, &vaf);
|
|
va_end(args);
|
|
}
|
|
IWL_EXPORT_SYMBOL(__iwl_dbg);
|
|
#endif
|