2 files changed, 19 insertions, 17 deletions

diff --git a/drivers/xen/events.c b/drivers/xen/events.c
index 02b5a9c05cfa..42d6c930cc87 100644
--- a/drivers/xen/events.c
+++ b/drivers/xen/events.c
@@ -5,7 +5,7 @@
  * domain gets 1024 event channels, but NR_IRQ is not that large, we
  * must dynamically map irqs<->event channels.  The event channels
  * interface with the rest of the kernel by defining a xen interrupt
- * chip.  When an event is recieved, it is mapped to an irq and sent
+ * chip.  When an event is received, it is mapped to an irq and sent
  * through the normal interrupt processing path.
  *
  * There are four kinds of events which can be mapped to an event
@@ -122,7 +122,7 @@ static struct irq_chip xen_pirq_chip;
 /* Get info for IRQ */
 static struct irq_info *info_for_irq(unsigned irq)
 {
-        return get_irq_data(irq);
+        return irq_get_handler_data(irq);
 }
 
 /* Constructors for packed IRQ information. */
@@ -403,7 +403,7 @@ static void xen_irq_init(unsigned irq)
 
         info->type = IRQT_UNBOUND;
 
-        set_irq_data(irq, info);
+        irq_set_handler_data(irq, info);
 
         list_add_tail(&info->list, &xen_irq_list_head);
 }
@@ -416,7 +416,7 @@ static int __must_check xen_allocate_irq_dynamic(void)
 #ifdef CONFIG_X86_IO_APIC
         /*
          * For an HVM guest or domain 0 which see "real" (emulated or
-         * actual repectively) GSIs we allocate dynamic IRQs
+         * actual respectively) GSIs we allocate dynamic IRQs
          * e.g. those corresponding to event channels or MSIs
          * etc. from the range above those "real" GSIs to avoid
          * collisions.
@@ -458,11 +458,11 @@ static int __must_check xen_allocate_irq_gsi(unsigned gsi)
 
 static void xen_free_irq(unsigned irq)
 {
-        struct irq_info *info = get_irq_data(irq);
+        struct irq_info *info = irq_get_handler_data(irq);
 
         list_del(&info->list);
 
-        set_irq_data(irq, NULL);
+        irq_set_handler_data(irq, NULL);
 
         kfree(info);
 
@@ -585,7 +585,7 @@ static void ack_pirq(struct irq_data *data)
 {
         int evtchn = evtchn_from_irq(data->irq);
 
-        move_native_irq(data->irq);
+        irq_move_irq(data);
 
         if (VALID_EVTCHN(evtchn)) {
                 mask_evtchn(evtchn);
@@ -639,8 +639,8 @@ int xen_bind_pirq_gsi_to_irq(unsigned gsi,
         if (irq < 0)
                 goto out;
 
-        set_irq_chip_and_handler_name(irq, &xen_pirq_chip,
-                                      handle_level_irq, name);
+        irq_set_chip_and_handler_name(irq, &xen_pirq_chip, handle_level_irq,
+                                      name);
 
         irq_op.irq = irq;
         irq_op.vector = 0;
@@ -690,8 +690,8 @@ int xen_bind_pirq_msi_to_irq(struct pci_dev *dev, struct msi_desc *msidesc,
         if (irq == -1)
                 goto out;
 
-        set_irq_chip_and_handler_name(irq, &xen_pirq_chip,
-                                      handle_level_irq, name);
+        irq_set_chip_and_handler_name(irq, &xen_pirq_chip, handle_level_irq,
+                                      name);
 
         xen_irq_info_pirq_init(irq, 0, pirq, 0, vector, 0);
         ret = irq_set_msi_desc(irq, msidesc);
@@ -772,7 +772,7 @@ int bind_evtchn_to_irq(unsigned int evtchn)
                 if (irq == -1)
                         goto out;
 
-                set_irq_chip_and_handler_name(irq, &xen_dynamic_chip,
+                irq_set_chip_and_handler_name(irq, &xen_dynamic_chip,
                                               handle_fasteoi_irq, "event");
 
                 xen_irq_info_evtchn_init(irq, evtchn);
@@ -799,7 +799,7 @@ static int bind_ipi_to_irq(unsigned int ipi, unsigned int cpu)
                 if (irq < 0)
                         goto out;
 
-                set_irq_chip_and_handler_name(irq, &xen_percpu_chip,
+                irq_set_chip_and_handler_name(irq, &xen_percpu_chip,
                                               handle_percpu_irq, "ipi");
 
                 bind_ipi.vcpu = cpu;
@@ -848,7 +848,7 @@ int bind_virq_to_irq(unsigned int virq, unsigned int cpu)
                 if (irq == -1)
                         goto out;
 
-                set_irq_chip_and_handler_name(irq, &xen_percpu_chip,
+                irq_set_chip_and_handler_name(irq, &xen_percpu_chip,
                                               handle_percpu_irq, "virq");
 
                 bind_virq.virq = virq;
@@ -1339,7 +1339,7 @@ static void ack_dynirq(struct irq_data *data)
 {
         int evtchn = evtchn_from_irq(data->irq);
 
-        move_masked_irq(data->irq);
+        irq_move_masked_irq(data);
 
         if (VALID_EVTCHN(evtchn))
                 unmask_evtchn(evtchn);
diff --git a/drivers/xen/gntdev.c b/drivers/xen/gntdev.c
index 017ce600fbc6..b0f9e8fb0052 100644
--- a/drivers/xen/gntdev.c
+++ b/drivers/xen/gntdev.c
@@ -273,7 +273,7 @@ static int __unmap_grant_pages(struct grant_map *map, int offset, int pages)
                                 map->vma->vm_start + map->notify.addr;
                         err = copy_to_user(tmp, &err, 1);
                         if (err)
-                                return err;
+                                return -EFAULT;
                         map->notify.flags &= ~UNMAP_NOTIFY_CLEAR_BYTE;
                 } else if (pgno >= offset && pgno < offset + pages) {
                         uint8_t *tmp = kmap(map->pages[pgno]);
@@ -662,7 +662,7 @@ static int gntdev_mmap(struct file *flip, struct vm_area_struct *vma)
         if (map->flags) {
                 if ((vma->vm_flags & VM_WRITE) &&
                                 (map->flags & GNTMAP_readonly))
-                        return -EINVAL;
+                        goto out_unlock_put;
         } else {
                 map->flags = GNTMAP_host_map;
                 if (!(vma->vm_flags & VM_WRITE))
@@ -700,6 +700,8 @@ unlock_out:
         spin_unlock(&priv->lock);
         return err;
 
+out_unlock_put:
+        spin_unlock(&priv->lock);
 out_put_map:
         if (use_ptemod)
                 map->vma = NULL;