aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging/comedi
diff options
context:
space:
mode:
authorBruce Jones <brucej97223@gmail.com>2009-09-29 13:43:29 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2009-12-11 15:21:50 -0500
commit1ab1774f12c4157e47e063e9c73fd8a6520afa6d (patch)
tree44394f7e513a28908c3eb940cc1a106fb9f2b5d7 /drivers/staging/comedi
parent0dfd69bfdbf9de7021e81443c0c195f7da208a7d (diff)
Staging: comedi: adl_pci7296: CodingStyle cleanup
Fix up printk's and other simple coding style issues. Signed-off-by: Bruce Jones <brucej@linux.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/comedi')
-rw-r--r--drivers/staging/comedi/drivers/adl_pci7296.c19
1 files changed, 9 insertions, 10 deletions
diff --git a/drivers/staging/comedi/drivers/adl_pci7296.c b/drivers/staging/comedi/drivers/adl_pci7296.c
index 4de6fadec78..8602865ae6b 100644
--- a/drivers/staging/comedi/drivers/adl_pci7296.c
+++ b/drivers/staging/comedi/drivers/adl_pci7296.c
@@ -82,8 +82,7 @@ static int adl_pci7296_attach(struct comedi_device *dev,
82 int bus, slot; 82 int bus, slot;
83 int ret; 83 int ret;
84 84
85 printk("comedi: attempt to attach...\n"); 85 printk(KERN_INFO "comedi%d: attach adl_pci7432\n", dev->minor);
86 printk("comedi%d: adl_pci7432\n", dev->minor);
87 86
88 dev->board_name = "pci7432"; 87 dev->board_name = "pci7432";
89 bus = it->options[0]; 88 bus = it->options[0];
@@ -110,14 +109,14 @@ static int adl_pci7296_attach(struct comedi_device *dev,
110 } 109 }
111 devpriv->pci_dev = pcidev; 110 devpriv->pci_dev = pcidev;
112 if (comedi_pci_enable(pcidev, "adl_pci7296") < 0) { 111 if (comedi_pci_enable(pcidev, "adl_pci7296") < 0) {
113 printk 112 printk(KERN_ERR "comedi%d: Failed to enable PCI device and request regions\n",
114 ("comedi%d: Failed to enable PCI device and request regions\n",
115 dev->minor); 113 dev->minor);
116 return -EIO; 114 return -EIO;
117 } 115 }
118 116
119 dev->iobase = pci_resource_start(pcidev, 2); 117 dev->iobase = pci_resource_start(pcidev, 2);
120 printk("comedi: base addr %4lx\n", dev->iobase); 118 printk(KERN_INFO "comedi: base addr %4lx\n",
119 dev->iobase);
121 120
122 /* four 8255 digital io subdevices */ 121 /* four 8255 digital io subdevices */
123 s = dev->subdevices + 0; 122 s = dev->subdevices + 0;
@@ -145,25 +144,25 @@ static int adl_pci7296_attach(struct comedi_device *dev,
145 if (ret < 0) 144 if (ret < 0)
146 return ret; 145 return ret;
147 146
148 printk("attached\n"); 147 printk(KERN_DEBUG "comedi%d: adl_pci7432 attached\n",
148 dev->minor);
149 149
150 return 1; 150 return 1;
151 } 151 }
152 } 152 }
153 153
154 printk("comedi%d: no supported board found! (req. bus/slot : %d/%d)\n", 154 printk(KERN_ERR "comedi%d: no supported board found! (req. bus/slot : %d/%d)\n",
155 dev->minor, bus, slot); 155 dev->minor, bus, slot);
156 return -EIO; 156 return -EIO;
157} 157}
158 158
159static int adl_pci7296_detach(struct comedi_device *dev) 159static int adl_pci7296_detach(struct comedi_device *dev)
160{ 160{
161 printk("comedi%d: pci7432: remove\n", dev->minor); 161 printk(KERN_INFO "comedi%d: pci7432: remove\n", dev->minor);
162 162
163 if (devpriv && devpriv->pci_dev) { 163 if (devpriv && devpriv->pci_dev) {
164 if (dev->iobase) { 164 if (dev->iobase)
165 comedi_pci_disable(devpriv->pci_dev); 165 comedi_pci_disable(devpriv->pci_dev);
166 }
167 pci_dev_put(devpriv->pci_dev); 166 pci_dev_put(devpriv->pci_dev);
168 } 167 }
169 /* detach four 8255 digital io subdevices */ 168 /* detach four 8255 digital io subdevices */