Merge remote-tracking branch 'kernel-2.6.32/develop' into develop-2.6.36

[firefly-linux-kernel-4.4.55.git] / drivers / input / xen-kbdfront.c

diff --git a/drivers/input/xen-kbdfront.c b/drivers/input/xen-kbdfront.c
index 480d5d24273559a0a4d40c8d399cdafa53696286..ebb11907d402befd3a777e21e5bed63a0e66dfaf 100644 (file)
--- a/drivers/input/xen-kbdfront.c
+++ b/drivers/input/xen-kbdfront.c
@@ -21,7 +21,11 @@
 #include <linux/errno.h>
 #include <linux/module.h>
 #include <linux/input.h>
+#include <linux/slab.h>
+
 #include <asm/xen/hypervisor.h>
+
+#include <xen/xen.h>
 #include <xen/events.h>
 #include <xen/page.h>
 #include <xen/interface/io/fbif.h>
@@ -105,7 +109,7 @@ static irqreturn_t input_handler(int rq, void *dev_id)
 static int __devinit xenkbd_probe(struct xenbus_device *dev,
                                  const struct xenbus_device_id *id)
 {
-       int ret, i, abs;
+       int ret, i;
        struct xenkbd_info *info;
        struct input_dev *kbd, *ptr;
 
@@ -123,11 +127,6 @@ static int __devinit xenkbd_probe(struct xenbus_device *dev,
        if (!info->page)
                goto error_nomem;
 
-       if (xenbus_scanf(XBT_NIL, dev->otherend, "feature-abs-pointer", "%d", &abs) < 0)
-               abs = 0;
-       if (abs)
-               xenbus_printf(XBT_NIL, dev->nodename, "request-abs-pointer", "1");
-
        /* keyboard */
        kbd = input_allocate_device();
        if (!kbd)
@@ -137,12 +136,11 @@ static int __devinit xenkbd_probe(struct xenbus_device *dev,
        kbd->id.bustype = BUS_PCI;
        kbd->id.vendor = 0x5853;
        kbd->id.product = 0xffff;
-
-       __set_bit(EV_KEY, kbd->evbit);
+       kbd->evbit[0] = BIT(EV_KEY);
        for (i = KEY_ESC; i < KEY_UNKNOWN; i++)
-               __set_bit(i, kbd->keybit);
+               set_bit(i, kbd->keybit);
        for (i = KEY_OK; i < KEY_MAX; i++)
-               __set_bit(i, kbd->keybit);
+               set_bit(i, kbd->keybit);
 
        ret = input_register_device(kbd);
        if (ret) {
@@ -161,20 +159,12 @@ static int __devinit xenkbd_probe(struct xenbus_device *dev,
        ptr->id.bustype = BUS_PCI;
        ptr->id.vendor = 0x5853;
        ptr->id.product = 0xfffe;
-
-       if (abs) {
-               __set_bit(EV_ABS, ptr->evbit);
-               input_set_abs_params(ptr, ABS_X, 0, XENFB_WIDTH, 0, 0);
-               input_set_abs_params(ptr, ABS_Y, 0, XENFB_HEIGHT, 0, 0);
-       } else {
-               input_set_capability(ptr, EV_REL, REL_X);
-               input_set_capability(ptr, EV_REL, REL_Y);
-       }
-       input_set_capability(ptr, EV_REL, REL_WHEEL);
-
-       __set_bit(EV_KEY, ptr->evbit);
+       ptr->evbit[0] = BIT(EV_KEY) | BIT(EV_REL) | BIT(EV_ABS);
        for (i = BTN_LEFT; i <= BTN_TASK; i++)
-               __set_bit(i, ptr->keybit);
+               set_bit(i, ptr->keybit);
+       ptr->relbit[0] = BIT(REL_X) | BIT(REL_Y) | BIT(REL_WHEEL);
+       input_set_abs_params(ptr, ABS_X, 0, XENFB_WIDTH, 0, 0);
+       input_set_abs_params(ptr, ABS_Y, 0, XENFB_HEIGHT, 0, 0);
 
        ret = input_register_device(ptr);
        if (ret) {
@@ -300,7 +290,8 @@ InitWait:
                        ret = xenbus_printf(XBT_NIL, info->xbdev->nodename,
                                            "request-abs-pointer", "1");
                        if (ret)
-                               pr_warning("can't request abs-pointer\n");
+                               printk(KERN_WARNING
+                                      "xenkbd: can't request abs-pointer");
                }
                xenbus_switch_state(dev, XenbusStateConnected);
                break;
@@ -331,7 +322,7 @@ InitWait:
        }
 }
 
-static struct xenbus_device_id xenkbd_ids[] = {
+static const struct xenbus_device_id xenkbd_ids[] = {
        { "vkbd" },
        { "" }
 };
@@ -348,7 +339,7 @@ static struct xenbus_driver xenkbd_driver = {
 
 static int __init xenkbd_init(void)
 {
-       if (!xen_domain())
+       if (!xen_pv_domain())
                return -ENODEV;
 
        /* Nothing to do if running in dom0. */