projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.kernel.org:/home/rmk/linux-2.6-arm
[powerpc.git]
/
drivers
/
misc
/
sony-laptop.c
diff --git
a/drivers/misc/sony-laptop.c
b/drivers/misc/sony-laptop.c
index
1bfbb87
..
b0f6803
100644
(file)
--- a/
drivers/misc/sony-laptop.c
+++ b/
drivers/misc/sony-laptop.c
@@
-14,7
+14,7
@@
*
* Copyright (C) 2005 Narayanan R S <nars@kadamba.org>
*
*
* Copyright (C) 2005 Narayanan R S <nars@kadamba.org>
*
- * Copyright (C) 2001-2002 Alc
ô
ve <www.alcove.com>
+ * Copyright (C) 2001-2002 Alc
ô
ve <www.alcove.com>
*
* Copyright (C) 2001 Michael Ashley <m.ashley@unsw.edu.au>
*
*
* Copyright (C) 2001 Michael Ashley <m.ashley@unsw.edu.au>
*
@@
-277,7
+277,7
@@
static void do_sony_laptop_release_key(struct work_struct *work)
static DECLARE_WORK(sony_laptop_release_key_work,
do_sony_laptop_release_key);
static DECLARE_WORK(sony_laptop_release_key_work,
do_sony_laptop_release_key);
-/* forward event to the input subsytem */
+/* forward event to the input subsy
s
tem */
static void sony_laptop_report_input_event(u8 event)
{
struct input_dev *jog_dev = sony_laptop_input.jog_dev;
static void sony_laptop_report_input_event(u8 event)
{
struct input_dev *jog_dev = sony_laptop_input.jog_dev;
@@
-338,7
+338,7
@@
static void sony_laptop_report_input_event(u8 event)
dprintk("unknown input event %.2x\n", event);
}
dprintk("unknown input event %.2x\n", event);
}
-static int sony_laptop_setup_input(
void
)
+static int sony_laptop_setup_input(
struct acpi_device *acpi_device
)
{
struct input_dev *jog_dev;
struct input_dev *key_dev;
{
struct input_dev *jog_dev;
struct input_dev *key_dev;
@@
-379,6
+379,7
@@
static int sony_laptop_setup_input(void)
key_dev->name = "Sony Vaio Keys";
key_dev->id.bustype = BUS_ISA;
key_dev->id.vendor = PCI_VENDOR_ID_SONY;
key_dev->name = "Sony Vaio Keys";
key_dev->id.bustype = BUS_ISA;
key_dev->id.vendor = PCI_VENDOR_ID_SONY;
+ key_dev->dev.parent = &acpi_device->dev;
/* Initialize the Input Drivers: special keys */
set_bit(EV_KEY, key_dev->evbit);
/* Initialize the Input Drivers: special keys */
set_bit(EV_KEY, key_dev->evbit);
@@
-410,6
+411,7
@@
static int sony_laptop_setup_input(void)
jog_dev->name = "Sony Vaio Jogdial";
jog_dev->id.bustype = BUS_ISA;
jog_dev->id.vendor = PCI_VENDOR_ID_SONY;
jog_dev->name = "Sony Vaio Jogdial";
jog_dev->id.bustype = BUS_ISA;
jog_dev->id.vendor = PCI_VENDOR_ID_SONY;
+ key_dev->dev.parent = &acpi_device->dev;
jog_dev->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_REL);
jog_dev->keybit[BIT_WORD(BTN_MOUSE)] = BIT_MASK(BTN_MIDDLE);
jog_dev->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_REL);
jog_dev->keybit[BIT_WORD(BTN_MOUSE)] = BIT_MASK(BTN_MIDDLE);
@@
-1006,7
+1008,7
@@
static int sony_nc_add(struct acpi_device *device)
}
/* setup input devices and helper fifo */
}
/* setup input devices and helper fifo */
- result = sony_laptop_setup_input();
+ result = sony_laptop_setup_input(
device
);
if (result) {
printk(KERN_ERR DRV_PFX
"Unabe to create input devices.\n");
if (result) {
printk(KERN_ERR DRV_PFX
"Unabe to create input devices.\n");
@@
-1034,7
+1036,7
@@
static int sony_nc_add(struct acpi_device *device)
sony_backlight_device->props.brightness =
sony_backlight_get_brightness
(sony_backlight_device);
sony_backlight_device->props.brightness =
sony_backlight_get_brightness
(sony_backlight_device);
- sony_backlight_device->props.max_brightness =
+ sony_backlight_device->props.max_brightness =
SONY_MAX_BRIGHTNESS - 1;
}
SONY_MAX_BRIGHTNESS - 1;
}
@@
-2453,7
+2455,7
@@
static int sony_pic_add(struct acpi_device *device)
}
/* setup input devices and helper fifo */
}
/* setup input devices and helper fifo */
- result = sony_laptop_setup_input();
+ result = sony_laptop_setup_input(
device
);
if (result) {
printk(KERN_ERR DRV_PFX
"Unabe to create input devices.\n");
if (result) {
printk(KERN_ERR DRV_PFX
"Unabe to create input devices.\n");