OSDN Git Service

staging: comedi: Use '"%s:", __func__' instead of function name
authorEisha Chen-yen-su <chenyensu0@gmail.com>
Tue, 20 Feb 2018 09:05:25 +0000 (10:05 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 22 Feb 2018 13:53:05 +0000 (14:53 +0100)
Replace all occurrences of functions' names in strings by a reference
to __func__, to improve robustness. Problem found with checkpatch.

Signed-off-by: Eisha Chen-yen-su <chenyensu0@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/comedi/drivers/ni_mio_common.c
drivers/staging/comedi/drivers/quatech_daqp_cs.c

index 5d610af..d6eb55b 100644 (file)
@@ -1965,7 +1965,8 @@ static void ni_cmd_set_mite_transfer(struct mite_ring *ring,
        if (nbytes > sdev->async->prealloc_bufsz) {
                if (cmd->stop_arg > 0)
                        dev_err(sdev->device->class_dev,
-                               "ni_cmd_set_mite_transfer: tried exact data transfer limits greater than buffer size\n");
+                               "%s: tried exact data transfer limits greater than buffer size\n",
+                               __func__);
 
                /*
                 * we can only transfer up to the size of the buffer.  In this
@@ -1978,7 +1979,8 @@ static void ni_cmd_set_mite_transfer(struct mite_ring *ring,
        mite_init_ring_descriptors(ring, sdev, nbytes);
 #else
        dev_err(sdev->device->class_dev,
-               "ni_cmd_set_mite_transfer: exact data transfer limits not implemented yet without DMA\n");
+               "%s: exact data transfer limits not implemented yet without DMA\n",
+               __func__);
 #endif
 }
 
@@ -4687,7 +4689,7 @@ static int cs5529_do_conversion(struct comedi_device *dev,
        retval = cs5529_wait_for_idle(dev);
        if (retval) {
                dev_err(dev->class_dev,
-                       "timeout or signal in cs5529_do_conversion()\n");
+                       "timeout or signal in %s()\n", __func__);
                return -ETIME;
        }
        status = ni_ao_win_inw(dev, NI67XX_CAL_STATUS_REG);
index 802f51e..ea194aa 100644 (file)
@@ -248,7 +248,7 @@ static irqreturn_t daqp_interrupt(int irq, void *dev_id)
 
        if (loop_limit <= 0) {
                dev_warn(dev->class_dev,
-                        "loop_limit reached in daqp_interrupt()\n");
+                        "loop_limit reached in %s()\n", __func__);
                s->async->events |= COMEDI_CB_ERROR;
        }