]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
Input: xen-kbdfront - prefer xenbus_write() over xenbus_printf() where possible
authorJan Beulich <JBeulich@suse.com>
Sat, 9 Jul 2016 00:35:30 +0000 (17:35 -0700)
committerBob Liu <bob.liu@oracle.com>
Thu, 20 Oct 2016 08:00:16 +0000 (04:00 -0400)
... as being the simpler variant.

Signed-off-by: Jan Beulich <jbeulich@suse.com>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
(cherry picked from commit cd6763be8f553c7db421d38ddcb36466fb8512cd)
Signed-off-by: Bob Liu <bob.liu@oracle.com>
Orabug: 24820937

 Conflicts:
drivers/input/misc/xen-kbdfront.c

drivers/input/misc/xen-kbdfront.c

index 23d0549539d43904299c51810730f5d34955d952..227fbd2dbb71c2d6350773d78fb1be93103673f9 100644 (file)
@@ -129,8 +129,14 @@ static int xenkbd_probe(struct xenbus_device *dev,
 
        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");
+       if (abs) {
+               ret = xenbus_write(XBT_NIL, dev->nodename,
+                                  "request-abs-pointer", "1");
+               if (ret) {
+                       pr_warning("xenkbd: can't request abs-pointer");
+                       abs = 0;
+               }
+       }
 
        /* keyboard */
        kbd = input_allocate_device();
@@ -321,8 +327,8 @@ InitWait:
                if (ret < 0)
                        val = 0;
                if (val) {
-                       ret = xenbus_printf(XBT_NIL, info->xbdev->nodename,
-                                           "request-abs-pointer", "1");
+                       ret = xenbus_write(XBT_NIL, info->xbdev->nodename,
+                                          "request-abs-pointer", "1");
                        if (ret)
                                pr_warning("xenkbd: can't request abs-pointer");
                }