usb: phy: don't check resource with devm_ioremap_resource

[~andy/linux] / drivers / xen / events.c

diff --git a/drivers/xen/events.c b/drivers/xen/events.c
index 6a6bbe4ede92c67afe4c88efd105839f14b3a240..a58ac435a9a4a03f39274f8b5a41ea659d44eee7 100644 (file)
--- a/drivers/xen/events.c
+++ b/drivers/xen/events.c
@@ -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,8 +1622,8 @@ 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",
-                                       gsi, irq, pirq, rc);
+                       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,