xen-netback: prefer xenbus_scanf() over xenbus_gather()

For single items being collected this should be preferred as being more
typesafe (as the compiler can check format string and to-be-written-to
variable match) and more efficient (requiring one less parameter to be
passed).

Signed-off-by: Jan Beulich <jbeulich@suse.com>
Reviewed-by: Paul Durrant <paul.durrant@citrix.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/xen-netback/xenbus.c b/drivers/net/xen-netback/xenbus.c
index 8674e188b697d91741cb8e5eaef96918eb50224d..55a4488633e4a57c0296e0fd10c3cc5321b2ee61 100644 (file)
--- a/drivers/net/xen-netback/xenbus.c
+++ b/drivers/net/xen-netback/xenbus.c
@@ -889,16 +889,16 @@ static int connect_ctrl_ring(struct backend_info *be)
        unsigned int evtchn;
        int err;
 
-       err = xenbus_gather(XBT_NIL, dev->otherend,
-                           "ctrl-ring-ref", "%u", &val, NULL);
-       if (err)
+       err = xenbus_scanf(XBT_NIL, dev->otherend,
+                          "ctrl-ring-ref", "%u", &val);
+       if (err < 0)
                goto done; /* The frontend does not have a control ring */
 
        ring_ref = val;
 
-       err = xenbus_gather(XBT_NIL, dev->otherend,
-                           "event-channel-ctrl", "%u", &val, NULL);
-       if (err) {
+       err = xenbus_scanf(XBT_NIL, dev->otherend,
+                          "event-channel-ctrl", "%u", &val);
+       if (err < 0) {
                xenbus_dev_fatal(dev, err,
                                 "reading %s/event-channel-ctrl",
                                 dev->otherend);