From ecbc294240ef00f944cc4253ad061cc333a46183 Mon Sep 17 00:00:00 2001 From: H Hartley Sweeten Date: Tue, 5 Feb 2013 18:15:20 -0700 Subject: [PATCH] --- yaml --- r: 354455 b: refs/heads/master c: 573a964882065f9b2cb71db8a225ba067b4b5b7a h: refs/heads/master i: 354453: 489950094eda21aa2e068eba8d764c6f64a08b81 354451: 0baa5ae72a3ad425593e207166aa17007e7eb279 354447: 370995583e97ba56d91b73d6ec149e2463cb3ee7 v: v3 --- [refs] | 2 +- .../staging/comedi/drivers/ni_daq_dio24.c | 25 +++---------------- 2 files changed, 4 insertions(+), 23 deletions(-) diff --git a/[refs] b/[refs] index 5e769791986b..0b8ddaa9f100 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 66dbc7b1b00499285793143b44b979e26141204d +refs/heads/master: 573a964882065f9b2cb71db8a225ba067b4b5b7a diff --git a/trunk/drivers/staging/comedi/drivers/ni_daq_dio24.c b/trunk/drivers/staging/comedi/drivers/ni_daq_dio24.c index 53fd4d0f88df..edfbfb315122 100644 --- a/trunk/drivers/staging/comedi/drivers/ni_daq_dio24.c +++ b/trunk/drivers/staging/comedi/drivers/ni_daq_dio24.c @@ -45,15 +45,6 @@ the PCMCIA interface. #include "8255.h" -static int dio24_pcmcia_config_loop(struct pcmcia_device *p_dev, - void *priv_data) -{ - if (p_dev->config_index == 0) - return -EINVAL; - - return pcmcia_request_io(p_dev); -} - static int dio24_auto_attach(struct comedi_device *dev, unsigned long context) { @@ -63,15 +54,8 @@ static int dio24_auto_attach(struct comedi_device *dev, dev->board_name = dev->driver->driver_name; - link->config_flags |= CONF_ENABLE_IRQ | CONF_AUTO_AUDIO | - CONF_AUTO_SET_IO; - - ret = pcmcia_loop_config(link, dio24_pcmcia_config_loop, NULL); - if (ret) - return ret; - - ret = pcmcia_enable_device(link); - if (ret) + link->config_flags |= CONF_AUTO_SET_IO; + ret = comedi_pcmcia_enable(dev); return ret; dev->iobase = link->resource[0]->start; @@ -90,12 +74,9 @@ static int dio24_auto_attach(struct comedi_device *dev, static void dio24_detach(struct comedi_device *dev) { - struct pcmcia_device *link = comedi_to_pcmcia_dev(dev); - if (dev->subdevices) subdev_8255_cleanup(dev, &dev->subdevices[0]); - if (dev->iobase) - pcmcia_disable_device(link); + comedi_pcmcia_disable(dev); } static struct comedi_driver driver_dio24 = {