evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "fbdev: pxa3xx-gcu: remove redundant implementation of open()"

Browse source 
This reverts commit 2bfeeca107.

Not needed after the next patch is applied.

Cc: Martin Kepplinger <martink@posteo.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Greg Kroah-Hartman 2014-11-14 16:49:20 -08:00
parent 1b6f47537c
commit 4bc33a2cd5
1 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
drivers/video/fbdev/pxa3xx-gcu.c
View file

@ -373,6 +373,15 @@ static inline struct pxa3xx_gcu_priv *to_pxa3xx_gcu_priv(struct file *file)
return container_of(dev, struct pxa3xx_gcu_priv, misc_dev); return container_of(dev, struct pxa3xx_gcu_priv, misc_dev);
} }
/*
* provide an empty .open callback, so the core sets file->private_data
* for us.
*/
static int pxa3xx_gcu_open(struct inode *inode, struct file *file)
{
return 0;
}
static ssize_t static ssize_t
pxa3xx_gcu_write(struct file *file, const char *buff, pxa3xx_gcu_write(struct file *file, const char *buff,
size_t count, loff_t *offp) size_t count, loff_t *offp)
@ -571,6 +580,7 @@ pxa3xx_gcu_free_buffers(struct device *dev,
static const struct file_operations pxa3xx_gcu_miscdev_fops = { static const struct file_operations pxa3xx_gcu_miscdev_fops = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
.open = pxa3xx_gcu_open,
.write = pxa3xx_gcu_write, .write = pxa3xx_gcu_write,
.unlocked_ioctl = pxa3xx_gcu_ioctl, .unlocked_ioctl = pxa3xx_gcu_ioctl,
.mmap = pxa3xx_gcu_mmap, .mmap = pxa3xx_gcu_mmap,