Commit c93999c2 authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman
Browse files

staging: comedi: drivers: remove final 'attach' messages



These messages are just added noise. Remove them.
Signed-off-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: default avatarIan Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent ce921ae4
......@@ -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;
}
......
......@@ -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;
}
......
......@@ -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;
}
......
......@@ -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;
}
......
......@@ -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;
}
......
......@@ -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;
}
......
......@@ -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;
}
......
......@@ -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);
......
......@@ -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,
......
......@@ -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;
}
......
......@@ -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)
......
......@@ -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)
......
......@@ -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;
}
......
......@@ -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;
}
......
......@@ -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;
}
......
......@@ -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;
}
......
......@@ -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;
}
......
......@@ -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 = {
......
......@@ -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;
}
......
......@@ -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;
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment