Skip to content

K
Kernel

openeuler / Kernel
11 个月 前同步成功

通知 5
Star 0
Fork 0
K
Kernel

体验新版 GitCode，发现更多精彩内容 >>

提交 0a00ab99 编写于 作者: Y YAMANE Toshiaki 提交者： Greg Kroah-Hartman
浏览文件
操作

staging/comedi: Use pr_ or dev_ printks in drivers/usbduxfast.c 

fixed below checkpatch warnings.
- WARNING: Prefer netdev_err(netdev, ... then dev_err(dev, ... then pr_err(...  to printk(KERN_ERR ...
- WARNING: Prefer netdev_info(netdev, ... then dev_info(dev, ... then pr_info(...  to printk(KERN_INFO ...

and added pr_fmt.
Signed-off-by: NYAMANE Toshiaki <yamanetoshi@gmail.com>
Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>
上级 7194d0e1
隐藏空白更改
内联 并排
Showing with 71 addition and 81 deletion
drivers/staging/comedi/drivers/usbduxfast.c
浏览文件 @ 0a00ab99
...@@ -37,6 +37,8 @@ ...@@ -37,6 +37,8 @@
* udev coldplug problem * udev coldplug problem
*/ */
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/firmware.h> #include <linux/firmware.h>
#include <linux/module.h> #include <linux/module.h>
...@@ -216,8 +218,9 @@ static int send_dux_commands(struct usbduxfastsub_s *udfs, int cmd_type) ...@@ -216,8 +218,9 @@ static int send_dux_commands(struct usbduxfastsub_s *udfs, int cmd_type)
usb_sndbulkpipe(udfs->usbdev, CHANNELLISTEP), usb_sndbulkpipe(udfs->usbdev, CHANNELLISTEP),
udfs->dux_commands, SIZEOFDUXBUFFER, &nsent, 10000); udfs->dux_commands, SIZEOFDUXBUFFER, &nsent, 10000);
if (tmp < 0) if (tmp < 0)
printk(KERN_ERR "comedi%d: could not transmit dux_commands to" dev_err(&udfs->interface->dev,
"the usb-device, err=%d\n", udfs->comedidev->minor, tmp); "could not transmit dux_commands to the usb-device, err=%d\n",
tmp);
return tmp; return tmp;
} }
...@@ -252,7 +255,7 @@ static int usbduxfast_ai_stop(struct usbduxfastsub_s *udfs, int do_unlink) ...@@ -252,7 +255,7 @@ static int usbduxfast_ai_stop(struct usbduxfastsub_s *udfs, int do_unlink)
int ret = 0; int ret = 0;
if (!udfs) { if (!udfs) {
printk(KERN_ERR "comedi?: usbduxfast_ai_stop: udfs=NULL!\n"); pr_err("%s: udfs=NULL!\n", __func__);
return -EFAULT; return -EFAULT;
} }
#ifdef CONFIG_COMEDI_DEBUG #ifdef CONFIG_COMEDI_DEBUG
...@@ -284,7 +287,7 @@ static int usbduxfast_ai_cancel(struct comedi_device *dev, ...@@ -284,7 +287,7 @@ static int usbduxfast_ai_cancel(struct comedi_device *dev,
#endif #endif
udfs = dev->private; udfs = dev->private;
if (!udfs) { if (!udfs) {
printk(KERN_ERR "comedi: usbduxfast_ai_cancel: udfs=NULL\n"); dev_err(dev->class_dev, "%s: udfs=NULL\n", __func__);
return -EFAULT; return -EFAULT;
} }
down(&udfs->sem); down(&udfs->sem);
...@@ -313,22 +316,19 @@ static void usbduxfastsub_ai_Irq(struct urb *urb) ...@@ -313,22 +316,19 @@ static void usbduxfastsub_ai_Irq(struct urb *urb)
/* sanity checks - is the urb there? */ /* sanity checks - is the urb there? */
if (!urb) { if (!urb) {
printk(KERN_ERR "comedi_: usbduxfast_: ao int-handler called " pr_err("ao int-handler called with urb=NULL!\n");
"with urb=NULL!\n");
return; return;
} }
/* the context variable points to the subdevice */ /* the context variable points to the subdevice */
this_comedidev = urb->context; this_comedidev = urb->context;
if (!this_comedidev) { if (!this_comedidev) {
printk(KERN_ERR "comedi_: usbduxfast_: urb context is a NULL " pr_err("urb context is a NULL pointer!\n");
"pointer!\n");
return; return;
} }
/* the private structure of the subdevice is usbduxfastsub_s */ /* the private structure of the subdevice is usbduxfastsub_s */
udfs = this_comedidev->private; udfs = this_comedidev->private;
if (!udfs) { if (!udfs) {
printk(KERN_ERR "comedi_: usbduxfast_: private of comedi " pr_err("private of comedi subdev is a NULL pointer!\n");
"subdev is a NULL pointer!\n");
return; return;
} }
/* are we running a command? */ /* are we running a command? */
...@@ -427,8 +427,8 @@ static void usbduxfastsub_ai_Irq(struct urb *urb) ...@@ -427,8 +427,8 @@ static void usbduxfastsub_ai_Irq(struct urb *urb)
urb->status = 0; urb->status = 0;
err = usb_submit_urb(urb, GFP_ATOMIC); err = usb_submit_urb(urb, GFP_ATOMIC);
if (err < 0) { if (err < 0) {
printk(KERN_ERR "comedi%d: usbduxfast: urb resubm failed: %d", dev_err(&urb->dev->dev,
udfs->comedidev->minor, err); "urb resubm failed: %d", err);
s->async->events |= COMEDI_CB_EOA; s->async->events |= COMEDI_CB_EOA;
s->async->events |= COMEDI_CB_ERROR; s->async->events |= COMEDI_CB_ERROR;
comedi_event(udfs->comedidev, s); comedi_event(udfs->comedidev, s);
...@@ -477,8 +477,8 @@ static int usbduxfastsub_stop(struct usbduxfastsub_s *udfs) ...@@ -477,8 +477,8 @@ static int usbduxfastsub_stop(struct usbduxfastsub_s *udfs)
local_transfer_buffer, 1, /* Length */ local_transfer_buffer, 1, /* Length */
EZTIMEOUT); /* Timeout */ EZTIMEOUT); /* Timeout */
if (ret < 0) { if (ret < 0) {
printk(KERN_ERR "comedi_: usbduxfast: control msg failed " dev_err(&udfs->interface->dev,
"(stop)\n"); "control msg failed (stop)\n");
return ret; return ret;
} }
...@@ -512,7 +512,7 @@ static int usbduxfastsub_upload(struct usbduxfastsub_s *udfs, ...@@ -512,7 +512,7 @@ static int usbduxfastsub_upload(struct usbduxfastsub_s *udfs,
#endif #endif
if (ret < 0) { if (ret < 0) {
printk(KERN_ERR "comedi_: usbduxfast: uppload failed\n"); dev_err(&udfs->interface->dev, "uppload failed\n");
return ret; return ret;
} }
...@@ -538,8 +538,8 @@ static int usbduxfastsub_submit_InURBs(struct usbduxfastsub_s *udfs) ...@@ -538,8 +538,8 @@ static int usbduxfastsub_submit_InURBs(struct usbduxfastsub_s *udfs)
#endif #endif
ret = usb_submit_urb(udfs->urbIn, GFP_ATOMIC); ret = usb_submit_urb(udfs->urbIn, GFP_ATOMIC);
if (ret) { if (ret) {
printk(KERN_ERR "comedi_: usbduxfast: ai: usb_submit_urb error" dev_err(&udfs->interface->dev,
" %d\n", ret); "ai: usb_submit_urb error %d\n", ret);
return ret; return ret;
} }
return 0; return 0;
...@@ -682,8 +682,7 @@ static int usbduxfast_ai_inttrig(struct comedi_device *dev, ...@@ -682,8 +682,7 @@ static int usbduxfast_ai_inttrig(struct comedi_device *dev,
#endif #endif
if (trignum != 0) { if (trignum != 0) {
printk(KERN_ERR "comedi%d: usbduxfast_ai_inttrig: invalid" dev_err(dev->class_dev, "%s: invalid trignum\n", __func__);
" trignum\n", dev->minor);
up(&udfs->sem); up(&udfs->sem);
return -EINVAL; return -EINVAL;
} }
...@@ -691,16 +690,16 @@ static int usbduxfast_ai_inttrig(struct comedi_device *dev, ...@@ -691,16 +690,16 @@ static int usbduxfast_ai_inttrig(struct comedi_device *dev,
udfs->ai_cmd_running = 1; udfs->ai_cmd_running = 1;
ret = usbduxfastsub_submit_InURBs(udfs); ret = usbduxfastsub_submit_InURBs(udfs);
if (ret < 0) { if (ret < 0) {
printk(KERN_ERR "comedi%d: usbduxfast_ai_inttrig: " dev_err(dev->class_dev,
"urbSubmit: err=%d\n", dev->minor, ret); "%s: urbSubmit: err=%d\n", __func__, ret);
udfs->ai_cmd_running = 0; udfs->ai_cmd_running = 0;
up(&udfs->sem); up(&udfs->sem);
return ret; return ret;
} }
s->async->inttrig = NULL; s->async->inttrig = NULL;
} else { } else {
printk(KERN_ERR "comedi%d: ai_inttrig but acqu is already" dev_err(dev->class_dev,
" running\n", dev->minor); "ai_inttrig but acqu is already running\n");
} }
up(&udfs->sem); up(&udfs->sem);
return 1; return 1;
...@@ -738,8 +737,8 @@ static int usbduxfast_ai_cmd(struct comedi_device *dev, ...@@ -738,8 +737,8 @@ static int usbduxfast_ai_cmd(struct comedi_device *dev,
return -ENODEV; return -ENODEV;
} }
if (udfs->ai_cmd_running) { if (udfs->ai_cmd_running) {
printk(KERN_ERR "comedi%d: ai_cmd not possible. Another ai_cmd" dev_err(dev->class_dev,
" is running.\n", dev->minor); "ai_cmd not possible. Another ai_cmd is running.\n");
up(&udfs->sem); up(&udfs->sem);
return -EBUSY; return -EBUSY;
} }
...@@ -757,31 +756,29 @@ static int usbduxfast_ai_cmd(struct comedi_device *dev, ...@@ -757,31 +756,29 @@ static int usbduxfast_ai_cmd(struct comedi_device *dev,
for (i = 0; i < cmd->chanlist_len; ++i) { for (i = 0; i < cmd->chanlist_len; ++i) {
chan = CR_CHAN(cmd->chanlist[i]); chan = CR_CHAN(cmd->chanlist[i]);
if (chan != i) { if (chan != i) {
printk(KERN_ERR "comedi%d: cmd is accepting " dev_err(dev->class_dev,
"only consecutive channels.\n", "cmd is accepting only consecutive channels.\n");
dev->minor);
up(&udfs->sem); up(&udfs->sem);
return -EINVAL; return -EINVAL;
} }
if ((gain != CR_RANGE(cmd->chanlist[i])) if ((gain != CR_RANGE(cmd->chanlist[i]))
&& (cmd->chanlist_len > 3)) { && (cmd->chanlist_len > 3)) {
printk(KERN_ERR "comedi%d: the gain must be" dev_err(dev->class_dev,
" the same for all channels.\n", "the gain must be the same for all channels.\n");
dev->minor);
up(&udfs->sem); up(&udfs->sem);
return -EINVAL; return -EINVAL;
} }
if (i >= NUMCHANNELS) { if (i >= NUMCHANNELS) {
printk(KERN_ERR "comedi%d: channel list too" dev_err(dev->class_dev,
" long\n", dev->minor); "channel list too long\n");
break; break;
} }
} }
} }
steps = 0; steps = 0;
if (cmd->scan_begin_src == TRIG_TIMER) { if (cmd->scan_begin_src == TRIG_TIMER) {
printk(KERN_ERR "comedi%d: usbduxfast: " dev_err(dev->class_dev,
"scan_begin_src==TRIG_TIMER not valid.\n", dev->minor); "scan_begin_src==TRIG_TIMER not valid.\n");
up(&udfs->sem); up(&udfs->sem);
return -EINVAL; return -EINVAL;
} }
...@@ -789,22 +786,21 @@ static int usbduxfast_ai_cmd(struct comedi_device *dev, ...@@ -789,22 +786,21 @@ static int usbduxfast_ai_cmd(struct comedi_device *dev,
steps = (cmd->convert_arg * 30) / 1000; steps = (cmd->convert_arg * 30) / 1000;
if ((steps < MIN_SAMPLING_PERIOD) && (cmd->chanlist_len != 1)) { if ((steps < MIN_SAMPLING_PERIOD) && (cmd->chanlist_len != 1)) {
printk(KERN_ERR "comedi%d: usbduxfast: ai_cmd: steps=%ld, " dev_err(dev->class_dev,
"scan_begin_arg=%d. Not properly tested by cmdtest?\n", "ai_cmd: steps=%ld, scan_begin_arg=%d. Not properly tested by cmdtest?\n",
dev->minor, steps, cmd->scan_begin_arg); steps, cmd->scan_begin_arg);
up(&udfs->sem); up(&udfs->sem);
return -EINVAL; return -EINVAL;
} }
if (steps > MAX_SAMPLING_PERIOD) { if (steps > MAX_SAMPLING_PERIOD) {
printk(KERN_ERR "comedi%d: usbduxfast: ai_cmd: sampling rate " dev_err(dev->class_dev, "ai_cmd: sampling rate too low.\n");
"too low.\n", dev->minor);
up(&udfs->sem); up(&udfs->sem);
return -EINVAL; return -EINVAL;
} }
if ((cmd->start_src == TRIG_EXT) && (cmd->chanlist_len != 1) if ((cmd->start_src == TRIG_EXT) && (cmd->chanlist_len != 1)
&& (cmd->chanlist_len != 16)) { && (cmd->chanlist_len != 16)) {
printk(KERN_ERR "comedi%d: usbduxfast: ai_cmd: TRIG_EXT only" dev_err(dev->class_dev,
" with 1 or 16 channels possible.\n", dev->minor); "ai_cmd: TRIG_EXT only with 1 or 16 channels possible.\n");
up(&udfs->sem); up(&udfs->sem);
return -EINVAL; return -EINVAL;
} }
...@@ -1121,8 +1117,7 @@ static int usbduxfast_ai_cmd(struct comedi_device *dev, ...@@ -1121,8 +1117,7 @@ static int usbduxfast_ai_cmd(struct comedi_device *dev,
break; break;
default: default:
printk(KERN_ERR "comedi %d: unsupported combination of " dev_err(dev->class_dev, "unsupported combination of channels\n");
"channels\n", dev->minor);
up(&udfs->sem); up(&udfs->sem);
return -EFAULT; return -EFAULT;
} }
...@@ -1134,17 +1129,16 @@ static int usbduxfast_ai_cmd(struct comedi_device *dev, ...@@ -1134,17 +1129,16 @@ 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(udfs, SENDADCOMMANDS); result = send_dux_commands(udfs, SENDADCOMMANDS);
if (result < 0) { if (result < 0) {
printk(KERN_ERR "comedi%d: adc command could not be submitted." dev_err(dev->class_dev,
"Aborting...\n", dev->minor); "adc command could not be submitted. Aborting...\n");
up(&udfs->sem); up(&udfs->sem);
return result; return result;
} }
if (cmd->stop_src == TRIG_COUNT) { if (cmd->stop_src == TRIG_COUNT) {
udfs->ai_sample_count = cmd->stop_arg * cmd->scan_end_arg; udfs->ai_sample_count = cmd->stop_arg * cmd->scan_end_arg;
if (udfs->ai_sample_count < 1) { if (udfs->ai_sample_count < 1) {
printk(KERN_ERR "comedi%d: " dev_err(dev->class_dev,
"(cmd->stop_arg)*(cmd->scan_end_arg)<1, " "(cmd->stop_arg)*(cmd->scan_end_arg)<1, aborting.\n");
"aborting.\n", dev->minor);
up(&udfs->sem); up(&udfs->sem);
return -EFAULT; return -EFAULT;
} }
...@@ -1193,8 +1187,7 @@ static int usbduxfast_ai_insn_read(struct comedi_device *dev, ...@@ -1193,8 +1187,7 @@ static int usbduxfast_ai_insn_read(struct comedi_device *dev,
udfs = dev->private; udfs = dev->private;
if (!udfs) { if (!udfs) {
printk(KERN_ERR "comedi%d: ai_insn_read: no usb dev.\n", dev_err(dev->class_dev, "%s: no usb dev.\n", __func__);
dev->minor);
return -ENODEV; return -ENODEV;
} }
#ifdef CONFIG_COMEDI_DEBUG #ifdef CONFIG_COMEDI_DEBUG
...@@ -1207,8 +1200,8 @@ static int usbduxfast_ai_insn_read(struct comedi_device *dev, ...@@ -1207,8 +1200,8 @@ static int usbduxfast_ai_insn_read(struct comedi_device *dev,
return -ENODEV; return -ENODEV;
} }
if (udfs->ai_cmd_running) { if (udfs->ai_cmd_running) {
printk(KERN_ERR "comedi%d: ai_insn_read not possible. Async " dev_err(dev->class_dev,
"Command is running.\n", dev->minor); "ai_insn_read not possible. Async Command is running.\n");
up(&udfs->sem); up(&udfs->sem);
return -EBUSY; return -EBUSY;
} }
...@@ -1268,8 +1261,8 @@ static int usbduxfast_ai_insn_read(struct comedi_device *dev, ...@@ -1268,8 +1261,8 @@ static int usbduxfast_ai_insn_read(struct comedi_device *dev,
/* 0 means that the AD commands are sent */ /* 0 means that the AD commands are sent */
err = send_dux_commands(udfs, SENDADCOMMANDS); err = send_dux_commands(udfs, SENDADCOMMANDS);
if (err < 0) { if (err < 0) {
printk(KERN_ERR "comedi%d: adc command could not be submitted." dev_err(dev->class_dev,
"Aborting...\n", dev->minor); "adc command could not be submitted. Aborting...\n");
up(&udfs->sem); up(&udfs->sem);
return err; return err;
} }
...@@ -1284,8 +1277,7 @@ static int usbduxfast_ai_insn_read(struct comedi_device *dev, ...@@ -1284,8 +1277,7 @@ static int usbduxfast_ai_insn_read(struct comedi_device *dev,
udfs->transfer_buffer, SIZEINBUF, udfs->transfer_buffer, SIZEINBUF,
&actual_length, 10000); &actual_length, 10000);
if (err < 0) { if (err < 0) {
printk(KERN_ERR "comedi%d: insn timeout. No data.\n", dev_err(dev->class_dev, "insn timeout. No data.\n");
dev->minor);
up(&udfs->sem); up(&udfs->sem);
return err; return err;
} }
...@@ -1297,15 +1289,13 @@ static int usbduxfast_ai_insn_read(struct comedi_device *dev, ...@@ -1297,15 +1289,13 @@ static int usbduxfast_ai_insn_read(struct comedi_device *dev,
udfs->transfer_buffer, SIZEINBUF, udfs->transfer_buffer, SIZEINBUF,
&actual_length, 10000); &actual_length, 10000);
if (err < 0) { if (err < 0) {
printk(KERN_ERR "comedi%d: insn data error: %d\n", dev_err(dev->class_dev, "insn data error: %d\n", err);
dev->minor, err);
up(&udfs->sem); up(&udfs->sem);
return err; return err;
} }
n = actual_length / sizeof(uint16_t); n = actual_length / sizeof(uint16_t);
if ((n % 16) != 0) { if ((n % 16) != 0) {
printk(KERN_ERR "comedi%d: insn data packet " dev_err(dev->class_dev, "insn data packet corrupted.\n");
"corrupted.\n", dev->minor);
up(&udfs->sem); up(&udfs->sem);
return -EINVAL; return -EINVAL;
} }
...@@ -1535,8 +1525,8 @@ static int usbduxfast_usb_probe(struct usb_interface *uinterf, ...@@ -1535,8 +1525,8 @@ static int usbduxfast_usb_probe(struct usb_interface *uinterf,
int ret; int ret;
if (udev->speed != USB_SPEED_HIGH) { if (udev->speed != USB_SPEED_HIGH) {
printk(KERN_ERR "comedi_: usbduxfast_: This driver needs" dev_err(&uinterf->dev,
"USB 2.0 to operate. Aborting...\n"); "This driver needs USB 2.0 to operate. Aborting...\n");
return -ENODEV; return -ENODEV;
} }
#ifdef CONFIG_COMEDI_DEBUG #ifdef CONFIG_COMEDI_DEBUG
...@@ -1555,7 +1545,8 @@ static int usbduxfast_usb_probe(struct usb_interface *uinterf, ...@@ -1555,7 +1545,8 @@ static int usbduxfast_usb_probe(struct usb_interface *uinterf,
/* no more space */ /* no more space */
if (index == -1) { if (index == -1) {
printk(KERN_ERR "Too many usbduxfast-devices connected.\n"); dev_err(&uinterf->dev,
"Too many usbduxfast-devices connected.\n");
up(&start_stop_sem); up(&start_stop_sem);
return -EMFILE; return -EMFILE;
} }
...@@ -1586,8 +1577,8 @@ static int usbduxfast_usb_probe(struct usb_interface *uinterf, ...@@ -1586,8 +1577,8 @@ static int usbduxfast_usb_probe(struct usb_interface *uinterf,
usbduxfastsub[index].dux_commands = kmalloc(SIZEOFDUXBUFFER, usbduxfastsub[index].dux_commands = kmalloc(SIZEOFDUXBUFFER,
GFP_KERNEL); GFP_KERNEL);
if (!usbduxfastsub[index].dux_commands) { if (!usbduxfastsub[index].dux_commands) {
printk(KERN_ERR "comedi_: usbduxfast: error alloc space for " dev_err(&uinterf->dev,
"dac commands\n"); "error alloc space for dac commands\n");
tidy_up(&(usbduxfastsub[index])); tidy_up(&(usbduxfastsub[index]));
up(&start_stop_sem); up(&start_stop_sem);
return -ENOMEM; return -ENOMEM;
...@@ -1595,8 +1586,8 @@ static int usbduxfast_usb_probe(struct usb_interface *uinterf, ...@@ -1595,8 +1586,8 @@ static int usbduxfast_usb_probe(struct usb_interface *uinterf,
/* create space of the instruction buffer */ /* create space of the instruction buffer */
usbduxfastsub[index].insnBuffer = kmalloc(SIZEINSNBUF, GFP_KERNEL); usbduxfastsub[index].insnBuffer = kmalloc(SIZEINSNBUF, GFP_KERNEL);
if (!usbduxfastsub[index].insnBuffer) { if (!usbduxfastsub[index].insnBuffer) {
printk(KERN_ERR "comedi_: usbduxfast: could not alloc space " dev_err(&uinterf->dev,
"for insnBuffer\n"); "could not alloc space for insnBuffer\n");
tidy_up(&(usbduxfastsub[index])); tidy_up(&(usbduxfastsub[index]));
up(&start_stop_sem); up(&start_stop_sem);
return -ENOMEM; return -ENOMEM;
...@@ -1605,24 +1596,25 @@ static int usbduxfast_usb_probe(struct usb_interface *uinterf, ...@@ -1605,24 +1596,25 @@ static int usbduxfast_usb_probe(struct usb_interface *uinterf,
i = usb_set_interface(usbduxfastsub[index].usbdev, i = usb_set_interface(usbduxfastsub[index].usbdev,
usbduxfastsub[index].ifnum, 1); usbduxfastsub[index].ifnum, 1);
if (i < 0) { if (i < 0) {
printk(KERN_ERR "comedi_: usbduxfast%d: could not switch to " dev_err(&uinterf->dev,
"alternate setting 1.\n", index); "usbduxfast%d: could not switch to alternate setting 1.\n",
index);
tidy_up(&(usbduxfastsub[index])); tidy_up(&(usbduxfastsub[index]));
up(&start_stop_sem); up(&start_stop_sem);
return -ENODEV; return -ENODEV;
} }
usbduxfastsub[index].urbIn = usb_alloc_urb(0, GFP_KERNEL); usbduxfastsub[index].urbIn = usb_alloc_urb(0, GFP_KERNEL);
if (!usbduxfastsub[index].urbIn) { if (!usbduxfastsub[index].urbIn) {
printk(KERN_ERR "comedi_: usbduxfast%d: Could not alloc." dev_err(&uinterf->dev,
"urb\n", index); "usbduxfast%d: Could not alloc. urb\n", index);
tidy_up(&(usbduxfastsub[index])); tidy_up(&(usbduxfastsub[index]));
up(&start_stop_sem); up(&start_stop_sem);
return -ENOMEM; return -ENOMEM;
} }
usbduxfastsub[index].transfer_buffer = kmalloc(SIZEINBUF, GFP_KERNEL); usbduxfastsub[index].transfer_buffer = kmalloc(SIZEINBUF, GFP_KERNEL);
if (!usbduxfastsub[index].transfer_buffer) { if (!usbduxfastsub[index].transfer_buffer) {
printk(KERN_ERR "comedi_: usbduxfast%d: could not alloc. " dev_err(&uinterf->dev,
"transb.\n", index); "usbduxfast%d: could not alloc. transb.\n", index);
tidy_up(&(usbduxfastsub[index])); tidy_up(&(usbduxfastsub[index]));
up(&start_stop_sem); up(&start_stop_sem);
return -ENOMEM; return -ENOMEM;
...@@ -1640,12 +1632,12 @@ static int usbduxfast_usb_probe(struct usb_interface *uinterf, ...@@ -1640,12 +1632,12 @@ static int usbduxfast_usb_probe(struct usb_interface *uinterf,
usbduxfast_firmware_request_complete_handler); usbduxfast_firmware_request_complete_handler);
if (ret) { if (ret) {
dev_err(&udev->dev, "could not load firmware (err=%d)\n", ret); dev_err(&uinterf->dev, "could not load firmware (err=%d)\n", ret);
return ret; return ret;
} }
printk(KERN_INFO "comedi_: usbduxfast%d has been successfully " dev_info(&uinterf->dev,
"initialized.\n", index); "usbduxfast%d has been successfully initialized.\n", index);
/* success */ /* success */
return 0; return 0;
} }
...@@ -1656,13 +1648,11 @@ static void usbduxfast_usb_disconnect(struct usb_interface *intf) ...@@ -1656,13 +1648,11 @@ static void usbduxfast_usb_disconnect(struct usb_interface *intf)
struct usb_device *udev = interface_to_usbdev(intf); struct usb_device *udev = interface_to_usbdev(intf);
if (!udfs) { if (!udfs) {
printk(KERN_ERR "comedi_: usbduxfast: disconnect called with " dev_err(&intf->dev, "disconnect called with null pointer.\n");
"null pointer.\n");
return; return;
} }
if (udfs->usbdev != udev) { if (udfs->usbdev != udev) {
printk(KERN_ERR "comedi_: usbduxfast: BUG! called with wrong " dev_err(&intf->dev, "BUG! called with wrong ptr!!!\n");
"ptr!!!\n");
return; return;
} }
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或