Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 21 Jun 2014 00:53:57 +0000 (UTC)
From:      Justin Hibbits <jhibbits@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r267697 - head/sys/dev/adb
Message-ID:  <201406210053.s5L0rvH7038936@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: jhibbits
Date: Sat Jun 21 00:53:56 2014
New Revision: 267697
URL: http://svnweb.freebsd.org/changeset/base/267697

Log:
  No need to check if devd is running before posting an event.

Modified:
  head/sys/dev/adb/adb_buttons.c
  head/sys/dev/adb/adb_kbd.c

Modified: head/sys/dev/adb/adb_buttons.c
==============================================================================
--- head/sys/dev/adb/adb_buttons.c	Sat Jun 21 00:45:44 2014	(r267696)
+++ head/sys/dev/adb/adb_buttons.c	Sat Jun 21 00:53:56 2014	(r267697)
@@ -118,37 +118,32 @@ abtn_receive_packet(device_t dev, u_char
 
 	switch (cmd) {
 	case 0x0a:	/* decrease brightness */
-		if (devctl_process_running())
-			devctl_notify("PMU", "keys", "brightness",
-			    "notify=down");
+		devctl_notify("PMU", "keys", "brightness",
+		    "notify=down");
 		break;
 
 	case 0x09:	/* increase brightness */
-		if (devctl_process_running())
-			devctl_notify("PMU", "keys", "brightness", "notify=up");
+		devctl_notify("PMU", "keys", "brightness", "notify=up");
 		break;
 
 	case 0x08:	/* mute */
 	case 0x01:	/* mute, AV hardware */
-		if (devctl_process_running())
-			devctl_notify("PMU", "keys", "mute", NULL);
+		devctl_notify("PMU", "keys", "mute", NULL);
 		break;
 	case 0x07:	/* decrease volume */
 	case 0x02:	/* decrease volume, AV hardware */
-		if (devctl_process_running())
-			devctl_notify("PMU", "keys", "volume", "notify=down");
+		devctl_notify("PMU", "keys", "volume", "notify=down");
 		break;
 	case 0x06:	/* increase volume */
 	case 0x03:	/* increase volume, AV hardware */
-		if (devctl_process_running())
-			devctl_notify("PMU", "keys", "volume", "notify=up");
+		devctl_notify("PMU", "keys", "volume", "notify=up");
 		break;
 	case 0x0c:	/* mirror display key */
 		/* Need callback to do something with this */
 		break;
 	case 0x0b:	/* eject tray */
-		if (devctl_process_running())
-			devctl_notify("PMU", "keys", "eject", NULL);
+		devctl_notify("PMU", "keys", "eject", NULL);
+		break;
 	case 0x7f:	/* numlock */
 		/* Need callback to do something with this */
 		break;

Modified: head/sys/dev/adb/adb_kbd.c
==============================================================================
--- head/sys/dev/adb/adb_kbd.c	Sat Jun 21 00:45:44 2014	(r267696)
+++ head/sys/dev/adb/adb_kbd.c	Sat Jun 21 00:53:56 2014	(r267697)
@@ -424,7 +424,7 @@ adb_kbd_receive_packet(device_t dev, u_c
 
 	mtx_lock(&sc->sc_mutex);
 		/* 0x7f is always the power button */
-		if (data[0] == 0x7f && devctl_process_running()) {
+		if (data[0] == 0x7f) {
 			devctl_notify("PMU", "Button", "pressed", NULL);
 			mtx_unlock(&sc->sc_mutex);
 			return (0);



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201406210053.s5L0rvH7038936>