staging: comedi: 8255: use __comedi_request_region()

[platform/adaptation/renesas_rcar/renesas_kernel.git] / drivers / staging / comedi / drivers / 8255.c

diff --git a/drivers/staging/comedi/drivers/8255.c b/drivers/staging/comedi/drivers/8255.c
index c7aa41a..4b91250 100644 (file)
--- a/drivers/staging/comedi/drivers/8255.c
+++ b/drivers/staging/comedi/drivers/8255.c
@@ -354,8 +354,6 @@ static int dev_8255_attach(struct comedi_device *dev,
        unsigned long iobase;
        int i;
 
-       dev->board_name = "8255";
-
        for (i = 0; i < COMEDI_NDEVCONFOPTS; i++) {
                iobase = it->options[i];
                if (!iobase)
@@ -374,16 +372,13 @@ static int dev_8255_attach(struct comedi_device *dev,
                s = &dev->subdevices[i];
                iobase = it->options[i];
 
-               if (!request_region(iobase, _8255_SIZE, "8255")) {
-                       dev_warn(dev->class_dev,
-                               "0x%04lx (I/O port conflict)\n", iobase);
-
+               ret = __comedi_request_region(dev, iobase, _8255_SIZE);
+               if (ret) {
                        s->type = COMEDI_SUBD_UNUSED;
                } else {
                        ret = subdev_8255_init(dev, s, NULL, iobase);
                        if (ret)
                                return ret;
-                       dev_info(dev->class_dev, "0x%04lx\n", iobase);
                }
        }