Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

pxa3xx-gcu: stop embedding file_operations into device-private object

no need to do that anymore...

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

Al Viro 264bd660 996142e6

+8 -7
+8 -7
drivers/video/pxa3xx-gcu.c
··· 101 101 dma_addr_t shared_phys; 102 102 struct resource *resource_mem; 103 103 struct miscdevice misc_dev; 104 - struct file_operations misc_fops; 105 104 wait_queue_head_t wait_idle; 106 105 wait_queue_head_t wait_free; 107 106 spinlock_t spinlock; ··· 576 577 priv->free = NULL; 577 578 } 578 579 580 + static const struct file_operations misc_fops = { 581 + .owner = THIS_MODULE, 582 + .write = pxa3xx_gcu_misc_write, 583 + .unlocked_ioctl = pxa3xx_gcu_misc_ioctl, 584 + .mmap = pxa3xx_gcu_misc_mmap 585 + }; 586 + 579 587 static int pxa3xx_gcu_probe(struct platform_device *dev) 580 588 { 581 589 int i, ret, irq; ··· 610 604 * container_of(). This isn't really necessary as we have a fixed minor 611 605 * number anyway, but this is to avoid statics. */ 612 606 613 - priv->misc_fops.owner = THIS_MODULE; 614 - priv->misc_fops.write = pxa3xx_gcu_misc_write; 615 - priv->misc_fops.unlocked_ioctl = pxa3xx_gcu_misc_ioctl; 616 - priv->misc_fops.mmap = pxa3xx_gcu_misc_mmap; 617 - 618 607 priv->misc_dev.minor = MISCDEV_MINOR, 619 608 priv->misc_dev.name = DRV_NAME, 620 - priv->misc_dev.fops = &priv->misc_fops, 609 + priv->misc_dev.fops = &misc_fops, 621 610 622 611 /* register misc device */ 623 612 ret = misc_register(&priv->misc_dev);