diff options
author | Dirk Hohndel <hohndel@infradead.org> | 2009-10-21 04:05:50 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-12-11 15:23:03 -0500 |
commit | 26ac87851aa65f6bc58c2d1aa9162951a1dcd999 (patch) | |
tree | cda8f77264541bc52ccee7eaea51c5b430317f04 /drivers/staging/comedi | |
parent | 13ccea3ff07cabcc48eb5e953eec24141b7be9d6 (diff) |
Staging: comedi: ke_counter: fix style issues
80 char limit (where useful)
braces around single line block
KERN_ facility for printk
Signed-off-by: Dirk Hohndel <hohndel@infradead.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/comedi')
-rw-r--r-- | drivers/staging/comedi/drivers/ke_counter.c | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/drivers/staging/comedi/drivers/ke_counter.c b/drivers/staging/comedi/drivers/ke_counter.c index c145e829108..73b0445e310 100644 --- a/drivers/staging/comedi/drivers/ke_counter.c +++ b/drivers/staging/comedi/drivers/ke_counter.c | |||
@@ -192,12 +192,14 @@ static int cnt_attach(struct comedi_device *dev, struct comedi_devconfig *it) | |||
192 | } | 192 | } |
193 | } | 193 | } |
194 | } | 194 | } |
195 | printk("comedi%d: no supported board found! (req. bus/slot: %d/%d)\n", | 195 | printk(KERN_WARNING |
196 | "comedi%d: no supported board found! (req. bus/slot: %d/%d)\n", | ||
196 | dev->minor, it->options[0], it->options[1]); | 197 | dev->minor, it->options[0], it->options[1]); |
197 | return -EIO; | 198 | return -EIO; |
198 | 199 | ||
199 | found: | 200 | found: |
200 | printk("comedi%d: found %s at PCI bus %d, slot %d\n", dev->minor, | 201 | printk(KERN_INFO |
202 | "comedi%d: found %s at PCI bus %d, slot %d\n", dev->minor, | ||
201 | board->name, pci_device->bus->number, | 203 | board->name, pci_device->bus->number, |
202 | PCI_SLOT(pci_device->devfn)); | 204 | PCI_SLOT(pci_device->devfn)); |
203 | devpriv->pcidev = pci_device; | 205 | devpriv->pcidev = pci_device; |
@@ -206,9 +208,9 @@ found: | |||
206 | /* enable PCI device and request regions */ | 208 | /* enable PCI device and request regions */ |
207 | error = comedi_pci_enable(pci_device, CNT_DRIVER_NAME); | 209 | error = comedi_pci_enable(pci_device, CNT_DRIVER_NAME); |
208 | if (error < 0) { | 210 | if (error < 0) { |
209 | printk | 211 | printk(KERN_WARNING "comedi%d: " |
210 | ("comedi%d: failed to enable PCI device and request regions!\n", | 212 | "failed to enable PCI device and request regions!\n", |
211 | dev->minor); | 213 | dev->minor); |
212 | return error; | 214 | return error; |
213 | } | 215 | } |
214 | 216 | ||
@@ -239,7 +241,8 @@ found: | |||
239 | outb(0, dev->iobase + 0x20); | 241 | outb(0, dev->iobase + 0x20); |
240 | outb(0, dev->iobase + 0x40); | 242 | outb(0, dev->iobase + 0x40); |
241 | 243 | ||
242 | printk("comedi%d: " CNT_DRIVER_NAME " attached.\n", dev->minor); | 244 | printk(KERN_INFO "comedi%d: " CNT_DRIVER_NAME " attached.\n", |
245 | dev->minor); | ||
243 | return 0; | 246 | return 0; |
244 | } | 247 | } |
245 | 248 | ||
@@ -248,11 +251,11 @@ found: | |||
248 | static int cnt_detach(struct comedi_device *dev) | 251 | static int cnt_detach(struct comedi_device *dev) |
249 | { | 252 | { |
250 | if (devpriv && devpriv->pcidev) { | 253 | if (devpriv && devpriv->pcidev) { |
251 | if (dev->iobase) { | 254 | if (dev->iobase) |
252 | comedi_pci_disable(devpriv->pcidev); | 255 | comedi_pci_disable(devpriv->pcidev); |
253 | } | ||
254 | pci_dev_put(devpriv->pcidev); | 256 | pci_dev_put(devpriv->pcidev); |
255 | } | 257 | } |
256 | printk("comedi%d: " CNT_DRIVER_NAME " remove\n", dev->minor); | 258 | printk(KERN_INFO "comedi%d: " CNT_DRIVER_NAME " remove\n", |
259 | dev->minor); | ||
257 | return 0; | 260 | return 0; |
258 | } | 261 | } |