From 38614ed80220f74c08333fb5e9b2c98a2fe9cacc Mon Sep 17 00:00:00 2001 From: Eisha Chen-yen-su Date: Tue, 20 Feb 2018 10:05:25 +0100 Subject: [PATCH] staging: comedi: Use '"%s:", __func__' instead of function name 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 Signed-off-by: Greg Kroah-Hartman --- drivers/staging/comedi/drivers/ni_mio_common.c | 8 +++++--- drivers/staging/comedi/drivers/quatech_daqp_cs.c | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/drivers/staging/comedi/drivers/ni_mio_common.c b/drivers/staging/comedi/drivers/ni_mio_common.c index 5d610af6799f..d6eb55b41814 100644 --- a/drivers/staging/comedi/drivers/ni_mio_common.c +++ b/drivers/staging/comedi/drivers/ni_mio_common.c @@ -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); diff --git a/drivers/staging/comedi/drivers/quatech_daqp_cs.c b/drivers/staging/comedi/drivers/quatech_daqp_cs.c index 802f51e46405..ea194aa01a64 100644 --- a/drivers/staging/comedi/drivers/quatech_daqp_cs.c +++ b/drivers/staging/comedi/drivers/quatech_daqp_cs.c @@ -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; } -- 2.30.2