From 43669f4b2a81678912d07aece9b908d71ae36dc0 Mon Sep 17 00:00:00 2001 From: H Hartley Sweeten Date: Mon, 17 Feb 2014 14:26:44 -0700 Subject: [PATCH] staging: comedi: pcl816: remove 'i8254_osc_base' from boardinfo The 'i8254_osc_base' is the same for all board types. Remove this data from the boardinfo. Signed-off-by: H Hartley Sweeten Reviewed-by: Ian Abbott Signed-off-by: Greg Kroah-Hartman --- drivers/staging/comedi/drivers/pcl816.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/drivers/staging/comedi/drivers/pcl816.c b/drivers/staging/comedi/drivers/pcl816.c index 05cfdc5f3ed..8a10738e013 100644 --- a/drivers/staging/comedi/drivers/pcl816.c +++ b/drivers/staging/comedi/drivers/pcl816.c @@ -106,7 +106,6 @@ struct pcl816_board { int ao_maxdata; int ai_chanlist; int ao_chanlist; - int i8254_osc_base; }; static const struct pcl816_board boardtypes[] = { @@ -126,7 +125,6 @@ static const struct pcl816_board boardtypes[] = { .ao_maxdata = 0xffff, .ai_chanlist = 1024, .ao_chanlist = 1, - .i8254_osc_base = I8254_OSC_BASE_10MHZ, }, { .name = "pcl814b", .n_ranges = 8, @@ -143,7 +141,6 @@ static const struct pcl816_board boardtypes[] = { .ao_maxdata = 0x3fff, .ai_chanlist = 1024, .ao_chanlist = 1, - .i8254_osc_base = I8254_OSC_BASE_10MHZ, }, }; @@ -480,7 +477,7 @@ static int pcl816_ai_cmdtest(struct comedi_device *dev, /* step 4: fix up any arguments */ if (cmd->convert_src == TRIG_TIMER) { tmp = cmd->convert_arg; - i8253_cascade_ns_to_timer(board->i8254_osc_base, + i8253_cascade_ns_to_timer(I8254_OSC_BASE_10MHZ, &divisor1, &divisor2, &cmd->convert_arg, cmd->flags); if (cmd->convert_arg < board->ai_ns_min) @@ -519,7 +516,7 @@ static int pcl816_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s) if (cmd->convert_arg < board->ai_ns_min) cmd->convert_arg = board->ai_ns_min; - i8253_cascade_ns_to_timer(board->i8254_osc_base, + i8253_cascade_ns_to_timer(I8254_OSC_BASE_10MHZ, &divisor1, &divisor2, &cmd->convert_arg, cmd->flags); -- 2.46.0