From: H Hartley Sweeten <hsweeten@visionengravers.com> Date: Wed, 10 Apr 2013 17:04:54 +0000 (-0700) Subject: staging: comedi: rti800: use comedi_request_region() X-Git-Tag: firefly_0821_release~3680^2~674^2~103 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=b5fb9e6d23beddf0ead5e2abbc37f7ca30b981bf;p=firefly-linux-kernel-4.4.55.git staging: comedi: rti800: use comedi_request_region() Use comedi_request_region() to request the I/O region used by this driver. Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com> Cc: Ian Abbott <abbotti@mev.co.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> --- diff --git a/drivers/staging/comedi/drivers/rti800.c b/drivers/staging/comedi/drivers/rti800.c index a94dbe7bd4fb..44bab88b679e 100644 --- a/drivers/staging/comedi/drivers/rti800.c +++ b/drivers/staging/comedi/drivers/rti800.c @@ -291,14 +291,12 @@ static int rti800_attach(struct comedi_device *dev, struct comedi_devconfig *it) { const struct rti800_board *board = comedi_board(dev); struct rti800_private *devpriv; - unsigned long iobase; - int ret; struct comedi_subdevice *s; + int ret; - iobase = it->options[0]; - if (!request_region(iobase, RTI800_IOSIZE, dev->board_name)) - return -EIO; - dev->iobase = iobase; + ret = comedi_request_region(dev, it->options[0], RTI800_IOSIZE); + if (ret) + return ret; outb(0, dev->iobase + RTI800_CSR); inb(dev->iobase + RTI800_ADCHI);