evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

staging: comedi: ni_mio_common: consolidate call to ni_mseries_get_pll_parameters()

Browse source 
All cases of the switch call ni_mseries_get_pll_parameters() with the same
parameters. Move the call out of the switch.

Also, move the printk from ni_mseries_get_pll_parameters() so that it can
be converted into a dev_err().

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
H Hartley Sweeten 2014-07-18 13:29:53 -07:00 • committed by Greg Kroah-Hartman
parent 89c4695efd
commit 07e6b2e2a8
1 changed files with 12 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
drivers/staging/comedi/drivers/ni_mio_common.c
View file

@ -4902,10 +4902,9 @@ static int ni_mseries_get_pll_parameters(unsigned reference_period_ns,
} }
} }
} }
if (best_period_picosec == 0) { if (best_period_picosec == 0)
printk("%s: bug, failed to find pll parameters\n", __func__);
return -EIO; return -EIO;
}
*freq_divider = best_div; *freq_divider = best_div;
*freq_multiplier = best_mult; *freq_multiplier = best_mult;
*actual_period_ns = *actual_period_ns =
@ -4948,21 +4947,11 @@ static int ni_mseries_set_pll_master_clock(struct comedi_device *dev,
case NI_MIO_PLL_PXI_STAR_TRIGGER_CLOCK: case NI_MIO_PLL_PXI_STAR_TRIGGER_CLOCK:
devpriv->clock_and_fout2 |= devpriv->clock_and_fout2 |=
MSeries_PLL_In_Source_Select_Star_Trigger_Bits; MSeries_PLL_In_Source_Select_Star_Trigger_Bits;
retval = ni_mseries_get_pll_parameters(period_ns, &freq_divider,
&freq_multiplier,
&devpriv->clock_ns);
if (retval < 0)
return retval;
break; break;
case NI_MIO_PLL_PXI10_CLOCK: case NI_MIO_PLL_PXI10_CLOCK:
/* pxi clock is 10MHz */ /* pxi clock is 10MHz */
devpriv->clock_and_fout2 |= devpriv->clock_and_fout2 |=
MSeries_PLL_In_Source_Select_PXI_Clock10; MSeries_PLL_In_Source_Select_PXI_Clock10;
retval = ni_mseries_get_pll_parameters(period_ns, &freq_divider,
&freq_multiplier,
&devpriv->clock_ns);
if (retval < 0)
return retval;
break; break;
default: default:
{ {
@ -4981,16 +4970,19 @@ static int ni_mseries_set_pll_master_clock(struct comedi_device *dev,
} }
if (rtsi_channel > max_rtsi_channel) if (rtsi_channel > max_rtsi_channel)
return -EINVAL; return -EINVAL;
retval = ni_mseries_get_pll_parameters(period_ns,
&freq_divider,
&freq_multiplier,
&devpriv->
clock_ns);
if (retval < 0)
return retval;
} }
break; break;
} }
retval = ni_mseries_get_pll_parameters(period_ns,
&freq_divider,
&freq_multiplier,
&devpriv->clock_ns);
if (retval < 0) {
dev_err(dev->class_dev,
"%s: bug, failed to find pll parameters\n", __func__);
return retval;
}
ni_writew(dev, devpriv->clock_and_fout2, M_Offset_Clock_and_Fout2); ni_writew(dev, devpriv->clock_and_fout2, M_Offset_Clock_and_Fout2);
pll_control_bits |= pll_control_bits |=
MSeries_PLL_Divisor_Bits(freq_divider) | MSeries_PLL_Divisor_Bits(freq_divider) |