summaryrefslogtreecommitdiffstats
path: root/target/linux/generic/files/drivers/char
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2011-07-01 03:20:13 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2011-07-01 03:20:13 +0000
commitce9cff25768b1defdee5fc275c428729db1989a4 (patch)
tree6c516f0435abce2d9613e3f5cac63cb33db02e92 /target/linux/generic/files/drivers/char
parent86a3fe1a88dce6531edb8653c45ff2477d6fa9d9 (diff)
fix the gpio_dev driver: remove existing forward port patches, use unlocked_ioctl on all platforms and fix the arguments to the ioctl handler (based on patch from #9198)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@27322 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/files/drivers/char')
-rw-r--r--target/linux/generic/files/drivers/char/gpio_dev.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/generic/files/drivers/char/gpio_dev.c b/target/linux/generic/files/drivers/char/gpio_dev.c
index e6d5b1d05..0f428bd38 100644
--- a/target/linux/generic/files/drivers/char/gpio_dev.c
+++ b/target/linux/generic/files/drivers/char/gpio_dev.c
@@ -32,6 +32,7 @@
#include <linux/device.h>
#include <linux/platform_device.h>
#include <linux/gpio_dev.h>
+#include <linux/fs.h>
#define DRVNAME "gpiodev"
#define DEVNAME "gpio"
@@ -42,8 +43,7 @@ static struct class *gpiodev_class;
/* third argument of user space ioctl ('arg' here) contains the <pin> */
static int
-gpio_ioctl(struct inode * inode, struct file * file, unsigned int cmd,
- unsigned long arg)
+gpio_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
{
int retval = 0;
@@ -114,7 +114,7 @@ gpio_close(struct inode * inode, struct file * file)
}
struct file_operations gpio_fops = {
- ioctl: gpio_ioctl,
+ unlocked_ioctl: gpio_ioctl,
open: gpio_open,
release: gpio_close
};