Skip to content

Commit

Permalink
pxa3xx-gcu: stop embedding file_operations into device-private object
Browse files Browse the repository at this point in the history
no need to do that anymore...

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
  • Loading branch information
Al Viro committed Apr 9, 2013
1 parent 996142e commit 264bd66
Showing 1 changed file with 8 additions and 7 deletions.
15 changes: 8 additions & 7 deletions drivers/video/pxa3xx-gcu.c
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,6 @@ struct pxa3xx_gcu_priv {
dma_addr_t shared_phys;
struct resource *resource_mem;
struct miscdevice misc_dev;
struct file_operations misc_fops;
wait_queue_head_t wait_idle;
wait_queue_head_t wait_free;
spinlock_t spinlock;
Expand Down Expand Up @@ -577,6 +576,13 @@ free_buffers(struct platform_device *dev,
priv->free = NULL;
}

static const struct file_operations misc_fops = {
.owner = THIS_MODULE,
.write = pxa3xx_gcu_misc_write,
.unlocked_ioctl = pxa3xx_gcu_misc_ioctl,
.mmap = pxa3xx_gcu_misc_mmap
};

static int pxa3xx_gcu_probe(struct platform_device *dev)
{
int i, ret, irq;
Expand Down Expand Up @@ -604,14 +610,9 @@ static int pxa3xx_gcu_probe(struct platform_device *dev)
* container_of(). This isn't really necessary as we have a fixed minor
* number anyway, but this is to avoid statics. */

priv->misc_fops.owner = THIS_MODULE;
priv->misc_fops.write = pxa3xx_gcu_misc_write;
priv->misc_fops.unlocked_ioctl = pxa3xx_gcu_misc_ioctl;
priv->misc_fops.mmap = pxa3xx_gcu_misc_mmap;

priv->misc_dev.minor = MISCDEV_MINOR,
priv->misc_dev.name = DRV_NAME,
priv->misc_dev.fops = &priv->misc_fops,
priv->misc_dev.fops = &misc_fops,

/* register misc device */
ret = misc_register(&priv->misc_dev);
Expand Down

0 comments on commit 264bd66

Please sign in to comment.