ia64/xen-unstable

changeset 6266:dfbeb7da829f

Remove support for xenbus driver subtypes since with the subtype field there's no fallback.
Signed-off-by: Christian Limpach <Christian.Limpach@cl.cam.ac.uk>
author cl349@firebug.cl.cam.ac.uk
date Thu Aug 18 19:51:46 2005 +0000 (2005-08-18)
parents 5a97aa8698d9
children e355ae38c83b
files linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_probe.c linux-2.6-xen-sparse/include/asm-xen/xenbus.h
line diff
     1.1 --- a/linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_probe.c	Thu Aug 18 19:24:42 2005 +0000
     1.2 +++ b/linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_probe.c	Thu Aug 18 19:51:46 2005 +0000
     1.3 @@ -48,8 +48,7 @@ static const struct xenbus_device_id *
     1.4  match_device(const struct xenbus_device_id *arr, struct xenbus_device *dev)
     1.5  {
     1.6  	for (; !streq(arr->devicetype, ""); arr++) {
     1.7 -		if (streq(arr->devicetype, dev->devicetype) &&
     1.8 -		    streq(arr->subtype, dev->subtype ?: ""))
     1.9 +		if (streq(arr->devicetype, dev->devicetype))
    1.10  			return arr;
    1.11  	}
    1.12  	return NULL;
    1.13 @@ -284,8 +283,6 @@ static void xenbus_release_device(struct
    1.14  	if (dev) {
    1.15  		struct xenbus_device *xendev = to_xenbus_device(dev);
    1.16  
    1.17 -		if (xendev->subtype)
    1.18 -			kfree(xendev->subtype);
    1.19  		kfree(xendev);
    1.20  	}
    1.21  }
    1.22 @@ -331,11 +328,6 @@ static int xenbus_probe_node(struct xen_
    1.23  	xendev->devicetype = xendev->nodename + strlen(xendev->nodename) + 1;
    1.24  	strcpy(xendev->devicetype, type);
    1.25  
    1.26 -	/* This might not exist, but that's OK. */
    1.27 -	xendev->subtype = xenbus_read(xendev->nodename, "subtype", NULL);
    1.28 -	if (IS_ERR(xendev->subtype))
    1.29 -		xendev->subtype = NULL;
    1.30 -
    1.31  	xendev->dev.parent = &bus->dev;
    1.32  	xendev->dev.bus = &bus->bus;
    1.33  	xendev->dev.release = xenbus_release_device;
     2.1 --- a/linux-2.6-xen-sparse/include/asm-xen/xenbus.h	Thu Aug 18 19:24:42 2005 +0000
     2.2 +++ b/linux-2.6-xen-sparse/include/asm-xen/xenbus.h	Thu Aug 18 19:51:46 2005 +0000
     2.3 @@ -37,7 +37,6 @@
     2.4  /* A xenbus device. */
     2.5  struct xenbus_device {
     2.6  	char *devicetype;
     2.7 -	char *subtype;
     2.8  	char *nodename;
     2.9  	struct device dev;
    2.10  	int has_error;
    2.11 @@ -53,7 +52,6 @@ struct xenbus_device_id
    2.12  {
    2.13  	/* .../device/<device_type>/<identifier> */
    2.14  	char devicetype[32]; 	/* General class of device. */
    2.15 -	char subtype[32];	/* Contents of "subtype" for this device */
    2.16  };
    2.17  
    2.18  /* A xenbus driver. */