Staging: comedi: replace __FUNCTION__ usages

__FUNCTION__ is gcc-specific, use __func__

Signed-off-by: Alessio Igor Bogani <abogani@texware.it>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/staging/comedi/drivers/ni_660x.c b/drivers/staging/comedi/drivers/ni_660x.c
index 43aab610f32657db5f5b7dcb7a60ff806558183b..6b0fe5c4022ed6ac736e3333ac956de3133f003e 100644 (file)
--- a/drivers/staging/comedi/drivers/ni_660x.c
+++ b/drivers/staging/comedi/drivers/ni_660x.c
@@ -696,7 +696,7 @@ static enum NI_660x_Register ni_gpct_to_660x_register(enum ni_gpct_register reg)
                break;
        default:
                rt_printk("%s: unhandled register 0x%x in switch.\n",
-                       __FUNCTION__, reg);
+                       __func__, reg);
                BUG();
                return 0;
                break;
@@ -720,7 +720,7 @@ static inline void ni_660x_write_register(struct comedi_device * dev,
                break;
        default:
                rt_printk("%s: %s: bug! unhandled case (reg=0x%x) in switch.\n",
-                       __FILE__, __FUNCTION__, reg);
+                       __FILE__, __func__, reg);
                BUG();
                break;
        }
@@ -742,7 +742,7 @@ static inline unsigned ni_660x_read_register(struct comedi_device * dev,
                break;
        default:
                rt_printk("%s: %s: bug! unhandled case (reg=0x%x) in switch.\n",
-                       __FILE__, __FUNCTION__, reg);
+                       __FILE__, __func__, reg);
                BUG();
                break;
        }

diff --git a/drivers/staging/comedi/drivers/ni_mio_common.c b/drivers/staging/comedi/drivers/ni_mio_common.c
index dfc2f86c5a255f9103714f887d813cd10f04522f..838487868c6279230a3aba716957a31ed0b30a07 100644 (file)
--- a/drivers/staging/comedi/drivers/ni_mio_common.c
+++ b/drivers/staging/comedi/drivers/ni_mio_common.c
@@ -397,7 +397,7 @@ static inline void ni_set_bitfield(struct comedi_device * dev, int reg,
                break;
        default:
                rt_printk("Warning %s() called with invalid register\n",
-                       __FUNCTION__);
+                       __func__);
                rt_printk("reg is %d\n", reg);
                break;
        }
@@ -2845,7 +2845,7 @@ static int ni_m_series_ao_config_chanlist(struct comedi_device * dev,
                        break;
                default:
                        rt_printk("%s: bug! unhandled ao reference voltage\n",
-                               __FUNCTION__);
+                               __func__);
                        break;
                }
                switch (krange->max + krange->min) {
@@ -2857,7 +2857,7 @@ static int ni_m_series_ao_config_chanlist(struct comedi_device * dev,
                        break;
                default:
                        rt_printk("%s: bug! unhandled ao offset voltage\n",
-                               __FUNCTION__);
+                               __func__);
                        break;
                }
                if (timed)
@@ -4104,7 +4104,7 @@ static unsigned ni_gpct_to_stc_register(enum ni_gpct_register reg)
                break;
        default:
                rt_printk("%s: unhandled register 0x%x in switch.\n",
-                       __FUNCTION__, reg);
+                       __func__, reg);
                BUG();
                return 0;
                break;
@@ -5229,7 +5229,7 @@ static unsigned ni_old_get_pfi_routing(struct comedi_device * dev, unsigned chan
                return NI_PFI_OUTPUT_G_GATE0;
                break;
        default:
-               rt_printk("%s: bug, unhandled case in switch.\n", __FUNCTION__);
+               rt_printk("%s: bug, unhandled case in switch.\n", __func__);
                break;
        }
        return 0;
@@ -5396,7 +5396,7 @@ static int ni_mseries_get_pll_parameters(unsigned reference_period_ns,
        }
        if (best_period_picosec == 0) {
                rt_printk("%s: bug, failed to find pll parameters\n",
-                       __FUNCTION__);
+                       __func__);
                return -EIO;
        }
        *freq_divider = best_div;
@@ -5432,7 +5432,7 @@ static int ni_mseries_set_pll_master_clock(struct comedi_device * dev, unsigned
        if (period_ns < min_period_ns || period_ns > max_period_ns) {
                rt_printk
                        ("%s: you must specify an input clock frequency between %i and %i nanosec "
-                       "for the phased-lock loop.\n", __FUNCTION__,
+                       "for the phased-lock loop.\n", __func__,
                        min_period_ns, max_period_ns);
                return -EINVAL;
        }
@@ -5506,7 +5506,7 @@ static int ni_mseries_set_pll_master_clock(struct comedi_device * dev, unsigned
        if (i == timeout) {
                rt_printk
                        ("%s: timed out waiting for PLL to lock to reference clock source %i with period %i ns.\n",
-                       __FUNCTION__, source, period_ns);
+                       __func__, source, period_ns);
                return -ETIMEDOUT;
        }
        return 3;
@@ -5543,7 +5543,7 @@ static int ni_set_master_clock(struct comedi_device * dev, unsigned source,
                                if (period_ns == 0) {
                                        rt_printk
                                                ("%s: we don't handle an unspecified clock period correctly yet, returning error.\n",
-                                               __FUNCTION__);
+                                               __func__);
                                        return -EINVAL;
                                } else {
                                        devpriv->clock_ns = period_ns;
@@ -5566,7 +5566,7 @@ static int ni_valid_rtsi_output_source(struct comedi_device * dev, unsigned chan
                        else {
                                rt_printk
                                        ("%s: invalid source for channel=%i, channel %i is always the RTSI clock for pre-m-series boards.\n",
-                                       __FUNCTION__, chan,
+                                       __func__, chan,
                                        old_RTSI_clock_channel);
                                return 0;
                        }
@@ -5629,7 +5629,7 @@ static unsigned ni_get_rtsi_routing(struct comedi_device * dev, unsigned chan)
        } else {
                if (chan == old_RTSI_clock_channel)
                        return NI_RTSI_OUTPUT_RTSI_OSC;
-               rt_printk("%s: bug! should never get here?\n", __FUNCTION__);
+               rt_printk("%s: bug! should never get here?\n", __func__);
                return 0;
        }
 }
@@ -5724,7 +5724,7 @@ static int cs5529_wait_for_idle(struct comedi_device * dev)
        }
 /* printk("looped %i times waiting for idle\n", i); */
        if (i == timeout) {
-               rt_printk("%s: %s: timeout\n", __FILE__, __FUNCTION__);
+               rt_printk("%s: %s: timeout\n", __FILE__, __func__);
                return -ETIME;
        }
        return 0;

diff --git a/drivers/staging/comedi/drivers/ni_pcimio.c b/drivers/staging/comedi/drivers/ni_pcimio.c
index a09622b6023880407eddc96601f011606bfc2521..752092b069d7fa28f6b85b80369ee17177e79e22 100644 (file)
--- a/drivers/staging/comedi/drivers/ni_pcimio.c
+++ b/drivers/staging/comedi/drivers/ni_pcimio.c
@@ -1351,7 +1351,7 @@ static void m_series_stc_writew(struct comedi_device * dev, uint16_t data, int r
        case DIO_Control_Register:
                rt_printk
                        ("%s: FIXME: register 0x%x does not map cleanly on to m-series boards.\n",
-                       __FUNCTION__, reg);
+                       __func__, reg);
                return;
                break;
        case G_Autoincrement_Register(0):
@@ -1412,7 +1412,7 @@ static void m_series_stc_writew(struct comedi_device * dev, uint16_t data, int r
                   and M_Offset_SCXI_Serial_Data_Out (8 bit) */
        default:
                rt_printk("%s: bug! unhandled register=0x%x in switch.\n",
-                       __FUNCTION__, reg);
+                       __func__, reg);
                BUG();
                return;
                break;
@@ -1447,7 +1447,7 @@ static uint16_t m_series_stc_readw(struct comedi_device * dev, int reg)
                break;
        default:
                rt_printk("%s: bug! unhandled register=0x%x in switch.\n",
-                       __FUNCTION__, reg);
+                       __func__, reg);
                BUG();
                return 0;
                break;
@@ -1488,7 +1488,7 @@ static void m_series_stc_writel(struct comedi_device * dev, uint32_t data, int r
                break;
        default:
                rt_printk("%s: bug! unhandled register=0x%x in switch.\n",
-                       __FUNCTION__, reg);
+                       __func__, reg);
                BUG();
                return;
                break;
@@ -1514,7 +1514,7 @@ static uint32_t m_series_stc_readl(struct comedi_device * dev, int reg)
                break;
        default:
                rt_printk("%s: bug! unhandled register=0x%x in switch.\n",
-                       __FUNCTION__, reg);
+                       __func__, reg);
                BUG();
                return 0;
                break;

diff --git a/drivers/staging/comedi/drivers/ni_stc.h b/drivers/staging/comedi/drivers/ni_stc.h
index ceee30c7972c29fd151299cf4a4f6a5ce9f3fd39..ea889175e84a34aceac0f99d502d8c7aa75afd79 100644 (file)
--- a/drivers/staging/comedi/drivers/ni_stc.h
+++ b/drivers/staging/comedi/drivers/ni_stc.h
@@ -339,7 +339,7 @@ static inline unsigned RTSI_Output_Bit(unsigned channel, int is_mseries)
                max_channel = 6;
        }
        if (channel > max_channel) {
-               rt_printk("%s: bug, invalid RTSI_channel=%i\n", __FUNCTION__,
+               rt_printk("%s: bug, invalid RTSI_channel=%i\n", __func__,
                        channel);
                return 0;
        }
@@ -1085,7 +1085,7 @@ static inline int M_Offset_Static_AI_Control(int i)
                0x263,
        };
        if (((unsigned)i) >= sizeof(offset) / sizeof(offset[0])) {
-               rt_printk("%s: invalid channel=%i\n", __FUNCTION__, i);
+               rt_printk("%s: invalid channel=%i\n", __func__, i);
                return offset[0];
        }
        return offset[i];
@@ -1099,7 +1099,7 @@ static inline int M_Offset_AO_Reference_Attenuation(int channel)
                0x267
        };
        if (((unsigned)channel) >= sizeof(offset) / sizeof(offset[0])) {
-               rt_printk("%s: invalid channel=%i\n", __FUNCTION__, channel);
+               rt_printk("%s: invalid channel=%i\n", __func__, channel);
                return offset[0];
        }
        return offset[channel];
@@ -1108,7 +1108,7 @@ static inline unsigned M_Offset_PFI_Output_Select(unsigned n)
 {
        if (n < 1 || n > NUM_PFI_OUTPUT_SELECT_REGS) {
                rt_printk("%s: invalid pfi output select register=%i\n",
-                       __FUNCTION__, n);
+                       __func__, n);
                return M_Offset_PFI_Output_Select_1;
        }
        return M_Offset_PFI_Output_Select_1 + (n - 1) * 2;
@@ -1162,7 +1162,7 @@ static inline unsigned MSeries_PLL_In_Source_Select_RTSI_Bits(unsigned
        RTSI_channel)
 {
        if (RTSI_channel > 7) {
-               rt_printk("%s: bug, invalid RTSI_channel=%i\n", __FUNCTION__,
+               rt_printk("%s: bug, invalid RTSI_channel=%i\n", __func__,
                        RTSI_channel);
                return 0;
        }
@@ -1183,7 +1183,7 @@ static inline unsigned MSeries_PLL_Divisor_Bits(unsigned divisor)
 {
        static const unsigned max_divisor = 0x10;
        if (divisor < 1 || divisor > max_divisor) {
-               rt_printk("%s: bug, invalid divisor=%i\n", __FUNCTION__,
+               rt_printk("%s: bug, invalid divisor=%i\n", __func__,
                        divisor);
                return 0;
        }
@@ -1193,7 +1193,7 @@ static inline unsigned MSeries_PLL_Multiplier_Bits(unsigned multiplier)
 {
        static const unsigned max_multiplier = 0x100;
        if (multiplier < 1 || multiplier > max_multiplier) {
-               rt_printk("%s: bug, invalid multiplier=%i\n", __FUNCTION__,
+               rt_printk("%s: bug, invalid multiplier=%i\n", __func__,
                        multiplier);
                return 0;
        }

diff --git a/drivers/staging/comedi/drivers/ni_tio.c b/drivers/staging/comedi/drivers/ni_tio.c
index 53966e9816c1bc0e49a0ae5738ec650f75aadcf5..7457b4ffbe8c72c234fa13b6e43a2200e3d6ee1a 100644 (file)
--- a/drivers/staging/comedi/drivers/ni_tio.c
+++ b/drivers/staging/comedi/drivers/ni_tio.c
@@ -1273,7 +1273,7 @@ static int ni_tio_set_other_src(struct ni_gpct *counter, unsigned index,
                counter_dev->regs[abz_reg] &= ~mask;
                counter_dev->regs[abz_reg] |= (source << shift) & mask;
                write_register(counter, counter_dev->regs[abz_reg], abz_reg);
-/* rt_printk("%s %x %d %d\n", __FUNCTION__, counter_dev->regs[abz_reg], index, source); */
+/* rt_printk("%s %x %d %d\n", __func__, counter_dev->regs[abz_reg], index, source); */
                return 0;
        }
        return -EINVAL;