summaryrefslogtreecommitdiffstats
path: root/arch/m68k/atari/joystick.c
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>1998-03-17 22:05:47 +0000
committerRalf Baechle <ralf@linux-mips.org>1998-03-17 22:05:47 +0000
commit27cfca1ec98e91261b1a5355d10a8996464b63af (patch)
tree8e895a53e372fa682b4c0a585b9377d67ed70d0e /arch/m68k/atari/joystick.c
parent6a76fb7214c477ccf6582bd79c5b4ccc4f9c41b1 (diff)
Look Ma' what I found on my harddisk ...
o New faster syscalls for 2.1.x, too o Upgrade to 2.1.89. Don't try to run this. It's flaky as hell. But feel free to debug ...
Diffstat (limited to 'arch/m68k/atari/joystick.c')
-rw-r--r--arch/m68k/atari/joystick.c13
1 files changed, 7 insertions, 6 deletions
diff --git a/arch/m68k/atari/joystick.c b/arch/m68k/atari/joystick.c
index 2e33b151f..82eb85288 100644
--- a/arch/m68k/atari/joystick.c
+++ b/arch/m68k/atari/joystick.c
@@ -82,15 +82,16 @@ static int open_joystick(struct inode *inode, struct file *file)
return 0;
}
-static long write_joystick(struct inode *inode, struct file *file,
- const char *buffer, unsigned long count)
+static ssize_t write_joystick(struct file *file, const char *buffer,
+ size_t count, loff_t *ppos)
{
return -EINVAL;
}
-static long read_joystick(struct inode *inode, struct file *file,
- char *buffer, unsigned long count)
+static ssize_t read_joystick(struct file *file, char *buffer, size_t count,
+ loff_t *ppos)
{
+ struct inode *inode = file->f_dentry->d_inode;
int minor = DEVICE_NR(inode->i_rdev);
if (count < 2)
@@ -109,9 +110,9 @@ static long read_joystick(struct inode *inode, struct file *file,
static unsigned int joystick_poll(struct file *file, poll_table *wait)
{
- int minor = DEVICE_NR(file->f_inode->i_rdev);
+ int minor = DEVICE_NR(file->f_dentry->d_inode->i_rdev);
- poll_wait(&joystick[minor].wait, wait);
+ poll_wait(file, &joystick[minor].wait, wait);
if (joystick[minor].ready)
return POLLIN | POLLRDNORM;
return 0;