3 files changed, 5 insertions, 20 deletions

diff --git a/drivers/xen/tmem.c b/drivers/xen/tmem.c
index fb31d64c2608..239738f944ba 100644
--- a/drivers/xen/tmem.c
+++ b/drivers/xen/tmem.c
@@ -381,15 +381,9 @@ static int __init xen_tmem_init(void)
 #ifdef CONFIG_FRONTSWAP
         if (tmem_enabled && frontswap) {
                 char *s = "";
-                struct frontswap_ops *old_ops;
 
                 tmem_frontswap_poolid = -1;
-                old_ops = frontswap_register_ops(&tmem_frontswap_ops);
-                if (IS_ERR(old_ops) || old_ops) {
-                        if (IS_ERR(old_ops))
-                                return PTR_ERR(old_ops);
-                        s = " (WARNING: frontswap_ops overridden)";
-                }
+                frontswap_register_ops(&tmem_frontswap_ops);
                 pr_info("frontswap enabled, RAM provided by Xen Transcendent Memory%s\n",
                         s);
         }
diff --git a/drivers/xen/xen-acpi-cpuhotplug.c b/drivers/xen/xen-acpi-cpuhotplug.c
index 3e62ee4b3b66..f4a369429553 100644
--- a/drivers/xen/xen-acpi-cpuhotplug.c
+++ b/drivers/xen/xen-acpi-cpuhotplug.c
@@ -46,13 +46,7 @@ static int xen_acpi_processor_enable(struct acpi_device *device)
         unsigned long long value;
         union acpi_object object = { 0 };
         struct acpi_buffer buffer = { sizeof(union acpi_object), &object };
-        struct acpi_processor *pr;
-
-        pr = acpi_driver_data(device);
-        if (!pr) {
-                pr_err(PREFIX "Cannot find driver data\n");
-                return -EINVAL;
-        }
+        struct acpi_processor *pr = acpi_driver_data(device);
 
         if (!strcmp(acpi_device_hid(device), ACPI_PROCESSOR_OBJECT_HID)) {
                 /* Declared with "Processor" statement; match ProcessorID */
@@ -77,7 +71,7 @@ static int xen_acpi_processor_enable(struct acpi_device *device)
 
         pr->id = xen_pcpu_id(pr->acpi_id);
 
-        if ((int)pr->id < 0)
+        if (invalid_logical_cpuid(pr->id))
                 /* This cpu is not presented at hypervisor, try to hotadd it */
                 if (ACPI_FAILURE(xen_acpi_cpu_hotadd(pr))) {
                         pr_err(PREFIX "Hotadd CPU (acpi_id = %d) failed.\n",
@@ -226,7 +220,7 @@ static acpi_status xen_acpi_cpu_hotadd(struct acpi_processor *pr)
                 return AE_ERROR;
 
         pr->id = xen_hotadd_cpu(pr);
-        if ((int)pr->id < 0)
+        if (invalid_logical_cpuid(pr->id))
                 return AE_ERROR;
 
         /*
diff --git a/drivers/xen/xen-scsiback.c b/drivers/xen/xen-scsiback.c
index b7f51504f85a..39223c3e99ad 100644
--- a/drivers/xen/xen-scsiback.c
+++ b/drivers/xen/xen-scsiback.c
@@ -49,10 +49,7 @@
 
 #include <generated/utsrelease.h>
 
-#include <scsi/scsi.h>
-#include <scsi/scsi_dbg.h>
-#include <scsi/scsi_eh.h>
-#include <scsi/scsi_tcq.h>
+#include <scsi/scsi_host.h> /* SG_ALL */
 
 #include <target/target_core_base.h>
 #include <target/target_core_fabric.h>