staging: comedi: mpc624: use comedi_request_region()

Use comedi_request_region() to request the I/O region used by this
driver.

Remove the noise when the board is first attached as well as the
error message when the request_region() fails, comedi_request_reqion()
will output the error message if necessary.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/comedi/drivers/mpc624.c b/drivers/staging/comedi/drivers/mpc624.c
index 3b7a53f..8d4527e 100644 (file)
--- a/drivers/staging/comedi/drivers/mpc624.c
+++ b/drivers/staging/comedi/drivers/mpc624.c
@@ -285,17 +285,11 @@ static int mpc624_attach(struct comedi_device *dev, struct comedi_devconfig *it)
 {
        struct mpc624_private *devpriv;
        struct comedi_subdevice *s;
-       unsigned long iobase;
        int ret;
 
-       iobase = it->options[0];
-       printk(KERN_INFO "comedi%d: mpc624 [0x%04lx, ", dev->minor, iobase);
-       if (request_region(iobase, MPC624_SIZE, "mpc624") == NULL) {
-               printk(KERN_ERR "I/O port(s) in use\n");
-               return -EIO;
-       }
-
-       dev->iobase = iobase;
+       ret = comedi_request_region(dev, it->options[0], MPC624_SIZE);
+       if (ret)
+               return ret;
 
        devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
        if (!devpriv)
@@ -305,48 +299,35 @@ static int mpc624_attach(struct comedi_device *dev, struct comedi_devconfig *it)
        switch (it->options[1]) {
        case 0:
                devpriv->ulConvertionRate = MPC624_SPEED_3_52_kHz;
-               printk(KERN_INFO "3.52 kHz, ");
                break;
        case 1:
                devpriv->ulConvertionRate = MPC624_SPEED_1_76_kHz;
-               printk(KERN_INFO "1.76 kHz, ");
                break;
        case 2:
                devpriv->ulConvertionRate = MPC624_SPEED_880_Hz;
-               printk(KERN_INFO "880 Hz, ");
                break;
        case 3:
                devpriv->ulConvertionRate = MPC624_SPEED_440_Hz;
-               printk(KERN_INFO "440 Hz, ");
                break;
        case 4:
                devpriv->ulConvertionRate = MPC624_SPEED_220_Hz;
-               printk(KERN_INFO "220 Hz, ");
                break;
        case 5:
                devpriv->ulConvertionRate = MPC624_SPEED_110_Hz;
-               printk(KERN_INFO "110 Hz, ");
                break;
        case 6:
                devpriv->ulConvertionRate = MPC624_SPEED_55_Hz;
-               printk(KERN_INFO "55 Hz, ");
                break;
        case 7:
                devpriv->ulConvertionRate = MPC624_SPEED_27_5_Hz;
-               printk(KERN_INFO "27.5 Hz, ");
                break;
        case 8:
                devpriv->ulConvertionRate = MPC624_SPEED_13_75_Hz;
-               printk(KERN_INFO "13.75 Hz, ");
                break;
        case 9:
                devpriv->ulConvertionRate = MPC624_SPEED_6_875_Hz;
-               printk(KERN_INFO "6.875 Hz, ");
                break;
        default:
-               printk
-                   (KERN_ERR "illegal conversion rate setting!"
-                       " Valid numbers are 0..9. Using 9 => 6.875 Hz, ");
                devpriv->ulConvertionRate = MPC624_SPEED_3_52_kHz;
        }
 
@@ -361,23 +342,18 @@ static int mpc624_attach(struct comedi_device *dev, struct comedi_devconfig *it)
        switch (it->options[1]) {
        default:
                s->maxdata = 0x3FFFFFFF;
-               printk(KERN_INFO "30 bit, ");
        }
 
        switch (it->options[1]) {
        case 0:
                s->range_table = &range_mpc624_bipolar1;
-               printk(KERN_INFO "1.01V]: ");
                break;
        default:
                s->range_table = &range_mpc624_bipolar10;
-               printk(KERN_INFO "10.1V]: ");
        }
        s->len_chanlist = 1;
        s->insn_read = mpc624_ai_rinsn;
 
-       printk(KERN_INFO "attached\n");
-
        return 1;
 }