From 1fce3034f63c22392d1d8bc22b5e80b575b00df6 Mon Sep 17 00:00:00 2001 From: H Hartley Sweeten Date: Mon, 25 Jun 2012 17:15:21 -0700 Subject: [PATCH] staging: comedi: cb_das16_cs: consolidate the attach messages Consolidate all the attach messages into one dev_info() output at the end of the successful attach. Signed-off-by: H Hartley Sweeten Cc: Ian Abbott Cc: Frank Mori Hess Signed-off-by: Greg Kroah-Hartman --- drivers/staging/comedi/drivers/cb_das16_cs.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/drivers/staging/comedi/drivers/cb_das16_cs.c b/drivers/staging/comedi/drivers/cb_das16_cs.c index f90c12b449c9..155f742164fd 100644 --- a/drivers/staging/comedi/drivers/cb_das16_cs.c +++ b/drivers/staging/comedi/drivers/cb_das16_cs.c @@ -446,8 +446,6 @@ static int das16cs_attach(struct comedi_device *dev, struct comedi_subdevice *s; int ret; - dev_dbg(dev->class_dev, "cb_das16_cs: attach\n"); - link = cur_dev; /* XXX hack */ if (!link) return -EIO; @@ -460,7 +458,6 @@ static int das16cs_attach(struct comedi_device *dev, dev->board_name = thisboard->name; dev->iobase = link->resource[0]->start; - dev_dbg(dev->class_dev, "I/O base=0x%04lx\n", dev->iobase); ret = request_irq(link->irq, das16cs_interrupt, IRQF_SHARED, "cb_das16_cs", dev); @@ -468,8 +465,6 @@ static int das16cs_attach(struct comedi_device *dev, return ret; dev->irq = link->irq; - dev_dbg(dev->class_dev, "irq=%u\n", dev->irq); - if (alloc_private(dev, sizeof(struct das16cs_private)) < 0) return -ENOMEM; @@ -514,6 +509,10 @@ static int das16cs_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 1; } -- 2.20.1