Skip to content

L
linux
Commit da63c39c authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman
Browse files
Options

staging: comedi: usbduxfast: don't pass the private data directly 

Instead of passing the private data to the internal functions, pass
the comedi_device pointer and get the private data from it.
Signed-off-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 01245e7a
Hide whitespace changes
Inline Side-by-side
Showing with 38 additions and 29 deletions
drivers/staging/comedi/drivers/usbduxfast.c
View file @ da63c39c
...@@ -170,8 +170,9 @@ struct usbduxfast_private { ...@@ -170,8 +170,9 @@ struct usbduxfast_private {
#define SENDADCOMMANDS 0 #define SENDADCOMMANDS 0
#define SENDINITEP6 1 #define SENDINITEP6 1
static int send_dux_commands(struct usbduxfast_private *devpriv, int cmd_type) static int send_dux_commands(struct comedi_device *dev, int cmd_type)
{ {
struct usbduxfast_private *devpriv = dev->private;
int tmp, nsent; int tmp, nsent;
devpriv->dux_commands[0] = cmd_type; devpriv->dux_commands[0] = cmd_type;
...@@ -191,8 +192,9 @@ static int send_dux_commands(struct usbduxfast_private *devpriv, int cmd_type) ...@@ -191,8 +192,9 @@ static int send_dux_commands(struct usbduxfast_private *devpriv, int cmd_type)
* Stops the data acquision. * Stops the data acquision.
* It should be safe to call this function from any context. * It should be safe to call this function from any context.
*/ */
static int usbduxfastsub_unlink_InURBs(struct usbduxfast_private *devpriv) static int usbduxfastsub_unlink_InURBs(struct comedi_device *dev)
{ {
struct usbduxfast_private *devpriv = dev->private;
int j = 0; int j = 0;
int err = 0; int err = 0;
...@@ -210,9 +212,10 @@ static int usbduxfastsub_unlink_InURBs(struct usbduxfast_private *devpriv) ...@@ -210,9 +212,10 @@ static int usbduxfastsub_unlink_InURBs(struct usbduxfast_private *devpriv)
* Is called from within this driver from both the * Is called from within this driver from both the
* interrupt context and from comedi. * interrupt context and from comedi.
*/ */
static int usbduxfast_ai_stop(struct usbduxfast_private *devpriv, static int usbduxfast_ai_stop(struct comedi_device *dev,
int do_unlink) int do_unlink)
{ {
struct usbduxfast_private *devpriv = dev->private;
int ret = 0; int ret = 0;
if (!devpriv) { if (!devpriv) {
...@@ -224,7 +227,7 @@ static int usbduxfast_ai_stop(struct usbduxfast_private *devpriv, ...@@ -224,7 +227,7 @@ static int usbduxfast_ai_stop(struct usbduxfast_private *devpriv,
if (do_unlink) if (do_unlink)
/* stop aquistion */ /* stop aquistion */
ret = usbduxfastsub_unlink_InURBs(devpriv); ret = usbduxfastsub_unlink_InURBs(dev);
return ret; return ret;
} }
...@@ -246,7 +249,7 @@ static int usbduxfast_ai_cancel(struct comedi_device *dev, ...@@ -246,7 +249,7 @@ static int usbduxfast_ai_cancel(struct comedi_device *dev,
} }
down(&devpriv->sem); down(&devpriv->sem);
/* unlink */ /* unlink */
ret = usbduxfast_ai_stop(devpriv, 1); ret = usbduxfast_ai_stop(dev, 1);
up(&devpriv->sem); up(&devpriv->sem);
return ret; return ret;
...@@ -292,7 +295,7 @@ static void usbduxfast_ai_interrupt(struct urb *urb) ...@@ -292,7 +295,7 @@ static void usbduxfast_ai_interrupt(struct urb *urb)
async->events |= COMEDI_CB_ERROR; async->events |= COMEDI_CB_ERROR;
comedi_event(dev, s); comedi_event(dev, s);
/* stop the transfer w/o unlink */ /* stop the transfer w/o unlink */
usbduxfast_ai_stop(devpriv, 0); usbduxfast_ai_stop(dev, 0);
return; return;
default: default:
...@@ -301,7 +304,7 @@ static void usbduxfast_ai_interrupt(struct urb *urb) ...@@ -301,7 +304,7 @@ static void usbduxfast_ai_interrupt(struct urb *urb)
async->events |= COMEDI_CB_EOA; async->events |= COMEDI_CB_EOA;
async->events |= COMEDI_CB_ERROR; async->events |= COMEDI_CB_ERROR;
comedi_event(dev, s); comedi_event(dev, s);
usbduxfast_ai_stop(devpriv, 0); usbduxfast_ai_stop(dev, 0);
return; return;
} }
...@@ -318,7 +321,7 @@ static void usbduxfast_ai_interrupt(struct urb *urb) ...@@ -318,7 +321,7 @@ static void usbduxfast_ai_interrupt(struct urb *urb)
urb->transfer_buffer, urb->transfer_buffer,
devpriv->ai_sample_count devpriv->ai_sample_count
* sizeof(uint16_t)); * sizeof(uint16_t));
usbduxfast_ai_stop(devpriv, 0); usbduxfast_ai_stop(dev, 0);
/* tell comedi that the acquistion is over */ /* tell comedi that the acquistion is over */
async->events |= COMEDI_CB_EOA; async->events |= COMEDI_CB_EOA;
comedi_event(dev, s); comedi_event(dev, s);
...@@ -331,7 +334,7 @@ static void usbduxfast_ai_interrupt(struct urb *urb) ...@@ -331,7 +334,7 @@ static void usbduxfast_ai_interrupt(struct urb *urb)
urb->actual_length); urb->actual_length);
if (unlikely(err == 0)) { if (unlikely(err == 0)) {
/* buffer overflow */ /* buffer overflow */
usbduxfast_ai_stop(devpriv, 0); usbduxfast_ai_stop(dev, 0);
return; return;
} }
...@@ -355,14 +358,15 @@ static void usbduxfast_ai_interrupt(struct urb *urb) ...@@ -355,14 +358,15 @@ static void usbduxfast_ai_interrupt(struct urb *urb)
async->events |= COMEDI_CB_EOA; async->events |= COMEDI_CB_EOA;
async->events |= COMEDI_CB_ERROR; async->events |= COMEDI_CB_ERROR;
comedi_event(dev, s); comedi_event(dev, s);
usbduxfast_ai_stop(devpriv, 0); usbduxfast_ai_stop(dev, 0);
} }
} }
static int usbduxfastsub_start(struct usbduxfast_private *devpriv) static int usbduxfastsub_start(struct comedi_device *dev)
{ {
int ret; struct usbduxfast_private *devpriv = dev->private;
unsigned char *local_transfer_buffer; unsigned char *local_transfer_buffer;
int ret;
local_transfer_buffer = kmalloc(1, GFP_KERNEL); local_transfer_buffer = kmalloc(1, GFP_KERNEL);
if (!local_transfer_buffer) if (!local_transfer_buffer)
...@@ -388,10 +392,11 @@ static int usbduxfastsub_start(struct usbduxfast_private *devpriv) ...@@ -388,10 +392,11 @@ static int usbduxfastsub_start(struct usbduxfast_private *devpriv)
return ret; return ret;
} }
static int usbduxfastsub_stop(struct usbduxfast_private *devpriv) static int usbduxfastsub_stop(struct comedi_device *dev)
{ {
int ret; struct usbduxfast_private *devpriv = dev->private;
unsigned char *local_transfer_buffer; unsigned char *local_transfer_buffer;
int ret;
local_transfer_buffer = kmalloc(1, GFP_KERNEL); local_transfer_buffer = kmalloc(1, GFP_KERNEL);
if (!local_transfer_buffer) if (!local_transfer_buffer)
...@@ -415,10 +420,11 @@ static int usbduxfastsub_stop(struct usbduxfast_private *devpriv) ...@@ -415,10 +420,11 @@ static int usbduxfastsub_stop(struct usbduxfast_private *devpriv)
return ret; return ret;
} }
static int usbduxfastsub_upload(struct usbduxfast_private *devpriv, static int usbduxfastsub_upload(struct comedi_device *dev,
unsigned char *local_transfer_buffer, unsigned char *local_transfer_buffer,
unsigned int startAddr, unsigned int len) unsigned int startAddr, unsigned int len)
{ {
struct usbduxfast_private *devpriv = dev->private;
int ret; int ret;
/* brequest, firmware */ /* brequest, firmware */
...@@ -439,8 +445,9 @@ static int usbduxfastsub_upload(struct usbduxfast_private *devpriv, ...@@ -439,8 +445,9 @@ static int usbduxfastsub_upload(struct usbduxfast_private *devpriv,
return 0; return 0;
} }
static int usbduxfastsub_submit_InURBs(struct usbduxfast_private *devpriv) static int usbduxfastsub_submit_InURBs(struct comedi_device *dev)
{ {
struct usbduxfast_private *devpriv = dev->private;
int ret; int ret;
if (!devpriv) if (!devpriv)
...@@ -449,7 +456,7 @@ static int usbduxfastsub_submit_InURBs(struct usbduxfast_private *devpriv) ...@@ -449,7 +456,7 @@ static int usbduxfastsub_submit_InURBs(struct usbduxfast_private *devpriv)
usb_fill_bulk_urb(devpriv->urbIn, devpriv->usb, usb_fill_bulk_urb(devpriv->urbIn, devpriv->usb,
usb_rcvbulkpipe(devpriv->usb, BULKINEP), usb_rcvbulkpipe(devpriv->usb, BULKINEP),
devpriv->transfer_buffer, SIZEINBUF, devpriv->transfer_buffer, SIZEINBUF,
usbduxfast_ai_interrupt, devpriv->comedidev); usbduxfast_ai_interrupt, dev);
ret = usb_submit_urb(devpriv->urbIn, GFP_ATOMIC); ret = usb_submit_urb(devpriv->urbIn, GFP_ATOMIC);
if (ret) { if (ret) {
...@@ -572,7 +579,7 @@ static int usbduxfast_ai_inttrig(struct comedi_device *dev, ...@@ -572,7 +579,7 @@ static int usbduxfast_ai_inttrig(struct comedi_device *dev,
} }
if (!devpriv->ai_cmd_running) { if (!devpriv->ai_cmd_running) {
devpriv->ai_cmd_running = 1; devpriv->ai_cmd_running = 1;
ret = usbduxfastsub_submit_InURBs(devpriv); ret = usbduxfastsub_submit_InURBs(dev);
if (ret < 0) { if (ret < 0) {
dev_err(dev->class_dev, dev_err(dev->class_dev,
"%s: urbSubmit: err=%d\n", __func__, ret); "%s: urbSubmit: err=%d\n", __func__, ret);
...@@ -995,7 +1002,7 @@ static int usbduxfast_ai_cmd(struct comedi_device *dev, ...@@ -995,7 +1002,7 @@ static int usbduxfast_ai_cmd(struct comedi_device *dev,
} }
/* 0 means that the AD commands are sent */ /* 0 means that the AD commands are sent */
result = send_dux_commands(devpriv, SENDADCOMMANDS); result = send_dux_commands(dev, SENDADCOMMANDS);
if (result < 0) { if (result < 0) {
dev_err(dev->class_dev, dev_err(dev->class_dev,
"adc command could not be submitted. Aborting...\n"); "adc command could not be submitted. Aborting...\n");
...@@ -1020,7 +1027,7 @@ static int usbduxfast_ai_cmd(struct comedi_device *dev, ...@@ -1020,7 +1027,7 @@ static int usbduxfast_ai_cmd(struct comedi_device *dev,
if ((cmd->start_src == TRIG_NOW) || (cmd->start_src == TRIG_EXT)) { if ((cmd->start_src == TRIG_NOW) || (cmd->start_src == TRIG_EXT)) {
/* enable this acquisition operation */ /* enable this acquisition operation */
devpriv->ai_cmd_running = 1; devpriv->ai_cmd_running = 1;
ret = usbduxfastsub_submit_InURBs(devpriv); ret = usbduxfastsub_submit_InURBs(dev);
if (ret < 0) { if (ret < 0) {
devpriv->ai_cmd_running = 0; devpriv->ai_cmd_running = 0;
/* fixme: unlink here?? */ /* fixme: unlink here?? */
...@@ -1115,7 +1122,7 @@ static int usbduxfast_ai_insn_read(struct comedi_device *dev, ...@@ -1115,7 +1122,7 @@ static int usbduxfast_ai_insn_read(struct comedi_device *dev,
devpriv->dux_commands[LOGBASE + 0] = 0; devpriv->dux_commands[LOGBASE + 0] = 0;
/* 0 means that the AD commands are sent */ /* 0 means that the AD commands are sent */
err = send_dux_commands(devpriv, SENDADCOMMANDS); err = send_dux_commands(dev, SENDADCOMMANDS);
if (err < 0) { if (err < 0) {
dev_err(dev->class_dev, dev_err(dev->class_dev,
"adc command could not be submitted. Aborting...\n"); "adc command could not be submitted. Aborting...\n");
...@@ -1162,9 +1169,10 @@ static int usbduxfast_ai_insn_read(struct comedi_device *dev, ...@@ -1162,9 +1169,10 @@ static int usbduxfast_ai_insn_read(struct comedi_device *dev,
#define FIRMWARE_MAX_LEN 0x2000 #define FIRMWARE_MAX_LEN 0x2000
static int firmwareUpload(struct usbduxfast_private *devpriv, static int firmwareUpload(struct comedi_device *dev,
const u8 *firmwareBinary, int sizeFirmware) const u8 *firmwareBinary, int sizeFirmware)
{ {
struct usbduxfast_private *devpriv = dev->private;
int ret; int ret;
uint8_t *fwBuf; uint8_t *fwBuf;
...@@ -1185,7 +1193,7 @@ static int firmwareUpload(struct usbduxfast_private *devpriv, ...@@ -1185,7 +1193,7 @@ static int firmwareUpload(struct usbduxfast_private *devpriv,
return -ENOMEM; return -ENOMEM;
} }
ret = usbduxfastsub_stop(devpriv); ret = usbduxfastsub_stop(dev);
if (ret < 0) { if (ret < 0) {
dev_err(&devpriv->intf->dev, dev_err(&devpriv->intf->dev,
"comedi_: can not stop firmware\n"); "comedi_: can not stop firmware\n");
...@@ -1193,14 +1201,14 @@ static int firmwareUpload(struct usbduxfast_private *devpriv, ...@@ -1193,14 +1201,14 @@ static int firmwareUpload(struct usbduxfast_private *devpriv,
return ret; return ret;
} }
ret = usbduxfastsub_upload(devpriv, fwBuf, 0, sizeFirmware); ret = usbduxfastsub_upload(dev, fwBuf, 0, sizeFirmware);
if (ret < 0) { if (ret < 0) {
dev_err(&devpriv->intf->dev, dev_err(&devpriv->intf->dev,
"comedi_: firmware upload failed\n"); "comedi_: firmware upload failed\n");
kfree(fwBuf); kfree(fwBuf);
return ret; return ret;
} }
ret = usbduxfastsub_start(devpriv); ret = usbduxfastsub_start(dev);
if (ret < 0) { if (ret < 0) {
dev_err(&devpriv->intf->dev, dev_err(&devpriv->intf->dev,
"comedi_: can not start firmware\n"); "comedi_: can not start firmware\n");
...@@ -1244,10 +1252,11 @@ static int usbduxfast_attach_common(struct comedi_device *dev) ...@@ -1244,10 +1252,11 @@ static int usbduxfast_attach_common(struct comedi_device *dev)
return 0; return 0;
} }
static int usbduxfast_request_firmware(struct usb_interface *intf) static int usbduxfast_request_firmware(struct comedi_device *dev)
{ {
struct usbduxfast_private *devpriv = dev->private;
struct usb_interface *intf = devpriv->intf;
struct usb_device *usb = interface_to_usbdev(intf); struct usb_device *usb = interface_to_usbdev(intf);
struct usbduxfast_private *devpriv = usb_get_intfdata(intf);
const struct firmware *fw; const struct firmware *fw;
int ret; int ret;
...@@ -1255,7 +1264,7 @@ static int usbduxfast_request_firmware(struct usb_interface *intf) ...@@ -1255,7 +1264,7 @@ static int usbduxfast_request_firmware(struct usb_interface *intf)
if (ret) if (ret)
return ret; return ret;
ret = firmwareUpload(devpriv, fw->data, fw->size); ret = firmwareUpload(dev, fw->data, fw->size);
release_firmware(fw); release_firmware(fw);
return ret; return ret;
...@@ -1316,7 +1325,7 @@ static int usbduxfast_auto_attach(struct comedi_device *dev, ...@@ -1316,7 +1325,7 @@ static int usbduxfast_auto_attach(struct comedi_device *dev,
* Request, and upload, the firmware so we can * Request, and upload, the firmware so we can
* complete the comedi_driver (*auto_attach). * complete the comedi_driver (*auto_attach).
*/ */
ret = usbduxfast_request_firmware(intf); ret = usbduxfast_request_firmware(dev);
if (ret) { if (ret) {
dev_err(&intf->dev, "could not load firmware (err=%d)\n", ret); dev_err(&intf->dev, "could not load firmware (err=%d)\n", ret);
return ret; return ret;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7