Skip to contentSkip to conversation

Cleanup staging comedi drivers

PATCH New Eisha Chen-yen-su 1 participant 3 messages Feb 20, 2018 Staging

lore
Share & tools
lore
#0 lore raw

cover Cleanup staging comedi drivers

Do some cleanup in order to improve robustness and remove a useless call found in the process. Problem found with checkpatch.

Eisha Chen-yen-su (2):
staging: comedi: Remove a "tracing" call
staging: comedi: Use '"%s:", __func__' instead of function name

 drivers/staging/comedi/drivers/jr3_pci.c         | 1 -
 drivers/staging/comedi/drivers/ni_mio_common.c   | 8 +++++---
 drivers/staging/comedi/drivers/quatech_daqp_cs.c | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

--
2.14.3

#1 lore raw

PATCH 1/2 staging: comedi: Remove a "tracing" call

Remove a "tracing" call as it is not needed anymore because there is an in-kernel function for that.

---
 drivers/staging/comedi/drivers/jr3_pci.c | 1 -
 1 file changed, 1 deletion(-)
drivers/staging/comedi/drivers/jr3_pci.c +0 -1
index 201f4f96c182..c3c88e6d298f 100644
@@ -295,7 +295,6 @@ static int jr3_pci_open(struct comedi_device *dev)
 	struct comedi_subdevice *s;
 	int i;
 
-	dev_dbg(dev->class_dev, "jr3_pci_open\n");
 	for (i = 0; i < dev->n_subdevices; i++) {
 		s = &dev->subdevices[i];
 		spriv = s->private;
Signature · 1 line
2.14.3
#2 lore raw

PATCH 2/2 staging: comedi: Use '"%s:", __func__' instead of function name

In reply to Eisha Chen-yen-su

Replace all occurrences of functions' names in strings by a reference to __func__, to improve robustness. Problem found with checkpatch.

---
 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(-)
drivers/staging/comedi/drivers/ni_mio_common.c +5 -3
index 5d610af6799f..d6eb55b41814 100644
@@ -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);
drivers/staging/comedi/drivers/quatech_daqp_cs.c +1 -1
index 802f51e46405..ea194aa01a64 100644
@@ -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.14.3