aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/acpi/video.c
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2007-08-23 15:20:26 -0400
committerLen Brown <len.brown@intel.com>2007-08-23 15:20:26 -0400
commit14e04fb34ffa82ee61ae69f98d8fca12d2e8e31c (patch)
tree51ff919052cf456a23fa67e8d64d18f376b90582 /drivers/acpi/video.c
parent962ce8ca0604af0c3c5609f7613d4ec5fcfac623 (diff)
ACPI: Schedule /proc/acpi/event for removal
Schedule /proc/acpi/event for removal in 6 months. Re-name acpi_bus_generate_event() to acpi_bus_generate_proc_event() to make sure there is no confusion that it is for /proc/acpi/event only. Add CONFIG_ACPI_PROC_EVENT to allow removal of /proc/acpi/event. There is no functional change if CONFIG_ACPI_PROC_EVENT=y Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/acpi/video.c')
-rw-r--r--drivers/acpi/video.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c
index d98701941981..9a5cfcfd8da5 100644
--- a/drivers/acpi/video.c
+++ b/drivers/acpi/video.c
@@ -1775,7 +1775,7 @@ static void acpi_video_bus_notify(acpi_handle handle, u32 event, void *data)
1775 switch (event) { 1775 switch (event) {
1776 case ACPI_VIDEO_NOTIFY_SWITCH: /* User requested a switch, 1776 case ACPI_VIDEO_NOTIFY_SWITCH: /* User requested a switch,
1777 * most likely via hotkey. */ 1777 * most likely via hotkey. */
1778 acpi_bus_generate_event(device, event, 0); 1778 acpi_bus_generate_proc_event(device, event, 0);
1779 break; 1779 break;
1780 1780
1781 case ACPI_VIDEO_NOTIFY_PROBE: /* User plugged in or removed a video 1781 case ACPI_VIDEO_NOTIFY_PROBE: /* User plugged in or removed a video
@@ -1783,14 +1783,14 @@ static void acpi_video_bus_notify(acpi_handle handle, u32 event, void *data)
1783 acpi_video_device_enumerate(video); 1783 acpi_video_device_enumerate(video);
1784 acpi_video_device_rebind(video); 1784 acpi_video_device_rebind(video);
1785 acpi_video_switch_output(video, event); 1785 acpi_video_switch_output(video, event);
1786 acpi_bus_generate_event(device, event, 0); 1786 acpi_bus_generate_proc_event(device, event, 0);
1787 break; 1787 break;
1788 1788
1789 case ACPI_VIDEO_NOTIFY_CYCLE: /* Cycle Display output hotkey pressed. */ 1789 case ACPI_VIDEO_NOTIFY_CYCLE: /* Cycle Display output hotkey pressed. */
1790 case ACPI_VIDEO_NOTIFY_NEXT_OUTPUT: /* Next Display output hotkey pressed. */ 1790 case ACPI_VIDEO_NOTIFY_NEXT_OUTPUT: /* Next Display output hotkey pressed. */
1791 case ACPI_VIDEO_NOTIFY_PREV_OUTPUT: /* previous Display output hotkey pressed. */ 1791 case ACPI_VIDEO_NOTIFY_PREV_OUTPUT: /* previous Display output hotkey pressed. */
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 break; 1794 break;
1795 1795
1796 default: 1796 default:
@@ -1815,7 +1815,7 @@ static void acpi_video_device_notify(acpi_handle handle, u32 event, void *data)
1815 switch (event) { 1815 switch (event) {
1816 case ACPI_VIDEO_NOTIFY_SWITCH: /* change in status (cycle output device) */ 1816 case ACPI_VIDEO_NOTIFY_SWITCH: /* change in status (cycle output device) */
1817 case ACPI_VIDEO_NOTIFY_PROBE: /* change in status (output device status) */ 1817 case ACPI_VIDEO_NOTIFY_PROBE: /* change in status (output device status) */
1818 acpi_bus_generate_event(device, event, 0); 1818 acpi_bus_generate_proc_event(device, event, 0);
1819 break; 1819 break;
1820 case ACPI_VIDEO_NOTIFY_CYCLE_BRIGHTNESS: /* Cycle brightness */ 1820 case ACPI_VIDEO_NOTIFY_CYCLE_BRIGHTNESS: /* Cycle brightness */
1821 case ACPI_VIDEO_NOTIFY_INC_BRIGHTNESS: /* Increase brightness */ 1821 case ACPI_VIDEO_NOTIFY_INC_BRIGHTNESS: /* Increase brightness */
@@ -1823,7 +1823,7 @@ static void acpi_video_device_notify(acpi_handle handle, u32 event, void *data)
1823 case ACPI_VIDEO_NOTIFY_ZERO_BRIGHTNESS: /* zero brightnesss */ 1823 case ACPI_VIDEO_NOTIFY_ZERO_BRIGHTNESS: /* zero brightnesss */
1824 case ACPI_VIDEO_NOTIFY_DISPLAY_OFF: /* display device off */ 1824 case ACPI_VIDEO_NOTIFY_DISPLAY_OFF: /* display device off */
1825 acpi_video_switch_brightness(video_device, event); 1825 acpi_video_switch_brightness(video_device, event);
1826 acpi_bus_generate_event(device, event, 0); 1826 acpi_bus_generate_proc_event(device, event, 0);
1827 break; 1827 break;
1828 default: 1828 default:
1829 ACPI_DEBUG_PRINT((ACPI_DB_INFO, 1829 ACPI_DEBUG_PRINT((ACPI_DB_INFO,