Sun Jan 24 19:37:45 2021 UTC ()

trailing whitespace


(jmcneill)

diff -r1.3 -r1.4 src/sys/dev/i2c/pcai2cmux.c

--- src/sys/dev/i2c/pcai2cmux.c 2021/01/18 15:28:21	1.3
+++ src/sys/dev/i2c/pcai2cmux.c 2021/01/24 19:37:45	1.4

 @@ -1,14 +1,14 @@
-/*	$NetBSD: pcai2cmux.c,v 1.3 2021/01/18 15:28:21 thorpej Exp $	*/
+/*	$NetBSD: pcai2cmux.c,v 1.4 2021/01/24 19:37:45 jmcneill Exp $	*/
 /*-
  * Copyright (c) 2020 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Jason R. Thorpe.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -20,27 +20,27 @@
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pcai2cmux.c,v 1.3 2021/01/18 15:28:21 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pcai2cmux.c,v 1.4 2021/01/24 19:37:45 jmcneill Exp $");
 /*
  * Driver for NXP PCA954x / PCA984x I2C switches and multiplexers.
+ *
  * There are two flavors of this device:
+ *
  * - Multiplexers, which connect the upstream bus to one downstream bus
  *   at a time.
+ *
  * - Switches, which can connect the upstream bus to one or more downstream
  *   busses at a time (which is useful when using an all-call address for
  *   a large array of PCA9685 LED controllers, for example).
+ *
 @@ -116,26 +116,30 @@ static const struct device_compatible_en
 	/* PCA9545 - 4 channel i2c switch with interrupts */
 	{ .compat = "nxp,pca9545",
 	  .data = &switch4_type },
 	/* PCA9546 - 4 channel i2c switch */
 	{ .compat = "nxp,pca9546",
 	  .data = &switch4_type },
 	/* PCA9547 - 8 channel i2c mux */
 	{ .compat = "nxp,pca9547",
 	  .data = &mux8_type },
 	/* PCA9547 - 8 channel i2c mux (NXP Layerscape ACPI) */
 	{ .compat = "NXP0002",
 	  .data = &mux8_type },
 	/* PCA9548 - 8 channel i2c switch */
 	{ .compat = "nxp,pca9548",
 	  .data = &switch8_type },
 	/* PCA9846 - 4 channel i2c switch */
 	{ .compat = "nxp,pca9846",
 	  .data = &switch4_type },
 	/* PCA9847 - 8 channel i2c mux */
 	{ .compat = "nxp,pca9847",
 	  .data = &mux8_type },
 	/* PCA9848 - 8 channel i2c switch */
 @@ -281,27 +285,27 @@ pcaiicmux_type_by_compat(const struct i2
 	return type;
+}
 static int
 pcaiicmux_match(device_t parent, cfdata_t cf, void *aux)
+{
 	struct i2c_attach_args * const ia = aux;
 	int match_result;
 	if (iic_use_direct_match(ia, cf, compat_data, &match_result)) {
 		return match_result;
+	}
 	/* This device is direct-config only. */
 	return 0;
+}
 static void
 pcaiicmux_attach(device_t parent, device_t self, void *aux)
+{
 	struct pcaiicmux_softc * const sc = device_private(self);
 	struct i2c_attach_args * const ia = aux;
 	const int phandle = (int)ia->ia_cookie;
 	int error;