Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 1 Sep 2020 21:34:04 +0000 (UTC)
From:      Mateusz Guzik <mjg@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r365098 - head/sys/dev/acpi_support
Message-ID:  <202009012134.081LY4kK031925@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: mjg
Date: Tue Sep  1 21:34:04 2020
New Revision: 365098
URL: https://svnweb.freebsd.org/changeset/base/365098

Log:
  acpi_support: clean up empty lines in .c and .h files

Modified:
  head/sys/dev/acpi_support/acpi_asus.c
  head/sys/dev/acpi_support/acpi_asus_wmi.c
  head/sys/dev/acpi_support/acpi_fujitsu.c
  head/sys/dev/acpi_support/acpi_hp.c
  head/sys/dev/acpi_support/acpi_panasonic.c
  head/sys/dev/acpi_support/acpi_rapidstart.c
  head/sys/dev/acpi_support/acpi_wmi.c

Modified: head/sys/dev/acpi_support/acpi_asus.c
==============================================================================
--- head/sys/dev/acpi_support/acpi_asus.c	Tue Sep  1 21:33:31 2020	(r365097)
+++ head/sys/dev/acpi_support/acpi_asus.c	Tue Sep  1 21:34:04 2020	(r365098)
@@ -417,7 +417,6 @@ static struct acpi_asus_model acpi_asus_models[] = {
 		.disp_get	= "\\_SB.PCI0.P0P2.VGA.GETD",
 		.disp_set	= "SDSP"
 	},
-
 	{ .name = NULL }
 };
 
@@ -434,7 +433,6 @@ static struct acpi_asus_model acpi_samsung_models[] = 
 		.lcd_get	= "\\BKLT",
 		.lcd_set	= "\\_SB.PCI0.LPCB.EC0._Q0E"
 	},
-
 	{ .name = NULL }
 };
 
@@ -457,7 +455,6 @@ static struct acpi_asus_model acpi_eeepc_models[] = {
 		.wlan_set	= "\\_SB.ATKD.WLDS",
 		.n_func		= acpi_asus_eeepc_notify
 	},
-
 	{ .name = NULL }
 };
 
@@ -499,7 +496,6 @@ static struct {
 		.method		= ACPI_ASUS_METHOD_WLAN,
 		.description	= "wireless lan state",
 	},
-
 	{ .name = NULL }
 };
 
@@ -524,7 +520,6 @@ static device_method_t acpi_asus_methods[] = {
 	DEVMETHOD(device_probe,  acpi_asus_probe),
 	DEVMETHOD(device_attach, acpi_asus_attach),
 	DEVMETHOD(device_detach, acpi_asus_detach),
-
 	{ 0, 0 }
 };
 
@@ -617,7 +612,6 @@ acpi_asus_probe(device_t dev)
 	 */
 	for (model = acpi_asus_models; model->name != NULL; model++) {
 		if (strncmp(Obj->String.Pointer, model->name, 3) == 0) {
-
 good:
 			sbuf_printf(sb, "Asus %s Laptop Extras",
 			    Obj->String.Pointer);
@@ -867,7 +861,7 @@ acpi_asus_detach(device_t dev)
 	/* Remove notify handler */
 	AcpiRemoveNotifyHandler(sc->handle, ACPI_SYSTEM_NOTIFY,
 	    acpi_asus_notify);
-	
+
 	if (sc->lcdd_handle) {
 		KASSERT(sc->model->lcdd_n_func != NULL,
 		    ("model->lcdd_n_func is NULL, but lcdd_handle is non-zero"));
@@ -887,7 +881,7 @@ acpi_asus_led_task(struct acpi_asus_led *led, int pend
 	struct acpi_asus_softc	*sc;
 	char			*method;
 	int			state;
-	
+
 	ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__);
 
 	sc = led->sc;
@@ -926,7 +920,7 @@ acpi_asus_led_task(struct acpi_asus_led *led, int pend
 	acpi_SetInteger(sc->handle, method, state);
 	led->busy = 0;
 }
-	
+
 static void
 acpi_asus_led(struct acpi_asus_led *led, int state)
 {
@@ -950,7 +944,7 @@ acpi_asus_sysctl(SYSCTL_HANDLER_ARGS)
 	int			error = 0;
 	int			function;
 	int			method;
-	
+
 	ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__);
 
 	sc = (struct acpi_asus_softc *)oidp->oid_arg1;

Modified: head/sys/dev/acpi_support/acpi_asus_wmi.c
==============================================================================
--- head/sys/dev/acpi_support/acpi_asus_wmi.c	Tue Sep  1 21:33:31 2020	(r365097)
+++ head/sys/dev/acpi_support/acpi_asus_wmi.c	Tue Sep  1 21:34:04 2020	(r365098)
@@ -104,7 +104,6 @@ ACPI_MODULE_NAME("ASUS-WMI")
 #define ASUS_WMI_DSTS_BRIGHTNESS_MASK   0x000000FF
 #define ASUS_WMI_DSTS_MAX_BRIGTH_MASK   0x0000FF00
 
-
 struct acpi_asus_wmi_softc {
 	device_t	dev;
 	device_t	wmi_dev;
@@ -450,7 +449,7 @@ static int
 acpi_asus_wmi_detach(device_t dev)
 {
 	struct acpi_asus_wmi_softc *sc = device_get_softc(dev);
-	
+
 	ACPI_FUNCTION_TRACE((char *)(uintptr_t) __func__);
 
 	if (sc->notify_guid)
@@ -468,7 +467,7 @@ acpi_asus_wmi_sysctl(SYSCTL_HANDLER_ARGS)
 	int			error = 0;
 	int			function;
 	int			dev_id;
-	
+
 	ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__);
 
 	sc = (struct acpi_asus_wmi_softc *)oidp->oid_arg1;
@@ -601,7 +600,7 @@ acpi_asus_wmi_evaluate_method(device_t wmi_dev, int me
 	ACPI_OBJECT	*obj;
 	ACPI_BUFFER	in = { sizeof(params), &params };
 	ACPI_BUFFER	out = { ACPI_ALLOCATE_BUFFER, NULL };
-	
+
 	if (ACPI_FAILURE(ACPI_WMI_EVALUATE_CALL(wmi_dev,
 	    ACPI_ASUS_WMI_MGMT_GUID, 1, method, &in, &out))) {
 		acpi_asus_wmi_free_buffer(&out);

Modified: head/sys/dev/acpi_support/acpi_fujitsu.c
==============================================================================
--- head/sys/dev/acpi_support/acpi_fujitsu.c	Tue Sep  1 21:33:31 2020	(r365097)
+++ head/sys/dev/acpi_support/acpi_fujitsu.c	Tue Sep  1 21:34:04 2020	(r365098)
@@ -213,7 +213,6 @@ static struct {
 		.method		= METHOD_RBLL,
 		.description	= "Number of brightness level steps"
 	},
-
 	{ NULL, 0, NULL }
 };
 
@@ -317,7 +316,6 @@ acpi_fujitsu_notify_status_changed(void *arg)
 	ACPI_SERIAL_END(fujitsu);
 }
 
-
 static void
 acpi_fujitsu_notify_handler(ACPI_HANDLE h, uint32_t notify, void *context)
 {
@@ -423,7 +421,6 @@ acpi_fujitsu_init(struct acpi_fujitsu_softc *sc)
 		    sysctl_table[i].description);
 	}
 
-
 	/* Set the hotkeys to their initial states */
 	if (!acpi_fujitsu_update(sc)) {
 		device_printf(sc->dev, "Couldn't init hotkey states\n");
@@ -675,21 +672,21 @@ acpi_fujitsu_update(struct acpi_fujitsu_softc *sc)
 			device_printf(sc->dev, "Couldn't query volume level\n");
 			return (FALSE);
 		}
-	
+
 		if (changed & VOLUME_CHANGED) {
 			sc->bIsMuted =
 			(uint8_t)((sc->gvol.value & VOLUME_MUTE_BIT) != 0);
-	
+
 			/* Clear the modification bit */
 			sc->gvol.value &= VOLUME_SETTING_BITS;
-	
+
 			if (sc->bIsMuted) {
 				acpi_UserNotify("FUJITSU", sc->handle, FN_MUTE);
 				ACPI_VPRINT(sc->dev, acpi_sc, "Volume is now mute\n");
 			} else
 				ACPI_VPRINT(sc->dev, acpi_sc, "Volume is now %d\n",
 				sc->gvol.value);
-	
+
 			acpi_UserNotify("FUJITSU", sc->handle, FN_VOLUME);
 		}
 	}
@@ -701,10 +698,10 @@ acpi_fujitsu_update(struct acpi_fujitsu_softc *sc)
 			device_printf(sc->dev, "Couldn't query pointer state\n");
 			return (FALSE);
 		}
-	
+
 		if (changed & MOUSE_CHANGED) {
 			sc->bIntPtrEnabled = (uint8_t)(sc->gmou.value & 0x1);
-	
+
 			/* Clear the modification bit */
 			sc->gmou.value &= MOUSE_SETTING_BITS;
 			
@@ -712,7 +709,7 @@ acpi_fujitsu_update(struct acpi_fujitsu_softc *sc)
                         acpi_fujitsu_method_set(sc, METHOD_GMOU, sc->gmou.value);
 
 			acpi_UserNotify("FUJITSU", sc->handle, FN_POINTER_ENABLE);
-	
+
 			ACPI_VPRINT(sc->dev, acpi_sc, "Internal pointer is now %s\n",
 			(sc->bIntPtrEnabled) ? "enabled" : "disabled");
 		}
@@ -748,15 +745,15 @@ acpi_fujitsu_update(struct acpi_fujitsu_softc *sc)
 			device_printf(sc->dev, "Couldn't query brightness level\n");
 			return (FALSE);
 		}
-	
+
 		if (changed & BRIGHT_CHANGED) {
 			/* No state to record here. */
-	
+
 			/* Clear the modification bit */
 			sc->gbll.value &= BRIGHTNESS_SETTING_BITS;
-	
+
 			acpi_UserNotify("FUJITSU", sc->handle, FN_LCD_BRIGHTNESS);
-	
+
 			ACPI_VPRINT(sc->dev, acpi_sc, "Brightness level is now %d\n",
 			sc->gbll.value);
 		}

Modified: head/sys/dev/acpi_support/acpi_hp.c
==============================================================================
--- head/sys/dev/acpi_support/acpi_hp.c	Tue Sep  1 21:33:31 2020	(r365097)
+++ head/sys/dev/acpi_support/acpi_hp.c	Tue Sep  1 21:34:04 2020	(r365098)
@@ -298,7 +298,6 @@ static struct {
 		.method		= ACPI_HP_METHOD_VERBOSE,
 		.description	= "Verbosity level",
 	},
-
 	{ NULL, 0, NULL, 0 }
 };
 
@@ -615,7 +614,7 @@ static int
 acpi_hp_detach(device_t dev)
 {
 	struct acpi_hp_softc *sc;
-	
+
 	ACPI_FUNCTION_TRACE((char *)(uintptr_t) __func__);
 	sc = device_get_softc(dev);
 	if (sc->has_cmi && sc->hpcmi_open_pid != 0)
@@ -647,7 +646,7 @@ acpi_hp_sysctl(SYSCTL_HANDLER_ARGS)
 	int			error = 0;
 	int			function;
 	int			method;
-	
+
 	ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__);
 
 	sc = (struct acpi_hp_softc *)oidp->oid_arg1;
@@ -898,7 +897,7 @@ acpi_hp_exec_wmi_command(device_t wmi_dev, int command
 	ACPI_BUFFER	in = { sizeof(params), &params };
 	ACPI_BUFFER	out = { ACPI_ALLOCATE_BUFFER, NULL };
 	int res;
-	
+
 	if (ACPI_FAILURE(ACPI_WMI_EVALUATE_CALL(wmi_dev, ACPI_HP_WMI_BIOS_GUID,
 		    0, 0x3, &in, &out))) {
 		acpi_hp_free_buffer(&out);
@@ -935,7 +934,6 @@ acpi_hp_get_string_from_object(ACPI_OBJECT* obj, char*
 	return (dst);
 }
 
-
 /*
  * Read BIOS Setting block in instance "instance".
  * The block returned is ACPI_TYPE_PACKAGE which should contain the following
@@ -1073,8 +1071,6 @@ acpi_hp_get_cmi_block(device_t wmi_dev, const char* gu
 	return (0);
 }
 
-
-
 /*
  * Convert given two digit hex string (hexin) to an UINT8 referenced
  * by byteout.
@@ -1108,7 +1104,6 @@ static __inline int acpi_hp_hex_to_int(const UINT8 *he
 	return (0);
 }
 
-
 static void
 acpi_hp_hex_decode(char* buffer)
 {
@@ -1140,7 +1135,6 @@ acpi_hp_hex_decode(char* buffer)
 	buffer[(length+1)/3] = 0;
 }
 
-
 /*
  * open hpcmi device
  */
@@ -1219,7 +1213,7 @@ acpi_hp_hpcmi_read(struct cdev *dev, struct uio *buf, 
 	if (dev == NULL || dev->si_drv1 == NULL)
 		return (EBADF);
 	sc = dev->si_drv1;
-	
+
 	ACPI_SERIAL_BEGIN(hp);
 	if (sc->hpcmi_open_pid != buf->uio_td->td_proc->p_pid
 	    || sc->hpcmi_bufptr == -1) {

Modified: head/sys/dev/acpi_support/acpi_panasonic.c
==============================================================================
--- head/sys/dev/acpi_support/acpi_panasonic.c	Tue Sep  1 21:33:31 2020	(r365097)
+++ head/sys/dev/acpi_support/acpi_panasonic.c	Tue Sep  1 21:34:04 2020	(r365098)
@@ -139,7 +139,7 @@ acpi_panasonic_probe(device_t dev)
 {
 	static char *mat_ids[] = { "MAT0019", NULL };
 	int rv;
-	
+
 	if (acpi_disabled("panasonic") ||
 	    device_get_unit(dev) != 0)
 		return (ENXIO);

Modified: head/sys/dev/acpi_support/acpi_rapidstart.c
==============================================================================
--- head/sys/dev/acpi_support/acpi_rapidstart.c	Tue Sep  1 21:33:31 2020	(r365097)
+++ head/sys/dev/acpi_support/acpi_rapidstart.c	Tue Sep  1 21:34:04 2020	(r365098)
@@ -40,7 +40,6 @@ __FBSDID("$FreeBSD$");
 #include <sys/sysctl.h>
 static int sysctl_acpi_rapidstart_gen_handler(SYSCTL_HANDLER_ARGS);
 
-
 static struct acpi_rapidstart_name_list
 {
 	char *nodename;
@@ -72,7 +71,7 @@ acpi_rapidstart_probe(device_t dev)
 		device_set_desc(dev, "Intel Rapid Start ACPI device");
 
 	return (rv);
-	
+
 }
 
 static int
@@ -82,7 +81,7 @@ acpi_rapidstart_attach(device_t dev)
 	int i;
 
 	sc = device_get_softc(dev);
-	
+
 	sc->sysctl_ctx = device_get_sysctl_ctx(dev);
 	sc->sysctl_tree = device_get_sysctl_tree(dev);
 	for (i = 0 ; acpi_rapidstart_oids[i].nodename != NULL; i++){
@@ -141,4 +140,3 @@ static devclass_t acpi_rapidstart_devclass;
 DRIVER_MODULE(acpi_rapidstart, acpi, acpi_rapidstart_driver, acpi_rapidstart_devclass,
 	      0, 0);
 MODULE_DEPEND(acpi_rapidstart, acpi, 1, 1, 1);
-

Modified: head/sys/dev/acpi_support/acpi_wmi.c
==============================================================================
--- head/sys/dev/acpi_support/acpi_wmi.c	Tue Sep  1 21:33:31 2020	(r365097)
+++ head/sys/dev/acpi_support/acpi_wmi.c	Tue Sep  1 21:34:04 2020	(r365098)
@@ -76,7 +76,7 @@ struct acpi_wmi_softc {
 	pid_t		wmistat_open_pid; /* pid operating on /dev/wmistat */
 	int		wmistat_bufptr;	/* /dev/wmistat ptr to buffer position */
 	char 	        *mofbuf;
-	
+
 	TAILQ_HEAD(wmi_info_list_head, wmi_info) wmi_info_list;
 };
 
@@ -97,7 +97,6 @@ enum event_generation_state {
 	EVENT_GENERATION_OFF = 0
 };
 
-
 /*
  * Information about one entry in _WDG.
  * List of those is used to lookup information by GUID.
@@ -109,7 +108,6 @@ struct wmi_info {
 	void			*event_handler_user_data; /* ev handler cookie  */
 };
 
-
 ACPI_SERIAL_DECL(acpi_wmi, "ACPI-WMI Mapping");
 
 /* public interface - declaration */
@@ -168,7 +166,6 @@ static struct cdevsw wmistat_cdevsw = {
 	.d_name = "wmistat",
 };
 
-
 static device_method_t acpi_wmi_methods[] = {
 	/* Device interface */
 	DEVMETHOD(device_probe,	acpi_wmi_probe),
@@ -354,7 +351,6 @@ acpi_wmi_detach(device_t dev)
 	return (ret);
 }
 
-
 /*
  * Check if the given GUID string (human readable format
  * AABBCCDD-EEFF-GGHH-IIJJ-KKLLMMNNOOPP)
@@ -801,7 +797,7 @@ acpi_wmi_toggle_we_event_generation(device_t dev, stru
 	params[0].Integer.Value = state==EVENT_GENERATION_ON?1:0;
 	input.Pointer = params;
 	input.Count = 1;
-	
+
 	UINT8 hi = ((UINT8) winfo->ginfo.oid[0]) >> 4;
 	UINT8 lo = ((UINT8) winfo->ginfo.oid[0]) & 0xf;
 	method[2] = (hi > 9 ? hi + 55: hi + 48);
@@ -978,7 +974,7 @@ acpi_wmi_wmistat_read(struct cdev *dev, struct uio *bu
 	if (dev == NULL || dev->si_drv1 == NULL)
 		return (EBADF);
 	sc = dev->si_drv1;
-	
+
 	ACPI_SERIAL_BEGIN(acpi_wmi);
 	if (sc->wmistat_open_pid != buf->uio_td->td_proc->p_pid ||
 			sc->wmistat_bufptr == -1) {



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