diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-11-14 19:49:20 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-11-14 19:49:41 -0500 |
commit | 4bc33a2cd5070188c79029a8a9f2058dfd2a79a8 (patch) | |
tree | 77047bf8d381df29334d125f825940161e26746c | |
parent | 1b6f47537c86494bb525c31e695ae3a1dfd953ca (diff) |
Revert "fbdev: pxa3xx-gcu: remove redundant implementation of open()"
This reverts commit 2bfeeca107591134bf9a40945c50d337bf858612.
Not needed after the next patch is applied.
Cc: Martin Kepplinger <martink@posteo.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r-- | drivers/video/fbdev/pxa3xx-gcu.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/drivers/video/fbdev/pxa3xx-gcu.c b/drivers/video/fbdev/pxa3xx-gcu.c index 7678a94cea7f..4df3657fe221 100644 --- a/drivers/video/fbdev/pxa3xx-gcu.c +++ b/drivers/video/fbdev/pxa3xx-gcu.c | |||
@@ -373,6 +373,15 @@ static inline struct pxa3xx_gcu_priv *to_pxa3xx_gcu_priv(struct file *file) | |||
373 | return container_of(dev, struct pxa3xx_gcu_priv, misc_dev); | 373 | return container_of(dev, struct pxa3xx_gcu_priv, misc_dev); |
374 | } | 374 | } |
375 | 375 | ||
376 | /* | ||
377 | * provide an empty .open callback, so the core sets file->private_data | ||
378 | * for us. | ||
379 | */ | ||
380 | static int pxa3xx_gcu_open(struct inode *inode, struct file *file) | ||
381 | { | ||
382 | return 0; | ||
383 | } | ||
384 | |||
376 | static ssize_t | 385 | static ssize_t |
377 | pxa3xx_gcu_write(struct file *file, const char *buff, | 386 | pxa3xx_gcu_write(struct file *file, const char *buff, |
378 | size_t count, loff_t *offp) | 387 | size_t count, loff_t *offp) |
@@ -571,6 +580,7 @@ pxa3xx_gcu_free_buffers(struct device *dev, | |||
571 | 580 | ||
572 | static const struct file_operations pxa3xx_gcu_miscdev_fops = { | 581 | static const struct file_operations pxa3xx_gcu_miscdev_fops = { |
573 | .owner = THIS_MODULE, | 582 | .owner = THIS_MODULE, |
583 | .open = pxa3xx_gcu_open, | ||
574 | .write = pxa3xx_gcu_write, | 584 | .write = pxa3xx_gcu_write, |
575 | .unlocked_ioctl = pxa3xx_gcu_ioctl, | 585 | .unlocked_ioctl = pxa3xx_gcu_ioctl, |
576 | .mmap = pxa3xx_gcu_mmap, | 586 | .mmap = pxa3xx_gcu_mmap, |