From eb737700745c241a6206fb0e5f3d27d0b9ded102 Mon Sep 17 00:00:00 2001 From: H Hartley Sweeten Date: Tue, 9 Apr 2013 16:09:32 -0700 Subject: [PATCH] --- yaml --- r: 364029 b: refs/heads/master c: 6f9aa29b47f6c277396957ce632bbe2e90c2ddff h: refs/heads/master i: 364027: ba7b34665a60c527d327269f07b9f8027d822c23 v: v3 --- [refs] | 2 +- trunk/drivers/staging/comedi/drivers/pcl730.c | 15 +++------------ 2 files changed, 4 insertions(+), 13 deletions(-) diff --git a/[refs] b/[refs] index 68b1a0ac62b7..95697155b9b8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3f7b35ce30b5fceddaf5d9a8f33f5dcf0985e3b3 +refs/heads/master: 6f9aa29b47f6c277396957ce632bbe2e90c2ddff diff --git a/trunk/drivers/staging/comedi/drivers/pcl730.c b/trunk/drivers/staging/comedi/drivers/pcl730.c index 371f76cabb37..50cc3ac54960 100644 --- a/trunk/drivers/staging/comedi/drivers/pcl730.c +++ b/trunk/drivers/staging/comedi/drivers/pcl730.c @@ -64,20 +64,11 @@ static int pcl730_attach(struct comedi_device *dev, struct comedi_devconfig *it) { const struct pcl730_board *board = comedi_board(dev); struct comedi_subdevice *s; - unsigned long iobase; - unsigned int iorange; int ret; - iobase = it->options[0]; - iorange = board->io_range; - printk(KERN_INFO "comedi%d: pcl730: board=%s 0x%04lx ", dev->minor, - board->name, iobase); - if (!request_region(iobase, iorange, dev->board_name)) { - printk("I/O port conflict\n"); - return -EIO; - } - dev->iobase = iobase; - dev->irq = 0; + ret = comedi_request_region(dev, it->options[0], board->io_range); + if (ret) + return ret; ret = comedi_alloc_subdevices(dev, 4); if (ret)