git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
drivers
/
char
/
sonypi.c
diff --git
a/drivers/char/sonypi.c
b/drivers/char/sonypi.c
index
d4e434d
..
17d54e1
100644
(file)
--- a/
drivers/char/sonypi.c
+++ b/
drivers/char/sonypi.c
@@
-765,7
+765,7
@@
static void sonypi_setbluetoothpower(u8 state)
sonypi_device.bluetooth_power = state;
}
sonypi_device.bluetooth_power = state;
}
-static void input_keyrelease(
void *data
)
+static void input_keyrelease(
struct work_struct *work
)
{
struct sonypi_keypress kp;
{
struct sonypi_keypress kp;
@@
-826,7
+826,7
@@
static void sonypi_report_input_event(u8 event)
}
/* Interrupt handler: some event is available */
}
/* Interrupt handler: some event is available */
-static irqreturn_t sonypi_irq(int irq, void *dev_id
, struct pt_regs *regs
)
+static irqreturn_t sonypi_irq(int irq, void *dev_id)
{
u8 v1, v2, event = 0;
int i, j;
{
u8 v1, v2, event = 0;
int i, j;
@@
-979,7
+979,7
@@
static ssize_t sonypi_misc_read(struct file *file, char __user *buf,
}
if (ret > 0) {
}
if (ret > 0) {
- struct inode *inode = file->f_dentry->d_inode;
+ struct inode *inode = file->f_
path.
dentry->d_inode;
inode->i_atime = current_fs_time(inode->i_sb);
}
inode->i_atime = current_fs_time(inode->i_sb);
}
@@
-1412,7
+1412,7
@@
static int __devinit sonypi_probe(struct platform_device *dev)
goto err_inpdev_unregister;
}
goto err_inpdev_unregister;
}
- INIT_WORK(&sonypi_device.input_work, input_keyrelease
, NULL
);
+ INIT_WORK(&sonypi_device.input_work, input_keyrelease);
}
sonypi_enable(0);
}
sonypi_enable(0);