From d030671177a2d9d062a5ab6f7e6c56e963fd995c Mon Sep 17 00:00:00 2001 From: H Hartley Sweeten Date: Tue, 9 Apr 2013 16:19:26 -0700 Subject: [PATCH] --- yaml --- r: 364055 b: refs/heads/master c: d6d0299000a63c617e0982baaac129a434b44cdf h: refs/heads/master i: 364053: 1b875639e777067cfb646bd02b623747ebf00bc8 364051: 1bb5b51eade060c61d581de0ef66aac5306430af 364047: 974f66cc9890661420e8482961aedcfa1a4cebd0 v: v3 --- [refs] | 2 +- trunk/drivers/staging/comedi/drivers/dt2817.c | 13 +++---------- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/[refs] b/[refs] index 2ba66b541895..bd63f3f970fb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 19b3da3e9182a62b9ac378c969b13ea44a202d47 +refs/heads/master: d6d0299000a63c617e0982baaac129a434b44cdf diff --git a/trunk/drivers/staging/comedi/drivers/dt2817.c b/trunk/drivers/staging/comedi/drivers/dt2817.c index 0dd6dd0f2a3d..92b461e73ef7 100644 --- a/trunk/drivers/staging/comedi/drivers/dt2817.c +++ b/trunk/drivers/staging/comedi/drivers/dt2817.c @@ -126,15 +126,10 @@ static int dt2817_attach(struct comedi_device *dev, struct comedi_devconfig *it) { int ret; struct comedi_subdevice *s; - unsigned long iobase; - iobase = it->options[0]; - printk(KERN_INFO "comedi%d: dt2817: 0x%04lx ", dev->minor, iobase); - if (!request_region(iobase, DT2817_SIZE, "dt2817")) { - printk("I/O port conflict\n"); - return -EIO; - } - dev->iobase = iobase; + ret = comedi_request_region(dev, it->options[0], DT2817_SIZE); + if (ret) + return ret; ret = comedi_alloc_subdevices(dev, 1); if (ret) @@ -153,8 +148,6 @@ static int dt2817_attach(struct comedi_device *dev, struct comedi_devconfig *it) s->state = 0; outb(0, dev->iobase + DT2817_CR); - printk(KERN_INFO "\n"); - return 0; }