aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJ.R. Mauro <jrm8005@gmail.com>2009-03-28 00:10:35 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2009-06-19 14:00:54 -0400
commit6546f08d21921ee13b6265493bebcff750090791 (patch)
treedaec0fff54d0ee0da3cef93ac605bf3072d4eac0
parentf82ebea5c8ef9ed9378fc6402051a4860a805397 (diff)
Staging: rspiusb: make driver compile
Convert undefined info() function calls to dev_err, making rspiusb compile Signed-off-by: J.R. Mauro <jrm8005@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--drivers/staging/rspiusb/rspiusb.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/staging/rspiusb/rspiusb.c b/drivers/staging/rspiusb/rspiusb.c
index ecaffb503111..b2339724a315 100644
--- a/drivers/staging/rspiusb/rspiusb.c
+++ b/drivers/staging/rspiusb/rspiusb.c
@@ -217,7 +217,7 @@ static int piusb_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
217 case PIUSB_GETVNDCMD: 217 case PIUSB_GETVNDCMD:
218 if (copy_from_user 218 if (copy_from_user
219 (&ctrl, (void __user *)arg, sizeof(struct ioctl_struct))) 219 (&ctrl, (void __user *)arg, sizeof(struct ioctl_struct)))
220 info("copy_from_user failed\n"); 220 dev_err(&pdx->udev->dev, "copy_from_user failed\n");
221 dbg("%s %x\n", "Get Vendor Command = ", ctrl.cmd); 221 dbg("%s %x\n", "Get Vendor Command = ", ctrl.cmd);
222 retval = 222 retval =
223 usb_control_msg(pdx->udev, usb_rcvctrlpipe(pdx->udev, 0), 223 usb_control_msg(pdx->udev, usb_rcvctrlpipe(pdx->udev, 0),
@@ -231,7 +231,7 @@ static int piusb_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
231 case PIUSB_SETVNDCMD: 231 case PIUSB_SETVNDCMD:
232 if (copy_from_user 232 if (copy_from_user
233 (&ctrl, (void __user *)arg, sizeof(struct ioctl_struct))) 233 (&ctrl, (void __user *)arg, sizeof(struct ioctl_struct)))
234 info("copy_from_user failed\n"); 234 dev_err(&pdx->udev->dev, "copy_from_user failed\n");
235// dbg( "%s %x", "Set Vendor Command = ",ctrl.cmd ); 235// dbg( "%s %x", "Set Vendor Command = ",ctrl.cmd );
236 controlData = ctrl.pData[0]; 236 controlData = ctrl.pData[0];
237 controlData |= (ctrl.pData[1] << 8); 237 controlData |= (ctrl.pData[1] << 8);
@@ -247,7 +247,7 @@ static int piusb_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
247 break; 247 break;
248 case PIUSB_WRITEPIPE: 248 case PIUSB_WRITEPIPE:
249 if (copy_from_user(&ctrl, (void __user *)arg, _IOC_SIZE(cmd))) 249 if (copy_from_user(&ctrl, (void __user *)arg, _IOC_SIZE(cmd)))
250 info("copy_from_user WRITE_DUMMY failed\n"); 250 dev_err(&pdx->udev->dev, "copy_from_user WRITE_DUMMY failed\n");
251 if (!access_ok(VERIFY_READ, ctrl.pData, ctrl.numbytes)) { 251 if (!access_ok(VERIFY_READ, ctrl.pData, ctrl.numbytes)) {
252 dbg("can't access pData"); 252 dbg("can't access pData");
253 return 0; 253 return 0;
@@ -258,7 +258,7 @@ static int piusb_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
258 case PIUSB_USERBUFFER: 258 case PIUSB_USERBUFFER:
259 if (copy_from_user 259 if (copy_from_user
260 (&ctrl, (void __user *)arg, sizeof(struct ioctl_struct))) 260 (&ctrl, (void __user *)arg, sizeof(struct ioctl_struct)))
261 info("copy_from_user failed\n"); 261 dev_err(&pdx->udev->dev, "copy_from_user failed\n");
262 return MapUserBuffer((struct ioctl_struct *) & ctrl, pdx); 262 return MapUserBuffer((struct ioctl_struct *) & ctrl, pdx);
263 break; 263 break;
264 case PIUSB_UNMAP_USERBUFFER: 264 case PIUSB_UNMAP_USERBUFFER:
@@ -268,7 +268,7 @@ static int piusb_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
268 case PIUSB_READPIPE: 268 case PIUSB_READPIPE:
269 if (copy_from_user 269 if (copy_from_user
270 (&ctrl, (void __user *)arg, sizeof(struct ioctl_struct))) 270 (&ctrl, (void __user *)arg, sizeof(struct ioctl_struct)))
271 info("copy_from_user failed\n"); 271 dev_err(&pdx->udev->dev, "copy_from_user failed\n");
272 switch (ctrl.endpoint) { 272 switch (ctrl.endpoint) {
273 case 0: //ST133 Pixel Data or PIXIS IO 273 case 0: //ST133 Pixel Data or PIXIS IO
274 if (pdx->iama == PIXIS_PID) { 274 if (pdx->iama == PIXIS_PID) {
@@ -387,7 +387,7 @@ static int piusb_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
387 dbg("PIUSB_SETFRAMESIZE"); 387 dbg("PIUSB_SETFRAMESIZE");
388 if (copy_from_user 388 if (copy_from_user
389 (&ctrl, (void __user *)arg, sizeof(struct ioctl_struct))) 389 (&ctrl, (void __user *)arg, sizeof(struct ioctl_struct)))
390 info("copy_from_user failed\n"); 390 dev_err(&pdx->udev->dev, "copy_from_user failed\n");
391 pdx->frameSize = ctrl.numbytes; 391 pdx->frameSize = ctrl.numbytes;
392 pdx->num_frames = ctrl.numFrames; 392 pdx->num_frames = ctrl.numFrames;
393 if (!pdx->sgl) 393 if (!pdx->sgl)
@@ -449,7 +449,7 @@ int piusb_output(struct ioctl_struct * io, unsigned char *uBuf, int len,
449 usb_buffer_alloc(pdx->udev, len, GFP_KERNEL, 449 usb_buffer_alloc(pdx->udev, len, GFP_KERNEL,
450 &urb->transfer_dma); 450 &urb->transfer_dma);
451 if (!kbuf) { 451 if (!kbuf) {
452 info("buffer_alloc failed\n"); 452 dev_err(&pdx->udev->dev, "buffer_alloc failed\n");
453 return -ENOMEM; 453 return -ENOMEM;
454 } 454 }
455 memcpy(kbuf, uBuf, len); 455 memcpy(kbuf, uBuf, len);