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

Commit 283c0972 authored by Joe Perches's avatar Joe Perches Committed by Konrad Rzeszutek Wilk
Browse files

xen: Convert printks to pr_<level> 



Convert printks to pr_<level> (excludes printk(KERN_DEBUG...)
to be more consistent throughout the xen subsystem.

Add pr_fmt with KBUILD_MODNAME or "xen:" KBUILD_MODNAME
Coalesce formats and add missing word spaces
Add missing newlines
Align arguments and reflow to 80 columns
Remove DRV_NAME from formats as pr_fmt adds the same content

This does change some of the prefixes of these messages
but it also does make them more consistent.

Signed-off-by: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
parent 65e053a7

drivers/xen/balloon.c

+4 −2
Original line number Diff line number Diff line
@@ -36,6 +36,8 @@ 
 * IN THE SOFTWARE.

 */



#define pr_fmt(fmt) "xen:" KBUILD_MODNAME ": " fmt



#include <linux/kernel.h>

#include <linux/sched.h>

#include <linux/errno.h>
@@ -242,7 +244,7 @@ static enum bp_state reserve_additional_memory(long credit) 
	rc = add_memory(nid, hotplug_start_paddr, balloon_hotplug << PAGE_SHIFT);



	if (rc) {

		pr_info("xen_balloon: %s: add_memory() failed: %i\n", __func__, rc);

		pr_info("%s: add_memory() failed: %i\n", __func__, rc);

		return BP_EAGAIN;

	}
@@ -591,7 +593,7 @@ static int __init balloon_init(void) 
	if (!xen_domain())

		return -ENODEV;



	pr_info("xen/balloon: Initialising balloon driver.\n");

	pr_info("Initialising balloon driver\n");



	balloon_stats.current_pages = xen_pv_domain()

		? min(xen_start_info->nr_pages - xen_released_pages, max_pfn)

drivers/xen/cpu_hotplug.c

+4 −2
Original line number Diff line number Diff line 
#define pr_fmt(fmt) "xen:" KBUILD_MODNAME ": " fmt



#include <linux/notifier.h>



#include <xen/xen.h>
@@ -31,7 +33,7 @@ static int vcpu_online(unsigned int cpu) 
	err = xenbus_scanf(XBT_NIL, dir, "availability", "%15s", state);

	if (err != 1) {

		if (!xen_initial_domain())

			printk(KERN_ERR "XENBUS: Unable to read cpu state\n");

			pr_err("Unable to read cpu state\n");

		return err;

	}
@@ -40,7 +42,7 @@ static int vcpu_online(unsigned int cpu) 
	else if (strcmp(state, "offline") == 0)

		return 0;



	printk(KERN_ERR "XENBUS: unknown state(%s) on CPU%d\n", state, cpu);

	pr_err("unknown state(%s) on CPU%d\n", state, cpu);

	return -EINVAL;

}

static void vcpu_hotplug(unsigned int cpu)

drivers/xen/events.c

+11 −12
Original line number Diff line number Diff line
@@ -21,6 +21,8 @@ 
 * Jeremy Fitzhardinge <jeremy@xensource.com>, XenSource Inc, 2007

 */



#define pr_fmt(fmt) "xen:" KBUILD_MODNAME ": " fmt



#include <linux/linkage.h>

#include <linux/interrupt.h>

#include <linux/irq.h>
@@ -600,8 +602,7 @@ static unsigned int __startup_pirq(unsigned int irq) 
	rc = HYPERVISOR_event_channel_op(EVTCHNOP_bind_pirq, &bind_pirq);

	if (rc != 0) {

		if (!probing_irq(irq))

			printk(KERN_INFO "Failed to obtain physical IRQ %d\n",

			       irq);

			pr_info("Failed to obtain physical IRQ %d\n", irq);

		return 0;

	}

	evtchn = bind_pirq.port;
@@ -693,8 +694,8 @@ int xen_bind_pirq_gsi_to_irq(unsigned gsi, 


	irq = xen_irq_from_gsi(gsi);

	if (irq != -1) {

		printk(KERN_INFO "xen_map_pirq_gsi: returning irq %d for gsi %u\n",

		       irq, gsi);

		pr_info("%s: returning irq %d for gsi %u\n",

			__func__, irq, gsi);

		goto out;

	}
@@ -812,10 +813,10 @@ int xen_destroy_irq(int irq) 
		 * (free_domain_pirqs).

		 */

		if ((rc == -ESRCH && info->u.pirq.domid != DOMID_SELF))

			printk(KERN_INFO "domain %d does not have %d anymore\n",

			pr_info("domain %d does not have %d anymore\n",

				info->u.pirq.domid, info->u.pirq.pirq);

		else if (rc) {

			printk(KERN_WARNING "unmap irq failed %d\n", rc);

			pr_warn("unmap irq failed %d\n", rc);

			goto out;

		}

	}
@@ -1621,7 +1622,7 @@ static void restore_pirqs(void) 


		rc = HYPERVISOR_physdev_op(PHYSDEVOP_map_pirq, &map_irq);

		if (rc) {

			printk(KERN_WARNING "xen map irq failed gsi=%d irq=%d pirq=%d rc=%d\n",

			pr_warn("xen map irq failed gsi=%d irq=%d pirq=%d rc=%d\n",

				gsi, irq, pirq, rc);

			xen_free_irq(irq);

			continue;
@@ -1844,13 +1845,11 @@ void xen_callback_vector(void) 
		callback_via = HVM_CALLBACK_VECTOR(HYPERVISOR_CALLBACK_VECTOR);

		rc = xen_set_callback_via(callback_via);

		if (rc) {

			printk(KERN_ERR "Request for Xen HVM callback vector"

					" failed.\n");

			pr_err("Request for Xen HVM callback vector failed\n");

			xen_have_vector_callback = 0;

			return;

		}

		printk(KERN_INFO "Xen HVM callback vector for event delivery is "

				"enabled\n");

		pr_info("Xen HVM callback vector for event delivery is enabled\n");

		/* in the restore case the vector has already been allocated */

		if (!test_bit(HYPERVISOR_CALLBACK_VECTOR, used_vectors))

			alloc_intr_gate(HYPERVISOR_CALLBACK_VECTOR,

drivers/xen/evtchn.c

+4 −2
Original line number Diff line number Diff line
@@ -31,6 +31,8 @@ 
 * IN THE SOFTWARE.

 */



#define pr_fmt(fmt) "xen:" KBUILD_MODNAME ": " fmt



#include <linux/module.h>

#include <linux/kernel.h>

#include <linux/sched.h>
@@ -547,11 +549,11 @@ static int __init evtchn_init(void) 
	/* Create '/dev/xen/evtchn'. */

	err = misc_register(&evtchn_miscdev);

	if (err != 0) {

		printk(KERN_ERR "Could not register /dev/xen/evtchn\n");

		pr_err("Could not register /dev/xen/evtchn\n");

		return err;

	}



	printk(KERN_INFO "Event-channel device installed.\n");

	pr_info("Event-channel device installed\n");



	return 0;

}

drivers/xen/gntalloc.c

+4 −2
Original line number Diff line number Diff line
@@ -48,6 +48,8 @@ 
 * grant operation.

 */



#define pr_fmt(fmt) "xen:" KBUILD_MODNAME ": " fmt



#include <linux/atomic.h>

#include <linux/module.h>

#include <linux/miscdevice.h>
@@ -507,7 +509,7 @@ static int gntalloc_mmap(struct file *filp, struct vm_area_struct *vma) 
	int rv, i;



	if (!(vma->vm_flags & VM_SHARED)) {

		printk(KERN_ERR "%s: Mapping must be shared.\n", __func__);

		pr_err("%s: Mapping must be shared\n", __func__);

		return -EINVAL;

	}
@@ -584,7 +586,7 @@ static int __init gntalloc_init(void) 


	err = misc_register(&gntalloc_miscdev);

	if (err != 0) {

		printk(KERN_ERR "Could not register misc gntalloc device\n");

		pr_err("Could not register misc gntalloc device\n");

		return err;

	}