Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6c27f99d authored by Jan Beulich's avatar Jan Beulich Committed by David S. Miller
Browse files

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: default avatarJan Beulich <jbeulich@suse.com>
Reviewed-by: default avatarPaul Durrant <paul.durrant@citrix.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 1af92836

drivers/net/xen-netback/xenbus.c

+6 −6
Original line number Diff line number Diff line
@@ -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);