projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ieee1394: sbp2: remove debug macros
[powerpc.git]
/
drivers
/
ieee1394
/
video1394.c
diff --git
a/drivers/ieee1394/video1394.c
b/drivers/ieee1394/video1394.c
index
9bc6505
..
77f58bc
100644
(file)
--- a/
drivers/ieee1394/video1394.c
+++ b/
drivers/ieee1394/video1394.c
@@
-714,8
+714,8
@@
static inline unsigned video1394_buffer_state(struct dma_iso_ctx *d,
return ret;
}
return ret;
}
-static
int __
video1394_ioctl(struct file *file,
-
unsigned int cmd, unsigned long arg)
+static
long
video1394_ioctl(struct file *file,
+ unsigned int cmd, unsigned long arg)
{
struct file_ctx *ctx = (struct file_ctx *)file->private_data;
struct ti_ohci *ohci = ctx->ohci;
{
struct file_ctx *ctx = (struct file_ctx *)file->private_data;
struct ti_ohci *ohci = ctx->ohci;
@@
-884,13
+884,14
@@
static int __video1394_ioctl(struct file *file,
struct dma_iso_ctx *d;
int next_prg;
struct dma_iso_ctx *d;
int next_prg;
- if (
copy_from_user(&v, argp, sizeof(v
)))
+ if (
unlikely(copy_from_user(&v, argp, sizeof(v)
)))
return -EFAULT;
d = find_ctx(&ctx->context_list, OHCI_ISO_RECEIVE, v.channel);
return -EFAULT;
d = find_ctx(&ctx->context_list, OHCI_ISO_RECEIVE, v.channel);
- if (d == NULL) return -EFAULT;
+ if (unlikely(d == NULL))
+ return -EFAULT;
- if (
(v.buffer<0) || (v.buffer>=d->num_desc - 1
)) {
+ if (
unlikely((v.buffer<0) || (v.buffer>=d->num_desc - 1)
)) {
PRINT(KERN_ERR, ohci->host->id,
"Buffer %d out of range",v.buffer);
return -EINVAL;
PRINT(KERN_ERR, ohci->host->id,
"Buffer %d out of range",v.buffer);
return -EINVAL;
@@
-898,7
+899,7
@@
static int __video1394_ioctl(struct file *file,
spin_lock_irqsave(&d->lock,flags);
spin_lock_irqsave(&d->lock,flags);
- if (
d->buffer_status[v.buffer]==VIDEO1394_BUFFER_QUEUED
) {
+ if (
unlikely(d->buffer_status[v.buffer]==VIDEO1394_BUFFER_QUEUED)
) {
PRINT(KERN_ERR, ohci->host->id,
"Buffer %d is already used",v.buffer);
spin_unlock_irqrestore(&d->lock,flags);
PRINT(KERN_ERR, ohci->host->id,
"Buffer %d is already used",v.buffer);
spin_unlock_irqrestore(&d->lock,flags);
@@
-949,13
+950,14
@@
static int __video1394_ioctl(struct file *file,
struct dma_iso_ctx *d;
int i = 0;
struct dma_iso_ctx *d;
int i = 0;
- if (
copy_from_user(&v, argp, sizeof(v
)))
+ if (
unlikely(copy_from_user(&v, argp, sizeof(v)
)))
return -EFAULT;
d = find_ctx(&ctx->context_list, OHCI_ISO_RECEIVE, v.channel);
return -EFAULT;
d = find_ctx(&ctx->context_list, OHCI_ISO_RECEIVE, v.channel);
- if (d == NULL) return -EFAULT;
+ if (unlikely(d == NULL))
+ return -EFAULT;
- if (
(v.buffer<0) || (v.buffer>d->num_desc - 1
)) {
+ if (
unlikely((v.buffer<0) || (v.buffer>d->num_desc - 1)
)) {
PRINT(KERN_ERR, ohci->host->id,
"Buffer %d out of range",v.buffer);
return -EINVAL;
PRINT(KERN_ERR, ohci->host->id,
"Buffer %d out of range",v.buffer);
return -EINVAL;
@@
-1008,7
+1010,7
@@
static int __video1394_ioctl(struct file *file,
spin_unlock_irqrestore(&d->lock, flags);
v.buffer=i;
spin_unlock_irqrestore(&d->lock, flags);
v.buffer=i;
- if (
copy_to_user(argp, &v, sizeof(v
)))
+ if (
unlikely(copy_to_user(argp, &v, sizeof(v)
)))
return -EFAULT;
return 0;
return -EFAULT;
return 0;
@@
-1156,15
+1158,6
@@
static int __video1394_ioctl(struct file *file,
}
}
}
}
-static long video1394_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
-{
- int err;
- lock_kernel();
- err = __video1394_ioctl(file, cmd, arg);
- unlock_kernel();
- return err;
-}
-
/*
* This maps the vmalloced and reserved buffer to user space.
*
/*
* This maps the vmalloced and reserved buffer to user space.
*
@@
-1177,17
+1170,14
@@
static long video1394_ioctl(struct file *file, unsigned int cmd, unsigned long a
static int video1394_mmap(struct file *file, struct vm_area_struct *vma)
{
struct file_ctx *ctx = (struct file_ctx *)file->private_data;
static int video1394_mmap(struct file *file, struct vm_area_struct *vma)
{
struct file_ctx *ctx = (struct file_ctx *)file->private_data;
- int res = -EINVAL;
- lock_kernel();
if (ctx->current_ctx == NULL) {
PRINT(KERN_ERR, ctx->ohci->host->id,
"Current iso context not set");
if (ctx->current_ctx == NULL) {
PRINT(KERN_ERR, ctx->ohci->host->id,
"Current iso context not set");
- } else
- res = dma_region_mmap(&ctx->current_ctx->dma, file, vma);
- unlock_kernel();
+ return -EINVAL;
+ }
- return
res
;
+ return
dma_region_mmap(&ctx->current_ctx->dma, file, vma)
;
}
static unsigned int video1394_poll(struct file *file, poll_table *pt)
}
static unsigned int video1394_poll(struct file *file, poll_table *pt)
@@
-1198,14
+1188,12
@@
static unsigned int video1394_poll(struct file *file, poll_table *pt)
struct dma_iso_ctx *d;
int i;
struct dma_iso_ctx *d;
int i;
- lock_kernel();
ctx = file->private_data;
d = ctx->current_ctx;
if (d == NULL) {
PRINT(KERN_ERR, ctx->ohci->host->id,
"Current iso context not set");
ctx = file->private_data;
d = ctx->current_ctx;
if (d == NULL) {
PRINT(KERN_ERR, ctx->ohci->host->id,
"Current iso context not set");
- mask = POLLERR;
- goto done;
+ return POLLERR;
}
poll_wait(file, &d->waitq, pt);
}
poll_wait(file, &d->waitq, pt);
@@
-1218,8
+1206,6
@@
static unsigned int video1394_poll(struct file *file, poll_table *pt)
}
}
spin_unlock_irqrestore(&d->lock, flags);
}
}
spin_unlock_irqrestore(&d->lock, flags);
-done:
- unlock_kernel();
return mask;
}
return mask;
}
@@
-1255,7
+1241,6
@@
static int video1394_release(struct inode *inode, struct file *file)
struct list_head *lh, *next;
u64 mask;
struct list_head *lh, *next;
u64 mask;
- lock_kernel();
list_for_each_safe(lh, next, &ctx->context_list) {
struct dma_iso_ctx *d;
d = list_entry(lh, struct dma_iso_ctx, link);
list_for_each_safe(lh, next, &ctx->context_list) {
struct dma_iso_ctx *d;
d = list_entry(lh, struct dma_iso_ctx, link);
@@
-1276,7
+1261,6
@@
static int video1394_release(struct inode *inode, struct file *file)
kfree(ctx);
file->private_data = NULL;
kfree(ctx);
file->private_data = NULL;
- unlock_kernel();
return 0;
}
return 0;
}