From 7257a10591d3bc14a055c3897d7d3b2aaa49750b Mon Sep 17 00:00:00 2001 From: David Schleef Date: Fri, 14 Sep 2001 03:59:12 +0000 Subject: [PATCH] Removed last remnants of comedi_trig support for drivers --- comedi/comedi_fops.c | 19 ------------------- comedi/drivers.c | 14 +------------- 2 files changed, 1 insertion(+), 32 deletions(-) diff --git a/comedi/comedi_fops.c b/comedi/comedi_fops.c index 0b4d9a53..b1375201 100644 --- a/comedi/comedi_fops.c +++ b/comedi/comedi_fops.c @@ -380,18 +380,6 @@ static int do_subdinfo_ioctl(comedi_device *dev,comedi_subdinfo *arg,void *file) us->subd_flags |= SDF_FLAGS; if(s->range_table_list) us->subd_flags |= SDF_RANGETYPE; -#ifdef CONFIG_COMEDI_TRIG - if(s->trig[0]) - us->subd_flags |= SDF_MODE0; - if(s->trig[1]) - us->subd_flags |= SDF_MODE1; - if(s->trig[2]) - us->subd_flags |= SDF_MODE2; - if(s->trig[3]) - us->subd_flags |= SDF_MODE3; - if(s->trig[4]) - us->subd_flags |= SDF_MODE4; -#endif if(s->do_cmd) us->subd_flags |= SDF_CMD; } @@ -1569,13 +1557,6 @@ void do_become_nonbusy(comedi_device *dev,comedi_subdevice *s) } #endif -#ifdef CONFIG_COMEDI_TRIG - if(s->cur_trig.chanlist){ /* XXX wrong? */ - kfree(s->cur_trig.chanlist); - s->cur_trig.chanlist=NULL; - } -#endif - if(async){ async->buf_user_ptr=0; async->buf_int_ptr=0; diff --git a/comedi/drivers.c b/comedi/drivers.c index d64f6402..88b27659 100644 --- a/comedi/drivers.c +++ b/comedi/drivers.c @@ -239,20 +239,8 @@ static int postconfig(comedi_device *dev) if(s->len_chanlist==0) s->len_chanlist=1; -#ifdef CONFIG_COMEDI_TRIG - if(s->do_cmd){ - s->trig[1]=command_trig; - s->trig[2]=command_trig; - s->trig[3]=command_trig; - s->trig[4]=command_trig; - } -#endif - if(s->do_cmd -#ifdef CONFIG_COMEDI_TRIG - || s->trig[1] || s->trig[2] || s->trig[3] ||s->trig[4] -#endif - ){ + if(s->do_cmd){ async = kmalloc(sizeof(comedi_async), GFP_KERNEL); if(async == NULL) { -- 2.26.2