1.1 --- a/linux-2.6-xen-sparse/drivers/xen/tpmback/xenbus.c	Thu Jan 12 14:27:20 2006 +0100
     1.2 +++ b/linux-2.6-xen-sparse/drivers/xen/tpmback/xenbus.c	Thu Jan 12 14:27:55 2006 +0100
     1.3 @@ -89,7 +89,7 @@ static int tpmback_probe(struct xenbus_d
     1.4  		goto fail;
     1.5  	}
     1.6  
     1.7 -	err = xenbus_switch_state(dev, NULL, XenbusStateInitWait);
     1.8 +	err = xenbus_switch_state(dev, XBT_NULL, XenbusStateInitWait);
     1.9  	if (err) {
    1.10  		goto fail;
    1.11  	}
    1.12 @@ -109,7 +109,7 @@ static void backend_changed(struct xenbu
    1.13  		= container_of(watch, struct backend_info, backend_watch);
    1.14  	struct xenbus_device *dev = be->dev;
    1.15  
    1.16 -	err = xenbus_scanf(NULL, dev->nodename,
    1.17 +	err = xenbus_scanf(XBT_NULL, dev->nodename,
    1.18  	                   "instance","%li", &instance);
    1.19  	if (XENBUS_EXIST_ERR(err)) {
    1.20  		return;
    1.21 @@ -177,7 +177,7 @@ static void frontend_changed(struct xenb
    1.22  		break;
    1.23  
    1.24  	case XenbusStateClosing:
    1.25 -		xenbus_switch_state(dev, NULL, XenbusStateClosing);
    1.26 +		xenbus_switch_state(dev, XBT_NULL, XenbusStateClosing);
    1.27  		break;
    1.28  
    1.29  	case XenbusStateClosed: