From 572afed419c966ef6228eaf8e5366ad056583539 Mon Sep 17 00:00:00 2001 From: Yinghai Lu Date: Tue, 10 Aug 2010 18:03:10 -0700 Subject: [PATCH] --- yaml --- r: 208535 b: refs/heads/master c: 7bb671e3d053226f870c333f701924986b39ee7f h: refs/heads/master i: 208533: 4aa4cec57e1fba7484ee01a82036e101470bf43f 208531: b296a70ae5ea448cda73a1e4d443978939ffe6cd 208527: a532cbd844a51917bb1736b15f224fca09a1f132 v: v3 --- [refs] | 2 +- trunk/drivers/char/ipmi/ipmi_si_intf.c | 12 +++++++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index f98f01f7e783..cd679a594872 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7faefea66a6d1f0d9da0a18615f57dc969e00d99 +refs/heads/master: 7bb671e3d053226f870c333f701924986b39ee7f diff --git a/trunk/drivers/char/ipmi/ipmi_si_intf.c b/trunk/drivers/char/ipmi/ipmi_si_intf.c index 6c2daed531df..48330e0fd488 100644 --- a/trunk/drivers/char/ipmi/ipmi_si_intf.c +++ b/trunk/drivers/char/ipmi/ipmi_si_intf.c @@ -2088,6 +2088,11 @@ static __devinit int try_init_spmi(struct SPMITable *spmi) } info->io.addr_data = spmi->addr.address; + pr_info("ipmi_si: SPMI: %s %#lx regsize %d spacing %d irq %d\n", + (info->io.addr_type == IPMI_IO_ADDR_SPACE) ? "io" : "mem", + info->io.addr_data, info->io.regsize, info->io.regspacing, + info->irq); + if (add_smi(info)) kfree(info); @@ -2366,6 +2371,11 @@ static __devinit void try_init_dmi(struct dmi_ipmi_data *ipmi_data) if (info->irq) info->irq_setup = std_irq_setup; + pr_info("ipmi_si: SMBIOS: %s %#lx regsize %d spacing %d irq %d\n", + (info->io.addr_type == IPMI_IO_ADDR_SPACE) ? "io" : "mem", + info->io.addr_data, info->io.regsize, info->io.regspacing, + info->irq); + if (add_smi(info)) kfree(info); } @@ -3056,7 +3066,7 @@ static int add_smi(struct smi_info *new_smi) si_to_str[new_smi->si_type]); mutex_lock(&smi_infos_lock); if (!is_new_interface(new_smi)) { - printk(KERN_CONT PFX "duplicate interface\n"); + printk(KERN_CONT " duplicate interface\n"); rv = -EBUSY; goto out_err; }