remove unnecessary comedi_subdevice *subdev from comedi_async_struct

diff --git a/comedi/comedi_fops.c b/comedi/comedi_fops.c
index 273bbdd443b44caccb148374dacab0130ab99bf1..237595540097c34fc2b4960246a4c304ef4a5658 100644 (file)
--- a/comedi/comedi_fops.c
+++ b/comedi/comedi_fops.c
@@ -183,7 +183,7 @@ static int do_bufconfig_ioctl(comedi_device *dev,void *arg)
                        return -ENODEV;
                }
 
-               if(rasync->subdev->busy)
+               if(dev->read_subdev->busy)
                        return -EBUSY;
 
                if(rasync->mmap_count){
@@ -201,7 +201,7 @@ static int do_bufconfig_ioctl(comedi_device *dev,void *arg)
                        return -ENODEV;
                }
 
-               if(wasync->subdev->busy)
+               if(dev->write_subdev->busy)
                        return -EBUSY;
 
                if(wasync->mmap_count){
@@ -1598,7 +1598,7 @@ printk("m is %d\n",m);
                        async->buf_user_count = async->buf_int_count;
                        async->buf_user_ptr = async->buf_int_ptr;
                        retval=-EINVAL;
-                       do_cancel(dev, async->subdev);
+                       do_cancel(dev, dev->read_subdev);
                        DPRINTK("buffer overrun\n");
                        break;
                }

diff --git a/comedi/drivers.c b/comedi/drivers.c
index 6275ef3eec868c6ecbf8d2f869711c7b32bdb4ba..e0e84f06e549e9f944e488960505cd9a8c6fed5e 100644 (file)
--- a/comedi/drivers.c
+++ b/comedi/drivers.c
@@ -268,7 +268,6 @@ static void postconfig(comedi_device *dev)
       async = kmalloc(sizeof(comedi_async), GFP_KERNEL);
                        memset(async, 0, sizeof(comedi_async));
                        s->async = async;
-                       async->subdev = s;
                        async->prealloc_bufsz=1024*128;
                        /* XXX */
                        async->prealloc_buf=rvmalloc(async->prealloc_bufsz);

diff --git a/include/linux/comedidev.h b/include/linux/comedidev.h
index 239943e8bf5173705806bf74f95a313d599b9bd7..31219b79a9699e257dafcaeaaee51ec1e05b0d09 100644 (file)
--- a/include/linux/comedidev.h
+++ b/include/linux/comedidev.h
@@ -130,8 +130,6 @@ struct comedi_subdevice_struct{
 };
 
 struct comedi_async_struct{
-       comedi_subdevice *subdev;       /* the subdevice this buffer is associated with */
-
        void            *prealloc_buf;          /* pre-allocated buffer */
        unsigned int    prealloc_bufsz;         /* buffer size, in bytes */
        unsigned int    mmap_count;     /* current number of mmaps of prealloc_buf */