evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

staging: comedi: ni_usb6501: rename ni6501_send_command()

Browse source 
Rename ni6501_send_command to ni6501_port_command

Signed-off-by: Luca Ellero <luca.ellero@brickedbrain.com>
Reviewed-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Luca Ellero 2014-09-19 13:50:40 +02:00 • committed by Greg Kroah-Hartman
parent d6669ba21b
commit 5116a48c1b
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
drivers/staging/comedi/drivers/ni_usb6501.c
View file

@ -172,7 +172,7 @@ struct ni6501_private {
u8 *usb_tx_buf; 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) const u8 *port, u8 *bitmap)
{ {
struct usb_device *usb = comedi_to_usb_dev(dev); struct usb_device *usb = comedi_to_usb_dev(dev);
@ -270,7 +270,7 @@ static int ni6501_dio_insn_config(struct comedi_device *dev,
port[1] = (s->io_bits >> 8) & 0xff; port[1] = (s->io_bits >> 8) & 0xff;
port[2] = (s->io_bits >> 16) & 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) if (ret)
return ret; return ret;
@ -292,7 +292,7 @@ static int ni6501_dio_insn_bits(struct comedi_device *dev,
for (port = 0; port < 3; port++) { for (port = 0; port < 3; port++) {
if (mask & (0xFF << port * 8)) { if (mask & (0xFF << port * 8)) {
bitmap = (s->state >> port * 8) & 0xFF; bitmap = (s->state >> port * 8) & 0xFF;
ret = ni6501_send_command(dev, WRITE_PORT, ret = ni6501_port_command(dev, WRITE_PORT,
&port, &bitmap); &port, &bitmap);
if (ret) if (ret)
return ret; return ret;
@ -302,7 +302,7 @@ static int ni6501_dio_insn_bits(struct comedi_device *dev,
data[1] = 0; data[1] = 0;
for (port = 0; port < 3; port++) { 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) if (ret)
return ret; return ret;
data[1] |= bitmap << port * 8; data[1] |= bitmap << port * 8;