From d631a8b280b6f93b8c8aa3145a14b41ab8b974b5 Mon Sep 17 00:00:00 2001 From: H Hartley Sweeten Date: Tue, 9 Apr 2013 16:14:13 -0700 Subject: [PATCH] --- yaml --- r: 364041 b: refs/heads/master c: fa7533b01c0aa20430e6c1d561bbc4dcef7bfe56 h: refs/heads/master i: 364039: 314deacf9a2766202aab75ccaf6fdd3644e07b56 v: v3 --- [refs] | 2 +- .../staging/comedi/drivers/amplc_pc263.c | 23 +++---------------- 2 files changed, 4 insertions(+), 21 deletions(-) diff --git a/[refs] b/[refs] index 927758886746..90b082b3efb2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d7849efa932cc1799b51542c1b1975ff799e9fe0 +refs/heads/master: fa7533b01c0aa20430e6c1d561bbc4dcef7bfe56 diff --git a/trunk/drivers/staging/comedi/drivers/amplc_pc263.c b/trunk/drivers/staging/comedi/drivers/amplc_pc263.c index b8449433eee7..1b1c1aac3109 100644 --- a/trunk/drivers/staging/comedi/drivers/amplc_pc263.c +++ b/trunk/drivers/staging/comedi/drivers/amplc_pc263.c @@ -166,20 +166,6 @@ static struct pci_dev *pc263_find_pci_dev(struct comedi_device *dev, bus, slot); return NULL; } -/* - * This function checks and requests an I/O region, reporting an error - * if there is a conflict. - */ -static int pc263_request_region(struct comedi_device *dev, unsigned long from, - unsigned long extent) -{ - if (!from || !request_region(from, extent, PC263_DRIVER_NAME)) { - dev_err(dev->class_dev, "I/O port conflict (%#lx,%lu)!\n", - from, extent); - return -EIO; - } - return 0; -} static int pc263_do_insn_bits(struct comedi_device *dev, struct comedi_subdevice *s, @@ -268,15 +254,12 @@ static int pc263_attach(struct comedi_device *dev, struct comedi_devconfig *it) const struct pc263_board *thisboard = comedi_board(dev); int ret; - dev_info(dev->class_dev, PC263_DRIVER_NAME ": attach\n"); - /* Process options and reserve resources according to bus type. */ if (is_isa_board(thisboard)) { - unsigned long iobase = it->options[0]; - ret = pc263_request_region(dev, iobase, PC263_IO_SIZE); - if (ret < 0) + ret = comedi_request_region(dev, it->options[0], PC263_IO_SIZE); + if (ret) return ret; - return pc263_common_attach(dev, iobase); + return pc263_common_attach(dev, dev->iobase); } else if (is_pci_board(thisboard)) { struct pci_dev *pci_dev;