diff options
Diffstat (limited to 'drivers/staging/comedi/drivers/pcm3730.c')
| -rw-r--r-- | drivers/staging/comedi/drivers/pcm3730.c | 22 |
1 files changed, 4 insertions, 18 deletions
diff --git a/drivers/staging/comedi/drivers/pcm3730.c b/drivers/staging/comedi/drivers/pcm3730.c index 067f14d2261..3a3ce2c769a 100644 --- a/drivers/staging/comedi/drivers/pcm3730.c +++ b/drivers/staging/comedi/drivers/pcm3730.c @@ -54,19 +54,11 @@ static int pcm3730_attach(struct comedi_device *dev, struct comedi_devconfig *it) { struct comedi_subdevice *s; - unsigned long iobase; int ret; - iobase = it->options[0]; - printk(KERN_INFO "comedi%d: pcm3730: 0x%04lx ", dev->minor, iobase); - if (!request_region(iobase, PCM3730_SIZE, "pcm3730")) { - printk("I/O port conflict\n"); - return -EIO; - } - dev->iobase = iobase; - dev->board_name = "pcm3730"; - dev->iobase = dev->iobase; - dev->irq = 0; + ret = comedi_request_region(dev, it->options[0], PCM3730_SIZE); + if (ret) + return ret; ret = comedi_alloc_subdevices(dev, 6); if (ret) @@ -131,17 +123,11 @@ static int pcm3730_attach(struct comedi_device *dev, return 0; } -static void pcm3730_detach(struct comedi_device *dev) -{ - if (dev->iobase) - release_region(dev->iobase, PCM3730_SIZE); -} - static struct comedi_driver pcm3730_driver = { .driver_name = "pcm3730", .module = THIS_MODULE, .attach = pcm3730_attach, - .detach = pcm3730_detach, + .detach = comedi_legacy_detach, }; module_comedi_driver(pcm3730_driver); |