OSDN Git Service

staging: comedi: drivers: remove final 'attach' messages
authorH Hartley Sweeten <hsweeten@visionengravers.com>
Mon, 3 Feb 2014 18:26:50 +0000 (11:26 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 7 Feb 2014 18:49:47 +0000 (10:49 -0800)
These messages are just added noise. Remove them.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
33 files changed:
drivers/staging/comedi/drivers/8255_pci.c
drivers/staging/comedi/drivers/adl_pci7x3x.c
drivers/staging/comedi/drivers/adl_pci9111.c
drivers/staging/comedi/drivers/adl_pci9118.c
drivers/staging/comedi/drivers/adv_pci1710.c
drivers/staging/comedi/drivers/adv_pci1723.c
drivers/staging/comedi/drivers/aio_aio12_8.c
drivers/staging/comedi/drivers/amplc_dio200_common.c
drivers/staging/comedi/drivers/amplc_pc236.c
drivers/staging/comedi/drivers/amplc_pc263.c
drivers/staging/comedi/drivers/amplc_pci224.c
drivers/staging/comedi/drivers/amplc_pci230.c
drivers/staging/comedi/drivers/amplc_pci263.c
drivers/staging/comedi/drivers/cb_das16_cs.c
drivers/staging/comedi/drivers/cb_pcidas.c
drivers/staging/comedi/drivers/cb_pcidda.c
drivers/staging/comedi/drivers/cb_pcimdas.c
drivers/staging/comedi/drivers/cb_pcimdda.c
drivers/staging/comedi/drivers/contec_pci_dio.c
drivers/staging/comedi/drivers/daqboard2000.c
drivers/staging/comedi/drivers/dt3000.c
drivers/staging/comedi/drivers/dyna_pci10xx.c
drivers/staging/comedi/drivers/icp_multi.c
drivers/staging/comedi/drivers/ke_counter.c
drivers/staging/comedi/drivers/me_daq.c
drivers/staging/comedi/drivers/ni_660x.c
drivers/staging/comedi/drivers/ni_670x.c
drivers/staging/comedi/drivers/ni_daq_700.c
drivers/staging/comedi/drivers/ni_mio_common.c
drivers/staging/comedi/drivers/rtd520.c
drivers/staging/comedi/drivers/s626.c
drivers/staging/comedi/drivers/skel.c
drivers/staging/comedi/drivers/ssv_dnp.c

index 8a57c3c..47321de 100644 (file)
@@ -235,9 +235,6 @@ static int pci_8255_auto_attach(struct comedi_device *dev,
                        return ret;
        }
 
-       dev_info(dev->class_dev, "%s attached (%d digital i/o channels)\n",
-               dev->board_name, board->n_8255 * 24);
-
        return 0;
 }
 
index 6f622b4..5e3cc77 100644 (file)
@@ -239,9 +239,6 @@ static int adl_pci7x3x_auto_attach(struct comedi_device *dev,
                }
        }
 
-       dev_info(dev->class_dev, "%s attached (%d inputs/%d outputs)\n",
-               dev->board_name, board->di_nchan, board->do_nchan);
-
        return 0;
 }
 
index 363f2e4..0039b1b 100644 (file)
@@ -906,8 +906,6 @@ static int pci9111_auto_attach(struct comedi_device *dev,
        s->range_table  = &range_digital;
        s->insn_bits    = pci9111_do_insn_bits;
 
-       dev_info(dev->class_dev, "%s attached\n", dev->board_name);
-
        return 0;
 }
 
index 4bdd972..ef5afdb 100644 (file)
@@ -1936,28 +1936,6 @@ static struct pci_dev *pci9118_find_pci(struct comedi_device *dev,
        return NULL;
 }
 
-static void pci9118_report_attach(struct comedi_device *dev, unsigned int irq)
-{
-       struct pci_dev *pcidev = comedi_to_pci_dev(dev);
-       struct pci9118_private *devpriv = dev->private;
-       char irqbuf[30];
-       char muxbuf[30];
-
-       if (irq)
-               snprintf(irqbuf, sizeof(irqbuf), "irq %u%s", irq,
-                        (dev->irq ? "" : " UNAVAILABLE"));
-       else
-               snprintf(irqbuf, sizeof(irqbuf), "irq DISABLED");
-       if (devpriv->usemux)
-               snprintf(muxbuf, sizeof(muxbuf), "ext mux %u chans",
-                        devpriv->usemux);
-       else
-               snprintf(muxbuf, sizeof(muxbuf), "no ext mux");
-       dev_info(dev->class_dev, "%s (pci %s, %s, %sbus master, %s) attached\n",
-                dev->board_name, pci_name(pcidev), irqbuf,
-                (devpriv->master ? "" : "no "), muxbuf);
-}
-
 static int pci9118_common_attach(struct comedi_device *dev, int disable_irq,
                                 int master, int ext_mux, int softsshdelay,
                                 int hw_err_mask)
@@ -2113,7 +2091,6 @@ static int pci9118_common_attach(struct comedi_device *dev, int disable_irq,
                break;
        }
 
-       pci9118_report_attach(dev, dev->irq);
        return 0;
 }
 
index 593676c..69a8298 100644 (file)
@@ -1347,9 +1347,6 @@ static int pci1710_auto_attach(struct comedi_device *dev,
                subdev++;
        }
 
-       dev_info(dev->class_dev, "%s attached, irq %sabled\n",
-               dev->board_name, dev->irq ? "en" : "dis");
-
        return 0;
 }
 
index 7239426..07b107d 100644 (file)
@@ -280,8 +280,6 @@ static int pci1723_auto_attach(struct comedi_device *dev,
 
        pci1723_reset(dev);
 
-       dev_info(dev->class_dev, "%s attached\n", dev->board_name);
-
        return 0;
 }
 
index 68c3fb3..e2a9177 100644 (file)
@@ -247,9 +247,6 @@ static int aio_aio12_8_attach(struct comedi_device *dev,
        /* 8254 counter/timer subdevice */
        s->type         = COMEDI_SUBD_UNUSED;
 
-       dev_info(dev->class_dev, "%s: %s attached\n",
-               dev->driver->driver_name, dev->board_name);
-
        return 0;
 }
 
index 9c9559f..818a0d7 100644 (file)
@@ -1208,7 +1208,7 @@ int amplc_dio200_common_attach(struct comedi_device *dev, unsigned int irq,
                                 "warning! irq %u unavailable!\n", irq);
                }
        }
-       dev_info(dev->class_dev, "attached\n");
+
        return 0;
 }
 EXPORT_SYMBOL_GPL(amplc_dio200_common_attach);
index 12eabd6..b21d7b4 100644 (file)
@@ -368,32 +368,6 @@ static irqreturn_t pc236_interrupt(int irq, void *d)
        return IRQ_RETVAL(handled);
 }
 
-static void pc236_report_attach(struct comedi_device *dev, unsigned int irq)
-{
-       const struct pc236_board *thisboard = comedi_board(dev);
-       struct pci_dev *pcidev = comedi_to_pci_dev(dev);
-       char tmpbuf[60];
-       int tmplen;
-
-       if (is_isa_board(thisboard))
-               tmplen = scnprintf(tmpbuf, sizeof(tmpbuf),
-                                  "(base %#lx) ", dev->iobase);
-       else if (is_pci_board(thisboard))
-               tmplen = scnprintf(tmpbuf, sizeof(tmpbuf),
-                                  "(pci %s) ", pci_name(pcidev));
-       else
-               tmplen = 0;
-       if (irq)
-               tmplen += scnprintf(&tmpbuf[tmplen], sizeof(tmpbuf) - tmplen,
-                                   "(irq %u%s) ", irq,
-                                   (dev->irq ? "" : " UNAVAILABLE"));
-       else
-               tmplen += scnprintf(&tmpbuf[tmplen], sizeof(tmpbuf) - tmplen,
-                                   "(no irq) ");
-       dev_info(dev->class_dev, "%s %sattached\n",
-                dev->board_name, tmpbuf);
-}
-
 static int pc236_common_attach(struct comedi_device *dev, unsigned long iobase,
                               unsigned int irq, unsigned long req_irq_flags)
 {
@@ -433,8 +407,8 @@ static int pc236_common_attach(struct comedi_device *dev, unsigned long iobase,
                        s->cancel = pc236_intr_cancel;
                }
        }
-       pc236_report_attach(dev, irq);
-       return 1;
+
+       return 0;
 }
 
 static int pc236_pci_common_attach(struct comedi_device *dev,
index 5b4b5ab..7c10d28 100644 (file)
@@ -94,8 +94,6 @@ static int pc263_attach(struct comedi_device *dev, struct comedi_devconfig *it)
        /* read initial relay state */
        s->state = inb(dev->iobase) | (inb(dev->iobase + 1) << 8);
 
-       dev_info(dev->class_dev, "%s (base %#lx) attached\n", dev->board_name,
-                dev->iobase);
        return 0;
 }
 
index ae4048a..8be36b8 100644 (file)
@@ -1237,20 +1237,6 @@ static struct pci_dev *pci224_find_pci_dev(struct comedi_device *dev,
        return NULL;
 }
 
-static void pci224_report_attach(struct comedi_device *dev, unsigned int irq)
-{
-       struct pci_dev *pcidev = comedi_to_pci_dev(dev);
-       char tmpbuf[30];
-
-       if (irq)
-               snprintf(tmpbuf, sizeof(tmpbuf), "irq %u%s", irq,
-                        (dev->irq ? "" : " UNAVAILABLE"));
-       else
-               snprintf(tmpbuf, sizeof(tmpbuf), "no irq");
-       dev_info(dev->class_dev, "%s (pci %s) (%s) attached\n",
-                dev->board_name, pci_name(pcidev), tmpbuf);
-}
-
 /*
  * Common part of attach and auto_attach.
  */
@@ -1399,8 +1385,7 @@ static int pci224_attach_common(struct comedi_device *dev,
                }
        }
 
-       pci224_report_attach(dev, irq);
-       return 1;
+       return 0;
 }
 
 static int pci224_attach(struct comedi_device *dev, struct comedi_devconfig *it)
index 8b8b2ac..7356fee 100644 (file)
@@ -2768,8 +2768,8 @@ static int pci230_attach_common(struct comedi_device *dev,
        } else {
                s->type = COMEDI_SUBD_UNUSED;
        }
-       dev_info(dev->class_dev, "attached\n");
-       return 1;
+
+       return 0;
 }
 
 static int pci230_attach(struct comedi_device *dev, struct comedi_devconfig *it)
index be28e6c..93ed03e 100644 (file)
@@ -84,8 +84,6 @@ static int pci263_auto_attach(struct comedi_device *dev,
        /* read initial relay state */
        s->state = inb(dev->iobase) | (inb(dev->iobase + 1) << 8);
 
-       dev_info(dev->class_dev, "%s (pci %s) attached\n", dev->board_name,
-                pci_name(pci_dev));
        return 0;
 }
 
index 64d5f29..9a14e26 100644 (file)
@@ -451,10 +451,6 @@ static int das16cs_auto_attach(struct comedi_device *dev,
        s->insn_bits    = das16cs_dio_insn_bits;
        s->insn_config  = das16cs_dio_insn_config;
 
-       dev_info(dev->class_dev, "%s: %s, I/O base=0x%04lx, irq=%u\n",
-               dev->driver->driver_name, dev->board_name,
-               dev->iobase, dev->irq);
-
        return 0;
 }
 
index 9819be0..69fbda7 100644 (file)
@@ -1576,9 +1576,6 @@ static int cb_pcidas_auto_attach(struct comedi_device *dev,
        outl(devpriv->s5933_intcsr_bits | INTCSR_INBOX_INTR_STATUS,
             devpriv->s5933_config + AMCC_OP_REG_INTCSR);
 
-       dev_info(dev->class_dev, "%s: %s attached\n",
-               dev->driver->driver_name, dev->board_name);
-
        return 0;
 }
 
index 8cca051..901dc5d 100644 (file)
@@ -388,8 +388,6 @@ static int cb_pcidda_auto_attach(struct comedi_device *dev,
        for (i = 0; i < thisboard->ao_chans; i++)
                cb_pcidda_calibrate(dev, i, devpriv->ao_range[i]);
 
-       dev_info(dev->class_dev, "%s attached\n", dev->board_name);
-
        return 0;
 }
 
index 8bf344c..3e39cb5 100644 (file)
@@ -251,8 +251,6 @@ static int cb_pcimdas_auto_attach(struct comedi_device *dev,
        if (ret)
                return ret;
 
-       dev_info(dev->class_dev, "%s attached\n", dev->board_name);
-
        return 0;
 }
 
index 43a8663..4a2b200 100644 (file)
@@ -187,9 +187,7 @@ static int cb_pcimdda_auto_attach(struct comedi_device *dev,
        if (ret)
                return ret;
 
-       dev_info(dev->class_dev, "%s attached\n", dev->board_name);
-
-       return 1;
+       return 0;
 }
 
 static struct comedi_driver cb_pcimdda_driver = {
index 323a7f3..0a9c32e 100644 (file)
@@ -92,8 +92,6 @@ static int contec_auto_attach(struct comedi_device *dev,
        s->range_table  = &range_digital;
        s->insn_bits    = contec_do_insn_bits;
 
-       dev_info(dev->class_dev, "%s attached\n", dev->board_name);
-
        return 0;
 }
 
index ce153fc..6ff7d3e 100644 (file)
@@ -737,9 +737,6 @@ static int daqboard2000_auto_attach(struct comedi_device *dev,
        if (result)
                return result;
 
-       dev_info(dev->class_dev, "%s: %s attached\n",
-               dev->driver->driver_name, dev->board_name);
-
        return 0;
 }
 
index f52a447..f54685e 100644 (file)
@@ -767,8 +767,6 @@ static int dt3000_auto_attach(struct comedi_device *dev,
        s->type = COMEDI_SUBD_PROC;
 #endif
 
-       dev_info(dev->class_dev, "%s attached\n", dev->board_name);
-
        return 0;
 }
 
index f224825..6915732 100644 (file)
@@ -232,8 +232,6 @@ static int dyna_pci10xx_auto_attach(struct comedi_device *dev,
        s->state = 0;
        s->insn_bits = dyna_pci10xx_do_insn_bits;
 
-       dev_info(dev->class_dev, "%s attached\n", dev->board_name);
-
        return 0;
 }
 
index 80539b2..19c586b 100644 (file)
@@ -565,9 +565,6 @@ static int icp_multi_auto_attach(struct comedi_device *dev,
 
        devpriv->valid = 1;
 
-       dev_info(dev->class_dev, "%s attached, irq %sabled\n",
-               dev->board_name, dev->irq ? "en" : "dis");
-
        return 0;
 }
 
index 6b9846f..1c32816 100644 (file)
@@ -119,9 +119,6 @@ static int cnt_auto_attach(struct comedi_device *dev,
        outb(0, dev->iobase + 0x20);
        outb(0, dev->iobase + 0x40);
 
-       dev_info(dev->class_dev, "%s: %s attached\n",
-               dev->driver->driver_name, dev->board_name);
-
        return 0;
 }
 
index 7f66878..288ce2b 100644 (file)
@@ -542,9 +542,6 @@ static int me_auto_attach(struct comedi_device *dev,
        s->insn_bits    = me_dio_insn_bits;
        s->insn_config  = me_dio_insn_config;
 
-       dev_info(dev->class_dev, "%s: %s attached\n",
-               dev->driver->driver_name, dev->board_name);
-
        return 0;
 }
 
index df42e39..b8c3fbe 100644 (file)
@@ -1187,7 +1187,7 @@ static int ni_660x_auto_attach(struct comedi_device *dev,
                global_interrupt_config_bits |= Cascade_Int_Enable_Bit;
        ni_660x_write_register(dev, 0, global_interrupt_config_bits,
                               NI660X_GLOBAL_INT_CFG);
-       dev_info(dev->class_dev, "ni_660x: %s attached\n", dev->board_name);
+
        return 0;
 }
 
index 8550fdc..1002cea 100644 (file)
@@ -246,9 +246,6 @@ static int ni_670x_auto_attach(struct comedi_device *dev,
        /* Config of ao registers */
        writel(0x00, devpriv->mite->daq_io_addr + AO_CONTROL_OFFSET);
 
-       dev_info(dev->class_dev, "%s: %s attached\n",
-               dev->driver->driver_name, dev->board_name);
-
        return 0;
 }
 
index e4cdca3..7979a66 100644 (file)
@@ -229,11 +229,6 @@ static int daq700_auto_attach(struct comedi_device *dev,
        s->insn_read = daq700_ai_rinsn;
        daq700_ai_config(dev, s);
 
-       dev_info(dev->class_dev, "%s: %s, io 0x%lx\n",
-               dev->driver->driver_name,
-               dev->board_name,
-               dev->iobase);
-
        return 0;
 }
 
index 5750115..8adb535 100644 (file)
@@ -4497,7 +4497,6 @@ static int ni_E_init(struct comedi_device *dev)
                ni_writeb(0x0, M_Offset_AO_Calibration);
        }
 
-       printk("\n");
        return 0;
 }
 
index 0f026af..0e83e7e 100644 (file)
@@ -1382,8 +1382,6 @@ static int rtd_auto_attach(struct comedi_device *dev,
        if (dev->irq)
                writel(ICS_PIE | ICS_PLIE, devpriv->lcfg + PLX_INTRCS_REG);
 
-       dev_info(dev->class_dev, "%s attached\n", dev->board_name);
-
        return 0;
 }
 
index 19da1db..9e711ee 100644 (file)
@@ -2902,8 +2902,6 @@ static int s626_auto_attach(struct comedi_device *dev,
 
        s626_initialize(dev);
 
-       dev_info(dev->class_dev, "%s attached\n", dev->board_name);
-
        return 0;
 }
 
index 77e2059..e800e73 100644 (file)
@@ -456,8 +456,6 @@ static int skel_common_attach(struct comedi_device *dev)
                s->type = COMEDI_SUBD_UNUSED;
        }
 
-       dev_info(dev->class_dev, "skel: attached\n");
-
        return 0;
 }
 
index df22a78..848c308 100644 (file)
@@ -161,8 +161,7 @@ static int dnp_attach(struct comedi_device *dev, struct comedi_devconfig *it)
        outb(PCMR, CSCIR);
        outb((inb(CSCDR) & 0xAA), CSCDR);
 
-       dev_info(dev->class_dev, "%s: attached\n", dev->board_name);
-       return 1;
+       return 0;
 }
 
 static void dnp_detach(struct comedi_device *dev)