diff options
Diffstat (limited to 'drivers/acpi/video.c')
-rw-r--r-- | drivers/acpi/video.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c index d727d2c715df..6659bdd2a454 100644 --- a/drivers/acpi/video.c +++ b/drivers/acpi/video.c | |||
@@ -1781,7 +1781,7 @@ static void acpi_video_bus_notify(acpi_handle handle, u32 event, void *data) | |||
1781 | switch (event) { | 1781 | switch (event) { |
1782 | case ACPI_VIDEO_NOTIFY_SWITCH: /* User requested a switch, | 1782 | case ACPI_VIDEO_NOTIFY_SWITCH: /* User requested a switch, |
1783 | * most likely via hotkey. */ | 1783 | * most likely via hotkey. */ |
1784 | acpi_bus_generate_event(device, event, 0); | 1784 | acpi_bus_generate_proc_event(device, event, 0); |
1785 | keycode = KEY_SWITCHVIDEOMODE; | 1785 | keycode = KEY_SWITCHVIDEOMODE; |
1786 | break; | 1786 | break; |
1787 | 1787 | ||
@@ -1790,23 +1790,23 @@ static void acpi_video_bus_notify(acpi_handle handle, u32 event, void *data) | |||
1790 | acpi_video_device_enumerate(video); | 1790 | acpi_video_device_enumerate(video); |
1791 | acpi_video_device_rebind(video); | 1791 | acpi_video_device_rebind(video); |
1792 | acpi_video_switch_output(video, event); | 1792 | acpi_video_switch_output(video, event); |
1793 | acpi_bus_generate_event(device, event, 0); | 1793 | acpi_bus_generate_proc_event(device, event, 0); |
1794 | keycode = KEY_SWITCHVIDEOMODE; | 1794 | keycode = KEY_SWITCHVIDEOMODE; |
1795 | break; | 1795 | break; |
1796 | 1796 | ||
1797 | case ACPI_VIDEO_NOTIFY_CYCLE: /* Cycle Display output hotkey pressed. */ | 1797 | case ACPI_VIDEO_NOTIFY_CYCLE: /* Cycle Display output hotkey pressed. */ |
1798 | acpi_video_switch_output(video, event); | 1798 | acpi_video_switch_output(video, event); |
1799 | acpi_bus_generate_event(device, event, 0); | 1799 | acpi_bus_generate_proc_event(device, event, 0); |
1800 | keycode = KEY_SWITCHVIDEOMODE; | 1800 | keycode = KEY_SWITCHVIDEOMODE; |
1801 | break; | 1801 | break; |
1802 | case ACPI_VIDEO_NOTIFY_NEXT_OUTPUT: /* Next Display output hotkey pressed. */ | 1802 | case ACPI_VIDEO_NOTIFY_NEXT_OUTPUT: /* Next Display output hotkey pressed. */ |
1803 | acpi_video_switch_output(video, event); | 1803 | acpi_video_switch_output(video, event); |
1804 | acpi_bus_generate_event(device, event, 0); | 1804 | acpi_bus_generate_proc_event(device, event, 0); |
1805 | keycode = KEY_VIDEO_NEXT; | 1805 | keycode = KEY_VIDEO_NEXT; |
1806 | break; | 1806 | break; |
1807 | case ACPI_VIDEO_NOTIFY_PREV_OUTPUT: /* previous Display output hotkey pressed. */ | 1807 | case ACPI_VIDEO_NOTIFY_PREV_OUTPUT: /* previous Display output hotkey pressed. */ |
1808 | acpi_video_switch_output(video, event); | 1808 | acpi_video_switch_output(video, event); |
1809 | acpi_bus_generate_event(device, event, 0); | 1809 | acpi_bus_generate_proc_event(device, event, 0); |
1810 | keycode = KEY_VIDEO_PREV; | 1810 | keycode = KEY_VIDEO_PREV; |
1811 | break; | 1811 | break; |
1812 | 1812 | ||
@@ -1843,27 +1843,27 @@ static void acpi_video_device_notify(acpi_handle handle, u32 event, void *data) | |||
1843 | switch (event) { | 1843 | switch (event) { |
1844 | case ACPI_VIDEO_NOTIFY_CYCLE_BRIGHTNESS: /* Cycle brightness */ | 1844 | case ACPI_VIDEO_NOTIFY_CYCLE_BRIGHTNESS: /* Cycle brightness */ |
1845 | acpi_video_switch_brightness(video_device, event); | 1845 | acpi_video_switch_brightness(video_device, event); |
1846 | acpi_bus_generate_event(device, event, 0); | 1846 | acpi_bus_generate_proc_event(device, event, 0); |
1847 | keycode = KEY_BRIGHTNESS_CYCLE; | 1847 | keycode = KEY_BRIGHTNESS_CYCLE; |
1848 | break; | 1848 | break; |
1849 | case ACPI_VIDEO_NOTIFY_INC_BRIGHTNESS: /* Increase brightness */ | 1849 | case ACPI_VIDEO_NOTIFY_INC_BRIGHTNESS: /* Increase brightness */ |
1850 | acpi_video_switch_brightness(video_device, event); | 1850 | acpi_video_switch_brightness(video_device, event); |
1851 | acpi_bus_generate_event(device, event, 0); | 1851 | acpi_bus_generate_proc_event(device, event, 0); |
1852 | keycode = KEY_BRIGHTNESSUP; | 1852 | keycode = KEY_BRIGHTNESSUP; |
1853 | break; | 1853 | break; |
1854 | case ACPI_VIDEO_NOTIFY_DEC_BRIGHTNESS: /* Decrease brightness */ | 1854 | case ACPI_VIDEO_NOTIFY_DEC_BRIGHTNESS: /* Decrease brightness */ |
1855 | acpi_video_switch_brightness(video_device, event); | 1855 | acpi_video_switch_brightness(video_device, event); |
1856 | acpi_bus_generate_event(device, event, 0); | 1856 | acpi_bus_generate_proc_event(device, event, 0); |
1857 | keycode = KEY_BRIGHTNESSDOWN; | 1857 | keycode = KEY_BRIGHTNESSDOWN; |
1858 | break; | 1858 | break; |
1859 | case ACPI_VIDEO_NOTIFY_ZERO_BRIGHTNESS: /* zero brightnesss */ | 1859 | case ACPI_VIDEO_NOTIFY_ZERO_BRIGHTNESS: /* zero brightnesss */ |
1860 | acpi_video_switch_brightness(video_device, event); | 1860 | acpi_video_switch_brightness(video_device, event); |
1861 | acpi_bus_generate_event(device, event, 0); | 1861 | acpi_bus_generate_proc_event(device, event, 0); |
1862 | keycode = KEY_BRIGHTNESS_ZERO; | 1862 | keycode = KEY_BRIGHTNESS_ZERO; |
1863 | break; | 1863 | break; |
1864 | case ACPI_VIDEO_NOTIFY_DISPLAY_OFF: /* display device off */ | 1864 | case ACPI_VIDEO_NOTIFY_DISPLAY_OFF: /* display device off */ |
1865 | acpi_video_switch_brightness(video_device, event); | 1865 | acpi_video_switch_brightness(video_device, event); |
1866 | acpi_bus_generate_event(device, event, 0); | 1866 | acpi_bus_generate_proc_event(device, event, 0); |
1867 | keycode = KEY_DISPLAY_OFF; | 1867 | keycode = KEY_DISPLAY_OFF; |
1868 | break; | 1868 | break; |
1869 | default: | 1869 | default: |