diff options
Diffstat (limited to 'drivers/misc')
-rw-r--r-- | drivers/misc/asus-laptop.c | 2 | ||||
-rw-r--r-- | drivers/misc/sony-laptop.c | 4 | ||||
-rw-r--r-- | drivers/misc/thinkpad_acpi.c | 8 |
3 files changed, 7 insertions, 7 deletions
diff --git a/drivers/misc/asus-laptop.c b/drivers/misc/asus-laptop.c index d0fc4fd212e6..f8ae58f01637 100644 --- a/drivers/misc/asus-laptop.c +++ b/drivers/misc/asus-laptop.c | |||
@@ -732,7 +732,7 @@ static void asus_hotk_notify(acpi_handle handle, u32 event, void *data) | |||
732 | lcd_blank(FB_BLANK_POWERDOWN); | 732 | lcd_blank(FB_BLANK_POWERDOWN); |
733 | } | 733 | } |
734 | 734 | ||
735 | acpi_bus_generate_event(hotk->device, event, | 735 | acpi_bus_generate_proc_event(hotk->device, event, |
736 | hotk->event_count[event % 128]++); | 736 | hotk->event_count[event % 128]++); |
737 | 737 | ||
738 | return; | 738 | return; |
diff --git a/drivers/misc/sony-laptop.c b/drivers/misc/sony-laptop.c index 91da6880ae93..743bd49ae6f5 100644 --- a/drivers/misc/sony-laptop.c +++ b/drivers/misc/sony-laptop.c | |||
@@ -904,7 +904,7 @@ static void sony_acpi_notify(acpi_handle handle, u32 event, void *data) | |||
904 | 904 | ||
905 | dprintk("sony_acpi_notify, event: 0x%.2x\n", ev); | 905 | dprintk("sony_acpi_notify, event: 0x%.2x\n", ev); |
906 | sony_laptop_report_input_event(ev); | 906 | sony_laptop_report_input_event(ev); |
907 | acpi_bus_generate_event(sony_nc_acpi_device, 1, ev); | 907 | acpi_bus_generate_proc_event(sony_nc_acpi_device, 1, ev); |
908 | } | 908 | } |
909 | 909 | ||
910 | static acpi_status sony_walk_callback(acpi_handle handle, u32 level, | 910 | static acpi_status sony_walk_callback(acpi_handle handle, u32 level, |
@@ -2292,7 +2292,7 @@ static irqreturn_t sony_pic_irq(int irq, void *dev_id) | |||
2292 | 2292 | ||
2293 | found: | 2293 | found: |
2294 | sony_laptop_report_input_event(device_event); | 2294 | sony_laptop_report_input_event(device_event); |
2295 | acpi_bus_generate_event(spic_dev.acpi_dev, 1, device_event); | 2295 | acpi_bus_generate_proc_event(spic_dev.acpi_dev, 1, device_event); |
2296 | sonypi_compat_report_event(device_event); | 2296 | sonypi_compat_report_event(device_event); |
2297 | 2297 | ||
2298 | return IRQ_HANDLED; | 2298 | return IRQ_HANDLED; |
diff --git a/drivers/misc/thinkpad_acpi.c b/drivers/misc/thinkpad_acpi.c index d0825a34a7b0..bb8956d0c104 100644 --- a/drivers/misc/thinkpad_acpi.c +++ b/drivers/misc/thinkpad_acpi.c | |||
@@ -1190,10 +1190,10 @@ static void hotkey_notify(struct ibm_struct *ibm, u32 event) | |||
1190 | } | 1190 | } |
1191 | 1191 | ||
1192 | if (sendacpi) | 1192 | if (sendacpi) |
1193 | acpi_bus_generate_event(ibm->acpi->device, event, hkey); | 1193 | acpi_bus_generate_proc_event(ibm->acpi->device, event, hkey); |
1194 | } else { | 1194 | } else { |
1195 | printk(IBM_ERR "unknown hotkey notification event %d\n", event); | 1195 | printk(IBM_ERR "unknown hotkey notification event %d\n", event); |
1196 | acpi_bus_generate_event(ibm->acpi->device, event, 0); | 1196 | acpi_bus_generate_proc_event(ibm->acpi->device, event, 0); |
1197 | } | 1197 | } |
1198 | } | 1198 | } |
1199 | 1199 | ||
@@ -2179,7 +2179,7 @@ static void dock_notify(struct ibm_struct *ibm, u32 event) | |||
2179 | event, _sta(dock_handle)); | 2179 | event, _sta(dock_handle)); |
2180 | data = 0; /* unknown */ | 2180 | data = 0; /* unknown */ |
2181 | } | 2181 | } |
2182 | acpi_bus_generate_event(ibm->acpi->device, event, data); | 2182 | acpi_bus_generate_proc_event(ibm->acpi->device, event, data); |
2183 | acpi_bus_generate_netlink_event(ibm->acpi->device->pnp.device_class, | 2183 | acpi_bus_generate_netlink_event(ibm->acpi->device->pnp.device_class, |
2184 | ibm->acpi->device->dev.bus_id, | 2184 | ibm->acpi->device->dev.bus_id, |
2185 | event, data); | 2185 | event, data); |
@@ -2280,7 +2280,7 @@ static int __init bay_init(struct ibm_init_struct *iibm) | |||
2280 | 2280 | ||
2281 | static void bay_notify(struct ibm_struct *ibm, u32 event) | 2281 | static void bay_notify(struct ibm_struct *ibm, u32 event) |
2282 | { | 2282 | { |
2283 | acpi_bus_generate_event(ibm->acpi->device, event, 0); | 2283 | acpi_bus_generate_proc_event(ibm->acpi->device, event, 0); |
2284 | acpi_bus_generate_netlink_event(ibm->acpi->device->pnp.device_class, | 2284 | acpi_bus_generate_netlink_event(ibm->acpi->device->pnp.device_class, |
2285 | ibm->acpi->device->dev.bus_id, | 2285 | ibm->acpi->device->dev.bus_id, |
2286 | event, 0); | 2286 | event, 0); |