1.1 --- a/linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_probe.c	Sat Dec 31 15:58:44 2005 +0000
     1.2 +++ b/linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_probe.c	Sat Dec 31 19:35:11 2005 +0000
     1.3 @@ -542,14 +542,6 @@ static int xenbus_probe_node(struct xen_
     1.4  			     const char *type,
     1.5  			     const char *nodename)
     1.6  {
     1.7 -#define CHECK_FAIL				\
     1.8 -	do {					\
     1.9 -		if (err)			\
    1.10 -			goto fail;		\
    1.11 -	}					\
    1.12 -	while (0)				\
    1.13 -
    1.14 -
    1.15  	int err;
    1.16  	struct xenbus_device *xendev;
    1.17  	size_t stringlen;
    1.18 @@ -584,19 +576,18 @@ static int xenbus_probe_node(struct xen_
    1.19  	xendev->dev.release = xenbus_dev_release;
    1.20  
    1.21  	err = bus->get_bus_id(xendev->dev.bus_id, xendev->nodename);
    1.22 -	CHECK_FAIL;
    1.23 +	if (err)
    1.24 +		goto fail;
    1.25  
    1.26  	/* Register with generic device framework. */
    1.27  	err = device_register(&xendev->dev);
    1.28 -	CHECK_FAIL;
    1.29 +	if (err)
    1.30 +		goto fail;
    1.31  
    1.32  	device_create_file(&xendev->dev, &dev_attr_nodename);
    1.33  	device_create_file(&xendev->dev, &dev_attr_devtype);
    1.34  
    1.35  	return 0;
    1.36 -
    1.37 -#undef CHECK_FAIL
    1.38 -
    1.39  fail:
    1.40  	xenbus_dev_free(xendev);
    1.41  	return err;