aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/acpi/video.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/acpi/video.c')
-rw-r--r--drivers/acpi/video.c10
1 files changed, 0 insertions, 10 deletions
diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c
index 5d7075d25700..8f91a3783191 100644
--- a/drivers/acpi/video.c
+++ b/drivers/acpi/video.c
@@ -1556,7 +1556,6 @@ static void acpi_video_bus_notify(struct acpi_device *device, u32 event)
1556 switch (event) { 1556 switch (event) {
1557 case ACPI_VIDEO_NOTIFY_SWITCH: /* User requested a switch, 1557 case ACPI_VIDEO_NOTIFY_SWITCH: /* User requested a switch,
1558 * most likely via hotkey. */ 1558 * most likely via hotkey. */
1559 acpi_bus_generate_proc_event(device, event, 0);
1560 keycode = KEY_SWITCHVIDEOMODE; 1559 keycode = KEY_SWITCHVIDEOMODE;
1561 break; 1560 break;
1562 1561
@@ -1564,20 +1563,16 @@ static void acpi_video_bus_notify(struct acpi_device *device, u32 event)
1564 * connector. */ 1563 * connector. */
1565 acpi_video_device_enumerate(video); 1564 acpi_video_device_enumerate(video);
1566 acpi_video_device_rebind(video); 1565 acpi_video_device_rebind(video);
1567 acpi_bus_generate_proc_event(device, event, 0);
1568 keycode = KEY_SWITCHVIDEOMODE; 1566 keycode = KEY_SWITCHVIDEOMODE;
1569 break; 1567 break;
1570 1568
1571 case ACPI_VIDEO_NOTIFY_CYCLE: /* Cycle Display output hotkey pressed. */ 1569 case ACPI_VIDEO_NOTIFY_CYCLE: /* Cycle Display output hotkey pressed. */
1572 acpi_bus_generate_proc_event(device, event, 0);
1573 keycode = KEY_SWITCHVIDEOMODE; 1570 keycode = KEY_SWITCHVIDEOMODE;
1574 break; 1571 break;
1575 case ACPI_VIDEO_NOTIFY_NEXT_OUTPUT: /* Next Display output hotkey pressed. */ 1572 case ACPI_VIDEO_NOTIFY_NEXT_OUTPUT: /* Next Display output hotkey pressed. */
1576 acpi_bus_generate_proc_event(device, event, 0);
1577 keycode = KEY_VIDEO_NEXT; 1573 keycode = KEY_VIDEO_NEXT;
1578 break; 1574 break;
1579 case ACPI_VIDEO_NOTIFY_PREV_OUTPUT: /* previous Display output hotkey pressed. */ 1575 case ACPI_VIDEO_NOTIFY_PREV_OUTPUT: /* previous Display output hotkey pressed. */
1580 acpi_bus_generate_proc_event(device, event, 0);
1581 keycode = KEY_VIDEO_PREV; 1576 keycode = KEY_VIDEO_PREV;
1582 break; 1577 break;
1583 1578
@@ -1620,31 +1615,26 @@ static void acpi_video_device_notify(acpi_handle handle, u32 event, void *data)
1620 case ACPI_VIDEO_NOTIFY_CYCLE_BRIGHTNESS: /* Cycle brightness */ 1615 case ACPI_VIDEO_NOTIFY_CYCLE_BRIGHTNESS: /* Cycle brightness */
1621 if (brightness_switch_enabled) 1616 if (brightness_switch_enabled)
1622 acpi_video_switch_brightness(video_device, event); 1617 acpi_video_switch_brightness(video_device, event);
1623 acpi_bus_generate_proc_event(device, event, 0);
1624 keycode = KEY_BRIGHTNESS_CYCLE; 1618 keycode = KEY_BRIGHTNESS_CYCLE;
1625 break; 1619 break;
1626 case ACPI_VIDEO_NOTIFY_INC_BRIGHTNESS: /* Increase brightness */ 1620 case ACPI_VIDEO_NOTIFY_INC_BRIGHTNESS: /* Increase brightness */
1627 if (brightness_switch_enabled) 1621 if (brightness_switch_enabled)
1628 acpi_video_switch_brightness(video_device, event); 1622 acpi_video_switch_brightness(video_device, event);
1629 acpi_bus_generate_proc_event(device, event, 0);
1630 keycode = KEY_BRIGHTNESSUP; 1623 keycode = KEY_BRIGHTNESSUP;
1631 break; 1624 break;
1632 case ACPI_VIDEO_NOTIFY_DEC_BRIGHTNESS: /* Decrease brightness */ 1625 case ACPI_VIDEO_NOTIFY_DEC_BRIGHTNESS: /* Decrease brightness */
1633 if (brightness_switch_enabled) 1626 if (brightness_switch_enabled)
1634 acpi_video_switch_brightness(video_device, event); 1627 acpi_video_switch_brightness(video_device, event);
1635 acpi_bus_generate_proc_event(device, event, 0);
1636 keycode = KEY_BRIGHTNESSDOWN; 1628 keycode = KEY_BRIGHTNESSDOWN;
1637 break; 1629 break;
1638 case ACPI_VIDEO_NOTIFY_ZERO_BRIGHTNESS: /* zero brightness */ 1630 case ACPI_VIDEO_NOTIFY_ZERO_BRIGHTNESS: /* zero brightness */
1639 if (brightness_switch_enabled) 1631 if (brightness_switch_enabled)
1640 acpi_video_switch_brightness(video_device, event); 1632 acpi_video_switch_brightness(video_device, event);
1641 acpi_bus_generate_proc_event(device, event, 0);
1642 keycode = KEY_BRIGHTNESS_ZERO; 1633 keycode = KEY_BRIGHTNESS_ZERO;
1643 break; 1634 break;
1644 case ACPI_VIDEO_NOTIFY_DISPLAY_OFF: /* display device off */ 1635 case ACPI_VIDEO_NOTIFY_DISPLAY_OFF: /* display device off */
1645 if (brightness_switch_enabled) 1636 if (brightness_switch_enabled)
1646 acpi_video_switch_brightness(video_device, event); 1637 acpi_video_switch_brightness(video_device, event);
1647 acpi_bus_generate_proc_event(device, event, 0);
1648 keycode = KEY_DISPLAY_OFF; 1638 keycode = KEY_DISPLAY_OFF;
1649 break; 1639 break;
1650 default: 1640 default: