From b38c441762f9c0e902929656d817823acf8538c4 Mon Sep 17 00:00:00 2001 From: Gustavo Silva Date: Wed, 16 Jun 2010 00:36:54 -0500 Subject: [PATCH] --- yaml --- r: 205563 b: refs/heads/master c: 8b83e005d11bce0f9a59d9be337a285e6cc487a6 h: refs/heads/master i: 205561: 314612e9a987126bac1e4f88b68a65c7aa05fb2b 205559: e52d16858e0fdb3c2004d9b343d04785e40448ee v: v3 --- [refs] | 2 +- trunk/drivers/staging/comedi/drivers/pcmda12.c | 12 +++++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 670a3f288d14..942e851a8291 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4c68fb42c2a39b89daca2b7175eb93ffe6860da4 +refs/heads/master: 8b83e005d11bce0f9a59d9be337a285e6cc487a6 diff --git a/trunk/drivers/staging/comedi/drivers/pcmda12.c b/trunk/drivers/staging/comedi/drivers/pcmda12.c index 6d6b86ad817d..0e9ffa28d745 100644 --- a/trunk/drivers/staging/comedi/drivers/pcmda12.c +++ b/trunk/drivers/staging/comedi/drivers/pcmda12.c @@ -157,7 +157,8 @@ static int pcmda12_attach(struct comedi_device *dev, unsigned long iobase; iobase = it->options[0]; - printk("comedi%d: %s: io: %lx %s ", dev->minor, driver.driver_name, + printk(KERN_INFO + "comedi%d: %s: io: %lx %s ", dev->minor, driver.driver_name, iobase, it->options[1] ? "simultaneous xfer mode enabled" : ""); if (!request_region(iobase, IOSIZE, driver.driver_name)) { @@ -177,7 +178,7 @@ static int pcmda12_attach(struct comedi_device *dev, * convenient macro defined in comedidev.h. */ if (alloc_private(dev, sizeof(struct pcmda12_private)) < 0) { - printk("cannot allocate private data structure\n"); + printk(KERN_ERR "cannot allocate private data structure\n"); return -ENOMEM; } @@ -191,7 +192,7 @@ static int pcmda12_attach(struct comedi_device *dev, * 96-channel version of the board. */ if (alloc_subdevices(dev, 1) < 0) { - printk("cannot allocate subdevice data structures\n"); + printk(KERN_ERR "cannot allocate subdevice data structures\n"); return -ENOMEM; } @@ -207,7 +208,7 @@ static int pcmda12_attach(struct comedi_device *dev, zero_chans(dev); /* clear out all the registers, basically */ - printk("attached\n"); + printk(KERN_INFO "attached\n"); return 1; } @@ -222,7 +223,8 @@ static int pcmda12_attach(struct comedi_device *dev, */ static int pcmda12_detach(struct comedi_device *dev) { - printk("comedi%d: %s: remove\n", dev->minor, driver.driver_name); + printk(KERN_INFO + "comedi%d: %s: remove\n", dev->minor, driver.driver_name); if (dev->iobase) release_region(dev->iobase, IOSIZE); return 0;