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)
SVN-Revision: 27322
This commit is contained in:
parent
07abf4a81e
commit
a41f80bca1
6 changed files with 3 additions and 58 deletions
|
@ -32,6 +32,7 @@
|
||||||
#include <linux/device.h>
|
#include <linux/device.h>
|
||||||
#include <linux/platform_device.h>
|
#include <linux/platform_device.h>
|
||||||
#include <linux/gpio_dev.h>
|
#include <linux/gpio_dev.h>
|
||||||
|
#include <linux/fs.h>
|
||||||
|
|
||||||
#define DRVNAME "gpiodev"
|
#define DRVNAME "gpiodev"
|
||||||
#define DEVNAME "gpio"
|
#define DEVNAME "gpio"
|
||||||
|
@ -42,8 +43,7 @@ static struct class *gpiodev_class;
|
||||||
|
|
||||||
/* third argument of user space ioctl ('arg' here) contains the <pin> */
|
/* third argument of user space ioctl ('arg' here) contains the <pin> */
|
||||||
static int
|
static int
|
||||||
gpio_ioctl(struct inode * inode, struct file * file, unsigned int cmd,
|
gpio_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
|
||||||
unsigned long arg)
|
|
||||||
{
|
{
|
||||||
int retval = 0;
|
int retval = 0;
|
||||||
|
|
||||||
|
@ -114,7 +114,7 @@ gpio_close(struct inode * inode, struct file * file)
|
||||||
}
|
}
|
||||||
|
|
||||||
struct file_operations gpio_fops = {
|
struct file_operations gpio_fops = {
|
||||||
ioctl: gpio_ioctl,
|
unlocked_ioctl: gpio_ioctl,
|
||||||
open: gpio_open,
|
open: gpio_open,
|
||||||
release: gpio_close
|
release: gpio_close
|
||||||
};
|
};
|
||||||
|
|
|
@ -1,11 +0,0 @@
|
||||||
--- a/drivers/char/gpio_dev.c
|
|
||||||
+++ b/drivers/char/gpio_dev.c
|
|
||||||
@@ -114,7 +114,7 @@ gpio_close(struct inode * inode, struct
|
|
||||||
}
|
|
||||||
|
|
||||||
struct file_operations gpio_fops = {
|
|
||||||
- ioctl: gpio_ioctl,
|
|
||||||
+ unlocked_ioctl: gpio_ioctl,
|
|
||||||
open: gpio_open,
|
|
||||||
release: gpio_close
|
|
||||||
};
|
|
|
@ -1,11 +0,0 @@
|
||||||
--- a/drivers/char/gpio_dev.c
|
|
||||||
+++ b/drivers/char/gpio_dev.c
|
|
||||||
@@ -114,7 +114,7 @@ gpio_close(struct inode * inode, struct
|
|
||||||
}
|
|
||||||
|
|
||||||
struct file_operations gpio_fops = {
|
|
||||||
- ioctl: gpio_ioctl,
|
|
||||||
+ unlocked_ioctl: gpio_ioctl,
|
|
||||||
open: gpio_open,
|
|
||||||
release: gpio_close
|
|
||||||
};
|
|
|
@ -1,11 +0,0 @@
|
||||||
--- a/drivers/char/gpio_dev.c
|
|
||||||
+++ b/drivers/char/gpio_dev.c
|
|
||||||
@@ -114,7 +114,7 @@ gpio_close(struct inode * inode, struct
|
|
||||||
}
|
|
||||||
|
|
||||||
struct file_operations gpio_fops = {
|
|
||||||
- ioctl: gpio_ioctl,
|
|
||||||
+ unlocked_ioctl: gpio_ioctl,
|
|
||||||
open: gpio_open,
|
|
||||||
release: gpio_close
|
|
||||||
};
|
|
|
@ -1,11 +0,0 @@
|
||||||
--- a/drivers/char/gpio_dev.c
|
|
||||||
+++ b/drivers/char/gpio_dev.c
|
|
||||||
@@ -114,7 +114,7 @@ gpio_close(struct inode * inode, struct
|
|
||||||
}
|
|
||||||
|
|
||||||
struct file_operations gpio_fops = {
|
|
||||||
- ioctl: gpio_ioctl,
|
|
||||||
+ unlocked_ioctl: gpio_ioctl,
|
|
||||||
open: gpio_open,
|
|
||||||
release: gpio_close
|
|
||||||
};
|
|
|
@ -1,11 +0,0 @@
|
||||||
--- a/drivers/char/gpio_dev.c
|
|
||||||
+++ b/drivers/char/gpio_dev.c
|
|
||||||
@@ -114,7 +114,7 @@ gpio_close(struct inode * inode, struct
|
|
||||||
}
|
|
||||||
|
|
||||||
struct file_operations gpio_fops = {
|
|
||||||
- ioctl: gpio_ioctl,
|
|
||||||
+ unlocked_ioctl: gpio_ioctl,
|
|
||||||
open: gpio_open,
|
|
||||||
release: gpio_close
|
|
||||||
};
|
|
Loading…
Reference in a new issue