Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7bb671e3 authored by Yinghai Lu's avatar Yinghai Lu Committed by Linus Torvalds
Browse files

ipmi: print info for spmi and smbios paths like acpi and pci 



Print out the reg spacing and size for spmi and smbios so BIOS developers
can make them consistent.

Also remove extra PFX on the duplicating path.

Signed-off-by: default avatarYinghai Lu <yinghai@kernel.org>
Cc: Corey Minyard <minyard@acm.org>
Cc: Matthew Garrett <mjg@redhat.com>
Cc: Len Brown <len.brown@intel.com>
Cc: Myron Stowe <myron.stowe@hp.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 7faefea6

drivers/char/ipmi/ipmi_si_intf.c

+11 −1
Original line number Diff line number Diff line
@@ -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;

	}