OSDN Git Service

Revert "fbdev: pxa3xx-gcu: remove redundant implementation of open()"
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 15 Nov 2014 00:49:20 +0000 (16:49 -0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 15 Nov 2014 00:49:41 +0000 (16:49 -0800)
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>
drivers/video/fbdev/pxa3xx-gcu.c

index 7678a94..4df3657 100644 (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);
 }
 
+/*
+ * 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
 pxa3xx_gcu_write(struct file *file, const char *buff,
                 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 = {
        .owner =                THIS_MODULE,
+       .open =                 pxa3xx_gcu_open,
        .write =                pxa3xx_gcu_write,
        .unlocked_ioctl =       pxa3xx_gcu_ioctl,
        .mmap =                 pxa3xx_gcu_mmap,