[PATCH v2 4/9] staging: comedi: ni_usb6501: rename ni6501_send_command()

Luca Ellero luca.ellero at brickedbrain.com
Tue Sep 16 11:40:02 UTC 2014


Rename ni6501_send_command to ni6501_port_command

Signed-off-by: Luca Ellero <luca.ellero at brickedbrain.com>
---
 drivers/staging/comedi/drivers/ni_usb6501.c |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/staging/comedi/drivers/ni_usb6501.c b/drivers/staging/comedi/drivers/ni_usb6501.c
index 91c0e22..f55b9f8 100644
--- a/drivers/staging/comedi/drivers/ni_usb6501.c
+++ b/drivers/staging/comedi/drivers/ni_usb6501.c
@@ -172,7 +172,7 @@ struct ni6501_private {
 	u8 *usb_tx_buf;
 };
 
-static int ni6501_send_command(struct comedi_device *dev, int command,
+static int ni6501_port_command(struct comedi_device *dev, int command,
 			       const u8 *port, u8 *bitmap)
 {
 	struct usb_device *usb = comedi_to_usb_dev(dev);
@@ -288,7 +288,7 @@ static int ni6501_dio_insn_config(struct comedi_device *dev,
 	port[1] = (s->io_bits >> 8) & 0xff;
 	port[2] = (s->io_bits >> 16) & 0xff;
 
-	ret = ni6501_send_command(dev, SET_PORT_DIR, port, NULL);
+	ret = ni6501_port_command(dev, SET_PORT_DIR, port, NULL);
 	if (ret)
 		return ret;
 
@@ -310,7 +310,7 @@ static int ni6501_dio_insn_bits(struct comedi_device *dev,
 	for (port = 0; port < 3; port++) {
 		if (mask & (0xFF << port * 8)) {
 			bitmap = (s->state >> port * 8) & 0xFF;
-			ret = ni6501_send_command(dev, WRITE_PORT,
+			ret = ni6501_port_command(dev, WRITE_PORT,
 						  &port, &bitmap);
 			if (ret)
 				return ret;
@@ -320,7 +320,7 @@ static int ni6501_dio_insn_bits(struct comedi_device *dev,
 	data[1] = 0;
 
 	for (port = 0; port < 3; port++) {
-		ret = ni6501_send_command(dev, READ_PORT, &port, &bitmap);
+		ret = ni6501_port_command(dev, READ_PORT, &port, &bitmap);
 		if (ret)
 			return ret;
 		data[1] |= bitmap << port * 8;
-- 
1.7.10.4



More information about the devel mailing list