aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorH Hartley Sweeten <hsweeten@visionengravers.com>2013-11-26 18:42:26 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-12-03 12:20:23 -0500
commit765a24be67e9fe1097f18e0cd7080da1f47c60a4 (patch)
tree28a4b0c1b77ed4dfea4695fd419261173e2883d3
parente2f6df943892654b221a27f0be66c838c2c2bbed (diff)
staging: comedi: pcl812: convert printk messages in pcl812_attach()
Convert the printk messages in this function to dev_{level} mesages. Remove the ones that are just added noise. Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com> Reviewed-by: Ian Abbott <abbotti@mev.co.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/staging/comedi/drivers/pcl812.c27
1 files changed, 8 insertions, 19 deletions
diff --git a/drivers/staging/comedi/drivers/pcl812.c b/drivers/staging/comedi/drivers/pcl812.c
index 804174b573c2..e1e4cd139b63 100644
--- a/drivers/staging/comedi/drivers/pcl812.c
+++ b/drivers/staging/comedi/drivers/pcl812.c
@@ -1115,21 +1115,22 @@ static int pcl812_attach(struct comedi_device *dev, struct comedi_devconfig *it)
1115 if (board->DMAbits != 0) { /* board support DMA */ 1115 if (board->DMAbits != 0) { /* board support DMA */
1116 dma = it->options[2]; 1116 dma = it->options[2];
1117 if (((1 << dma) & board->DMAbits) == 0) { 1117 if (((1 << dma) & board->DMAbits) == 0) {
1118 printk(", DMA is out of allowed range, FAIL!\n"); 1118 dev_err(dev->class_dev,
1119 "DMA is out of allowed range, FAIL!\n");
1119 return -EINVAL; /* Bad DMA */ 1120 return -EINVAL; /* Bad DMA */
1120 } 1121 }
1121 ret = request_dma(dma, dev->board_name); 1122 ret = request_dma(dma, dev->board_name);
1122 if (ret) { 1123 if (ret) {
1123 printk(KERN_ERR ", unable to allocate DMA %u, FAIL!\n", 1124 dev_err(dev->class_dev,
1124 dma); 1125 "unable to allocate DMA %u, FAIL!\n", dma);
1125 return -EBUSY; /* DMA isn't free */ 1126 return -EBUSY; /* DMA isn't free */
1126 } 1127 }
1127 devpriv->dma = dma; 1128 devpriv->dma = dma;
1128 printk(KERN_INFO ", dma=%u", dma);
1129 pages = 1; /* we want 8KB */ 1129 pages = 1; /* we want 8KB */
1130 devpriv->dmabuf[0] = __get_dma_pages(GFP_KERNEL, pages); 1130 devpriv->dmabuf[0] = __get_dma_pages(GFP_KERNEL, pages);
1131 if (!devpriv->dmabuf[0]) { 1131 if (!devpriv->dmabuf[0]) {
1132 printk(", unable to allocate DMA buffer, FAIL!\n"); 1132 dev_err(dev->class_dev,
1133 "unable to allocate DMA buffer, FAIL!\n");
1133 /* 1134 /*
1134 * maybe experiment with try_to_free_pages() 1135 * maybe experiment with try_to_free_pages()
1135 * will help .... 1136 * will help ....
@@ -1141,7 +1142,8 @@ static int pcl812_attach(struct comedi_device *dev, struct comedi_devconfig *it)
1141 devpriv->hwdmasize[0] = PAGE_SIZE * (1 << pages); 1142 devpriv->hwdmasize[0] = PAGE_SIZE * (1 << pages);
1142 devpriv->dmabuf[1] = __get_dma_pages(GFP_KERNEL, pages); 1143 devpriv->dmabuf[1] = __get_dma_pages(GFP_KERNEL, pages);
1143 if (!devpriv->dmabuf[1]) { 1144 if (!devpriv->dmabuf[1]) {
1144 printk(KERN_ERR ", unable to allocate DMA buffer, FAIL!\n"); 1145 dev_err(dev->class_dev,
1146 "unable to allocate DMA buffer, FAIL!\n");
1145 return -EBUSY; 1147 return -EBUSY;
1146 } 1148 }
1147 devpriv->dmapages[1] = pages; 1149 devpriv->dmapages[1] = pages;
@@ -1243,10 +1245,6 @@ no_dma:
1243 default: 1245 default:
1244 s->range_table = &range_bipolar10; 1246 s->range_table = &range_bipolar10;
1245 break; 1247 break;
1246 printk
1247 (", incorrect range number %d, changing "
1248 "to 0 (+/-10V)", it->options[4]);
1249 break;
1250 } 1248 }
1251 break; 1249 break;
1252 break; 1250 break;
@@ -1273,10 +1271,6 @@ no_dma:
1273 default: 1271 default:
1274 s->range_table = &range_iso813_1_ai; 1272 s->range_table = &range_iso813_1_ai;
1275 break; 1273 break;
1276 printk
1277 (", incorrect range number %d, "
1278 "changing to 0 ", it->options[1]);
1279 break;
1280 } 1274 }
1281 break; 1275 break;
1282 case boardACL8113: 1276 case boardACL8113:
@@ -1298,10 +1292,6 @@ no_dma:
1298 default: 1292 default:
1299 s->range_table = &range_acl8113_1_ai; 1293 s->range_table = &range_acl8113_1_ai;
1300 break; 1294 break;
1301 printk
1302 (", incorrect range number %d, "
1303 "changing to 0 ", it->options[1]);
1304 break;
1305 } 1295 }
1306 break; 1296 break;
1307 } 1297 }
@@ -1387,7 +1377,6 @@ no_dma:
1387 break; 1377 break;
1388 } 1378 }
1389 1379
1390 printk(KERN_INFO "\n");
1391 devpriv->valid = 1; 1380 devpriv->valid = 1;
1392 1381
1393 pcl812_reset(dev); 1382 pcl812_reset(dev);