--- drivers/input/xen-kbdfront.c

+++ drivers/input/xen-kbdfront.c

@@ -105,7 +105,7 @@ static irqreturn_t input_handler(int rq,

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 +123,6 @@ static int __devinit xenkbd_probe(struct

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 +132,11 @@ static int __devinit xenkbd_probe(struct

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 +155,12 @@ static int __devinit xenkbd_probe(struct

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 +286,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;