From 1a047a8b54a0e7bcb1b294ee341c60f8554a9028 Mon Sep 17 00:00:00 2001 From: Ian Abbott Date: Fri, 14 Sep 2012 17:34:03 +0100 Subject: [PATCH] --- yaml --- r: 325288 b: refs/heads/master c: 0e5789f57a1f6f28018281fdc2f013199c7b0767 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/comedi/drivers/ni_65xx.c | 16 ++++------------ 2 files changed, 5 insertions(+), 13 deletions(-) diff --git a/[refs] b/[refs] index b7678b7aa163..5e8f7ca6873e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 372959d246014478e4cb8d05356777cd2baf2b0a +refs/heads/master: 0e5789f57a1f6f28018281fdc2f013199c7b0767 diff --git a/trunk/drivers/staging/comedi/drivers/ni_65xx.c b/trunk/drivers/staging/comedi/drivers/ni_65xx.c index f4c4233417eb..ca5e07503178 100644 --- a/trunk/drivers/staging/comedi/drivers/ni_65xx.c +++ b/trunk/drivers/staging/comedi/drivers/ni_65xx.c @@ -453,11 +453,9 @@ static int ni_65xx_dio_insn_bits(struct comedi_device *dev, writeb(bits, private(dev)->mite->daq_io_addr + Port_Data(port)); -/* printk("wrote 0x%x to port %i\n", bits, port); */ } port_read_bits = readb(private(dev)->mite->daq_io_addr + Port_Data(port)); -/* printk("read 0x%x from port %i\n", port_read_bits, port); */ if (s->type == COMEDI_SUBD_DO && board(dev)->invert_outputs) { /* Outputs inverted, so invert value read back from * DO subdevice. (Does not apply to boards with DIO @@ -651,8 +649,6 @@ static int ni_65xx_attach(struct comedi_device *dev, unsigned i; int ret; - printk(KERN_INFO "comedi%d: ni_65xx:", dev->minor); - ret = alloc_private(dev, sizeof(struct ni_65xx_private)); if (ret < 0) return ret; @@ -663,15 +659,13 @@ static int ni_65xx_attach(struct comedi_device *dev, ret = mite_setup(private(dev)->mite); if (ret < 0) { - printk(KERN_WARNING "error setting up mite\n"); + dev_warn(dev->class_dev, "error setting up mite\n"); return ret; } dev->board_name = board(dev)->name; dev->irq = mite_irq(private(dev)->mite); - printk(KERN_INFO " %s", dev->board_name); - - printk(KERN_INFO " ID=0x%02x", + dev_info(dev->class_dev, "board: %s, ID=0x%02x", dev->board_name, readb(private(dev)->mite->daq_io_addr + ID_Register)); ret = comedi_alloc_subdevices(dev, 4); @@ -772,11 +766,9 @@ static int ni_65xx_attach(struct comedi_device *dev, "ni_65xx", dev); if (ret < 0) { dev->irq = 0; - printk(KERN_WARNING " irq not available"); + dev_warn(dev->class_dev, "irq not available\n"); } - printk("\n"); - return 0; } @@ -825,7 +817,7 @@ static int ni_65xx_find_device(struct comedi_device *dev, int bus, int slot) } } } - printk(KERN_WARNING "no device found\n"); + dev_warn(dev->class_dev, "no device found\n"); mite_list_devices(); return -EIO; }