diff options
| author | Chase Southwood <chase.southwood@gmail.com> | 2014-11-30 23:05:56 -0600 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-12-02 16:54:43 -0800 |
| commit | 6c410db7c4305da28107f8b2b650ffe7d010aed1 (patch) | |
| tree | b83b62a19c184cd468dc3d4cc333190b44dde432 | |
| parent | 5b53672bbc410e20cda96d045a3372d6212fc3bc (diff) | |
| download | linux-stable-6c410db7c4305da28107f8b2b650ffe7d010aed1.tar.gz linux-stable-6c410db7c4305da28107f8b2b650ffe7d010aed1.tar.bz2 linux-stable-6c410db7c4305da28107f8b2b650ffe7d010aed1.zip | |
staging: comedi: change some printk calls to pr_err
There are a handful of calls to printk in ni_stc.h without specified log
levels, as well as one in ni_mio_common.c. This patch converts these
calls to pr_err() instead, so that they are now explicitly log level
ERR.
Signed-off-by: Chase Southwood <chase.southwood@gmail.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/ni_mio_common.c | 2 | ||||
| -rw-r--r-- | drivers/staging/comedi/drivers/ni_stc.h | 14 |
2 files changed, 8 insertions, 8 deletions
diff --git a/drivers/staging/comedi/drivers/ni_mio_common.c b/drivers/staging/comedi/drivers/ni_mio_common.c index 353c17bb4325..11e70173712d 100644 --- a/drivers/staging/comedi/drivers/ni_mio_common.c +++ b/drivers/staging/comedi/drivers/ni_mio_common.c @@ -3945,7 +3945,7 @@ static unsigned ni_gpct_to_stc_register(enum ni_gpct_register reg) stc_register = Interrupt_B_Enable_Register; break; default: - printk("%s: unhandled register 0x%x in switch.\n", + pr_err("%s: unhandled register 0x%x in switch.\n", __func__, reg); BUG(); return 0; diff --git a/drivers/staging/comedi/drivers/ni_stc.h b/drivers/staging/comedi/drivers/ni_stc.h index 131e9049f21b..bd69c3f0acdc 100644 --- a/drivers/staging/comedi/drivers/ni_stc.h +++ b/drivers/staging/comedi/drivers/ni_stc.h @@ -334,7 +334,7 @@ static inline unsigned RTSI_Output_Bit(unsigned channel, int is_mseries) max_channel = 6; } if (channel > max_channel) { - printk("%s: bug, invalid RTSI_channel=%i\n", __func__, channel); + pr_err("%s: bug, invalid RTSI_channel=%i\n", __func__, channel); return 0; } return 1 << (base_bit_shift + channel); @@ -1090,7 +1090,7 @@ static inline int M_Offset_Static_AI_Control(int i) 0x263, }; if (((unsigned)i) >= ARRAY_SIZE(offset)) { - printk("%s: invalid channel=%i\n", __func__, i); + pr_err("%s: invalid channel=%i\n", __func__, i); return offset[0]; } return offset[i]; @@ -1105,7 +1105,7 @@ static inline int M_Offset_AO_Reference_Attenuation(int channel) 0x267 }; if (((unsigned)channel) >= ARRAY_SIZE(offset)) { - printk("%s: invalid channel=%i\n", __func__, channel); + pr_err("%s: invalid channel=%i\n", __func__, channel); return offset[0]; } return offset[channel]; @@ -1114,7 +1114,7 @@ static inline int M_Offset_AO_Reference_Attenuation(int channel) static inline unsigned M_Offset_PFI_Output_Select(unsigned n) { if (n < 1 || n > NUM_PFI_OUTPUT_SELECT_REGS) { - printk("%s: invalid pfi output select register=%i\n", + pr_err("%s: invalid pfi output select register=%i\n", __func__, n); return M_Offset_PFI_Output_Select_1; } @@ -1171,7 +1171,7 @@ static inline unsigned MSeries_PLL_In_Source_Select_RTSI_Bits(unsigned RTSI_channel) { if (RTSI_channel > 7) { - printk("%s: bug, invalid RTSI_channel=%i\n", __func__, + pr_err("%s: bug, invalid RTSI_channel=%i\n", __func__, RTSI_channel); return 0; } @@ -1192,7 +1192,7 @@ static inline unsigned MSeries_PLL_Divisor_Bits(unsigned divisor) { static const unsigned max_divisor = 0x10; if (divisor < 1 || divisor > max_divisor) { - printk("%s: bug, invalid divisor=%i\n", __func__, divisor); + pr_err("%s: bug, invalid divisor=%i\n", __func__, divisor); return 0; } return (divisor & 0xf) << 8; @@ -1202,7 +1202,7 @@ static inline unsigned MSeries_PLL_Multiplier_Bits(unsigned multiplier) { static const unsigned max_multiplier = 0x100; if (multiplier < 1 || multiplier > max_multiplier) { - printk("%s: bug, invalid multiplier=%i\n", __func__, + pr_err("%s: bug, invalid multiplier=%i\n", __func__, multiplier); return 0; } |