leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ipmi: Cleanup DEBUG_TIMING ifdef usage

Browse Source 
The driver uses #ifdef DEBUG_TIMING in order to conditionally print out
timestamped debug messages. Unfortunately it adds the ifdefs all over the
usage sites.

This patch cleans it up by adding a debug_timestamp() function which
is compiled out if DEBUG_TIMING isn't present. This cleans up all
the ugly ifdefs in the function logic.

Cc: openipmi-developer@lists.sourceforge.net
Cc: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: John Stultz <john.stultz@linaro.org>
Signed-off-by: Corey Minyard <minyard@mvista.com>
This commit is contained in:
John Stultz 2015-01-07 14:24:28 -08:00 committed by Corey Minyard
parent 31013fa92c
commit f93aae9f8d
1 changed files with 21 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
drivers/char/ipmi/ipmi_si_intf.c
View File

@ -321,6 +321,18 @@ static int try_smi_init(struct smi_info *smi);
static void cleanup_one_si(struct smi_info *to_clean); static void cleanup_one_si(struct smi_info *to_clean);
static void cleanup_ipmi_si(void); static void cleanup_ipmi_si(void);
#ifdef DEBUG_TIMING
void debug_timestamp(char *msg)
{
struct timeval t;
do_gettimeofday(&t);
pr_debug("**%s: %d.%9.9d\n", msg, t.tv_sec, t.tv_usec);
}
#else
#define debug_timestamp(x)
#endif
static ATOMIC_NOTIFIER_HEAD(xaction_notifier_list); static ATOMIC_NOTIFIER_HEAD(xaction_notifier_list);
static int register_xaction_notifier(struct notifier_block *nb) static int register_xaction_notifier(struct notifier_block *nb)
{ {
@ -358,9 +370,6 @@ static void return_hosed_msg(struct smi_info *smi_info, int cCode)
static enum si_sm_result start_next_msg(struct smi_info *smi_info) static enum si_sm_result start_next_msg(struct smi_info *smi_info)
{ {
int rv; int rv;
#ifdef DEBUG_TIMING
struct timeval t;
#endif
if (!smi_info->waiting_msg) { if (!smi_info->waiting_msg) {
smi_info->curr_msg = NULL; smi_info->curr_msg = NULL;
@ -370,10 +379,7 @@ static enum si_sm_result start_next_msg(struct smi_info *smi_info)
smi_info->curr_msg = smi_info->waiting_msg; smi_info->curr_msg = smi_info->waiting_msg;
smi_info->waiting_msg = NULL; smi_info->waiting_msg = NULL;
#ifdef DEBUG_TIMING debug_timestamp("Start2");
do_gettimeofday(&t);
printk(KERN_DEBUG "**Start2: %d.%9.9d\n", t.tv_sec, t.tv_usec);
#endif
err = atomic_notifier_call_chain(&xaction_notifier_list, err = atomic_notifier_call_chain(&xaction_notifier_list,
0, smi_info); 0, smi_info);
if (err & NOTIFY_STOP_MASK) { if (err & NOTIFY_STOP_MASK) {
@ -582,12 +588,8 @@ static void check_bt_irq(struct smi_info *smi_info, bool irq_on)
static void handle_transaction_done(struct smi_info *smi_info) static void handle_transaction_done(struct smi_info *smi_info)
{ {
struct ipmi_smi_msg *msg; struct ipmi_smi_msg *msg;
#ifdef DEBUG_TIMING
struct timeval t;
do_gettimeofday(&t); debug_timestamp("Done");
printk(KERN_DEBUG "**Done: %d.%9.9d\n", t.tv_sec, t.tv_usec);
#endif
switch (smi_info->si_state) { switch (smi_info->si_state) {
case SI_NORMAL: case SI_NORMAL:
if (!smi_info->curr_msg) if (!smi_info->curr_msg)
@ -929,17 +931,11 @@ static void sender(void *send_info,
struct smi_info *smi_info = send_info; struct smi_info *smi_info = send_info;
enum si_sm_result result; enum si_sm_result result;
unsigned long flags; unsigned long flags;
#ifdef DEBUG_TIMING
struct timeval t;
#endif
BUG_ON(smi_info->waiting_msg); BUG_ON(smi_info->waiting_msg);
smi_info->waiting_msg = msg; smi_info->waiting_msg = msg;
#ifdef DEBUG_TIMING debug_timestamp("Enqueue");
do_gettimeofday(&t);
printk("**Enqueue: %d.%9.9d\n", t.tv_sec, t.tv_usec);
#endif
if (smi_info->run_to_completion) { if (smi_info->run_to_completion) {
/* /*
@ -1128,15 +1124,10 @@ static void smi_timeout(unsigned long data)
unsigned long jiffies_now; unsigned long jiffies_now;
long time_diff; long time_diff;
long timeout; long timeout;
#ifdef DEBUG_TIMING
struct timeval t;
#endif
spin_lock_irqsave(&(smi_info->si_lock), flags); spin_lock_irqsave(&(smi_info->si_lock), flags);
#ifdef DEBUG_TIMING debug_timestamp("Timer");
do_gettimeofday(&t);
printk(KERN_DEBUG "**Timer: %d.%9.9d\n", t.tv_sec, t.tv_usec);
#endif
jiffies_now = jiffies; jiffies_now = jiffies;
time_diff = (((long)jiffies_now - (long)smi_info->last_timeout_jiffies) time_diff = (((long)jiffies_now - (long)smi_info->last_timeout_jiffies)
* SI_USEC_PER_JIFFY); * SI_USEC_PER_JIFFY);
@ -1173,18 +1164,13 @@ static irqreturn_t si_irq_handler(int irq, void *data)
{ {
struct smi_info *smi_info = data; struct smi_info *smi_info = data;
unsigned long flags; unsigned long flags;
#ifdef DEBUG_TIMING
struct timeval t;
#endif
spin_lock_irqsave(&(smi_info->si_lock), flags); spin_lock_irqsave(&(smi_info->si_lock), flags);
smi_inc_stat(smi_info, interrupts); smi_inc_stat(smi_info, interrupts);
#ifdef DEBUG_TIMING debug_timestamp("Interrupt");
do_gettimeofday(&t);
printk(KERN_DEBUG "**Interrupt: %d.%9.9d\n", t.tv_sec, t.tv_usec);
#endif
smi_event_handler(smi_info, 0); smi_event_handler(smi_info, 0);
spin_unlock_irqrestore(&(smi_info->si_lock), flags); spin_unlock_irqrestore(&(smi_info->si_lock), flags);
return IRQ_HANDLED; return IRQ_HANDLED;
@ -2038,18 +2024,13 @@ static u32 ipmi_acpi_gpe(acpi_handle gpe_device,
{ {
struct smi_info *smi_info = context; struct smi_info *smi_info = context;
unsigned long flags; unsigned long flags;
#ifdef DEBUG_TIMING
struct timeval t;
#endif
spin_lock_irqsave(&(smi_info->si_lock), flags); spin_lock_irqsave(&(smi_info->si_lock), flags);
smi_inc_stat(smi_info, interrupts); smi_inc_stat(smi_info, interrupts);
#ifdef DEBUG_TIMING debug_timestamp("ACPI_GPE");
do_gettimeofday(&t);
printk("**ACPI_GPE: %d.%9.9d\n", t.tv_sec, t.tv_usec);
#endif
smi_event_handler(smi_info, 0); smi_event_handler(smi_info, 0);
spin_unlock_irqrestore(&(smi_info->si_lock), flags); spin_unlock_irqrestore(&(smi_info->si_lock), flags);