Commit a1d16659 authored by Ian Abbott's avatar Ian Abbott Committed by Greg Kroah-Hartman

staging: comedi: jr3_pci: remove noisy printk

This driver seems to generate a lot of printk output every time the
driver polls the device.  This may have been useful during development
but shouldn't be used in production.  Just get rid of it all.
Signed-off-by: default avatarIan Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent ed610aa0
...@@ -192,10 +192,6 @@ struct six_axis_t { ...@@ -192,10 +192,6 @@ struct six_axis_t {
static void set_full_scales(struct jr3_channel __iomem *channel, static void set_full_scales(struct jr3_channel __iomem *channel,
struct six_axis_t full_scale) struct six_axis_t full_scale)
{ {
printk("%d %d %d %d %d %d\n",
full_scale.fx,
full_scale.fy,
full_scale.fz, full_scale.mx, full_scale.my, full_scale.mz);
set_s16(&channel->full_scale.fx, full_scale.fx); set_s16(&channel->full_scale.fx, full_scale.fx);
set_s16(&channel->full_scale.fy, full_scale.fy); set_s16(&channel->full_scale.fy, full_scale.fy);
set_s16(&channel->full_scale.fz, full_scale.fz); set_s16(&channel->full_scale.fz, full_scale.fz);
...@@ -491,7 +487,6 @@ static struct poll_delay_t jr3_pci_poll_subdevice(struct comedi_subdevice *s) ...@@ -491,7 +487,6 @@ static struct poll_delay_t jr3_pci_poll_subdevice(struct comedi_subdevice *s)
int errors = get_u16(&channel->errors); int errors = get_u16(&channel->errors);
if (errors != p->errors) { if (errors != p->errors) {
printk("Errors: %x -> %x\n", p->errors, errors);
p->errors = errors; p->errors = errors;
} }
if (errors & (watch_dog | watch_dog2 | sensor_change)) { if (errors & (watch_dog | watch_dog2 | sensor_change)) {
...@@ -531,14 +526,6 @@ static struct poll_delay_t jr3_pci_poll_subdevice(struct comedi_subdevice *s) ...@@ -531,14 +526,6 @@ static struct poll_delay_t jr3_pci_poll_subdevice(struct comedi_subdevice *s)
p->serial_no = p->serial_no =
get_u16(&channel->serial_no); get_u16(&channel->serial_no);
printk
("Setting transform for channel %d\n",
p->channel_no);
printk("Sensor Model = %i\n",
p->model_no);
printk("Sensor Serial = %i\n",
p->serial_no);
/* Transformation all zeros */ /* Transformation all zeros */
for (i = 0; i < ARRAY_SIZE(transf.link); i++) { for (i = 0; i < ARRAY_SIZE(transf.link); i++) {
transf.link[i].link_type = transf.link[i].link_type =
...@@ -555,9 +542,6 @@ static struct poll_delay_t jr3_pci_poll_subdevice(struct comedi_subdevice *s) ...@@ -555,9 +542,6 @@ static struct poll_delay_t jr3_pci_poll_subdevice(struct comedi_subdevice *s)
} break; } break;
case state_jr3_init_transform_complete:{ case state_jr3_init_transform_complete:{
if (!is_complete(channel)) { if (!is_complete(channel)) {
printk
("state_jr3_init_transform_complete complete = %d\n",
is_complete(channel));
result = poll_delay_min_max(20, 100); result = poll_delay_min_max(20, 100);
} else { } else {
/* Set full scale */ /* Set full scale */
...@@ -566,26 +550,8 @@ static struct poll_delay_t jr3_pci_poll_subdevice(struct comedi_subdevice *s) ...@@ -566,26 +550,8 @@ static struct poll_delay_t jr3_pci_poll_subdevice(struct comedi_subdevice *s)
min_full_scale = min_full_scale =
get_min_full_scales(channel); get_min_full_scales(channel);
printk("Obtained Min. Full Scales:\n");
printk(KERN_DEBUG "%i ", (min_full_scale).fx);
printk(KERN_CONT "%i ", (min_full_scale).fy);
printk(KERN_CONT "%i ", (min_full_scale).fz);
printk(KERN_CONT "%i ", (min_full_scale).mx);
printk(KERN_CONT "%i ", (min_full_scale).my);
printk(KERN_CONT "%i ", (min_full_scale).mz);
printk(KERN_CONT "\n");
max_full_scale = max_full_scale =
get_max_full_scales(channel); get_max_full_scales(channel);
printk("Obtained Max. Full Scales:\n");
printk(KERN_DEBUG "%i ", (max_full_scale).fx);
printk(KERN_CONT "%i ", (max_full_scale).fy);
printk(KERN_CONT "%i ", (max_full_scale).fz);
printk(KERN_CONT "%i ", (max_full_scale).mx);
printk(KERN_CONT "%i ", (max_full_scale).my);
printk(KERN_CONT "%i ", (max_full_scale).mz);
printk(KERN_CONT "\n");
set_full_scales(channel, set_full_scales(channel,
max_full_scale); max_full_scale);
...@@ -597,9 +563,6 @@ static struct poll_delay_t jr3_pci_poll_subdevice(struct comedi_subdevice *s) ...@@ -597,9 +563,6 @@ static struct poll_delay_t jr3_pci_poll_subdevice(struct comedi_subdevice *s)
break; break;
case state_jr3_init_set_full_scale_complete:{ case state_jr3_init_set_full_scale_complete:{
if (!is_complete(channel)) { if (!is_complete(channel)) {
printk
("state_jr3_init_set_full_scale_complete complete = %d\n",
is_complete(channel));
result = poll_delay_min_max(20, 100); result = poll_delay_min_max(20, 100);
} else { } else {
struct force_array __iomem *full_scale; struct force_array __iomem *full_scale;
...@@ -637,20 +600,6 @@ static struct poll_delay_t jr3_pci_poll_subdevice(struct comedi_subdevice *s) ...@@ -637,20 +600,6 @@ static struct poll_delay_t jr3_pci_poll_subdevice(struct comedi_subdevice *s)
p->range[8].range.min = 0; p->range[8].range.min = 0;
p->range[8].range.max = 65535; p->range[8].range.max = 65535;
{
int i;
for (i = 0; i < 9; i++) {
printk("%d %d - %d\n",
i,
p->
range[i].range.
min,
p->
range[i].range.
max);
}
}
use_offset(channel, 0); use_offset(channel, 0);
p->state = p->state =
state_jr3_init_use_offset_complete; state_jr3_init_use_offset_complete;
...@@ -660,20 +609,8 @@ static struct poll_delay_t jr3_pci_poll_subdevice(struct comedi_subdevice *s) ...@@ -660,20 +609,8 @@ static struct poll_delay_t jr3_pci_poll_subdevice(struct comedi_subdevice *s)
break; break;
case state_jr3_init_use_offset_complete:{ case state_jr3_init_use_offset_complete:{
if (!is_complete(channel)) { if (!is_complete(channel)) {
printk
("state_jr3_init_use_offset_complete complete = %d\n",
is_complete(channel));
result = poll_delay_min_max(20, 100); result = poll_delay_min_max(20, 100);
} else { } else {
printk
("Default offsets %d %d %d %d %d %d\n",
get_s16(&channel->offsets.fx),
get_s16(&channel->offsets.fy),
get_s16(&channel->offsets.fz),
get_s16(&channel->offsets.mx),
get_s16(&channel->offsets.my),
get_s16(&channel->offsets.mz));
set_s16(&channel->offsets.fx, 0); set_s16(&channel->offsets.fx, 0);
set_s16(&channel->offsets.fy, 0); set_s16(&channel->offsets.fy, 0);
set_s16(&channel->offsets.fz, 0); set_s16(&channel->offsets.fz, 0);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment