 @@ -1,14 +1,14 @@
-/*	$NetBSD: i2c.h,v 1.8 2015/03/05 17:29:18 riastradh Exp $	*/
+/*	$NetBSD: i2c.h,v 1.9 2021/12/19 00:59:25 riastradh Exp $	*/
 /*-
  * Copyright (c) 2015 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Taylor R. Campbell.
+ *
  * 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.
 @@ -77,46 +77,56 @@ struct i2c_msg {
 	i2c_addr_t	addr;
 	uint16_t	flags;	/* I2C_M_* */
 	uint16_t	len;
 	uint8_t		*buf;
 };
 /*
  * struct i2c_adapter: An i2c bus controller.
  */
 struct i2c_adapter {
 	char		 		name[I2C_NAME_SIZE];
 	const struct i2c_algorithm	*algo;
 	void				*algo_data;
 	const struct i2c_lock_operations *lock_ops;
 	int				retries;
 	struct module			*owner;
 	unsigned int			class; /* I2C_CLASS_* */
 	struct {
 		device_t	parent;
 	}				dev;
 	void				*i2ca_adapdata;
 };
 /*
  * struct i2c_algorithm: A procedure for transferring an i2c message on
  * an i2c bus, along with a set of flags describing its functionality.
  */
 struct i2c_algorithm {
 	int		(*master_xfer)(struct i2c_adapter *, struct i2c_msg *,
 			    int);
 	uint32_t	(*functionality)(struct i2c_adapter *);
 };
 /*
  * struct i2c_lock_operations: i2c bus lock operations.
  */
 struct i2c_lock_operations {
 	void	(*lock_bus)(struct i2c_adapter *, unsigned);
 	int	(*trylock_bus)(struct i2c_adapter *, unsigned);
 	void	(*unlock_bus)(struct i2c_adapter *, unsigned);
 };
 /*
  * struct i2c_board_info: Parameters to find an i2c bus and a slave on
  * it.  type is the name of an i2c driver; addr is the slave address;
  * platform_data is an extra parameter to pass to the i2c driver.
  */
 struct i2c_board_info {
 	char			type[I2C_NAME_SIZE];
 	uint16_t		addr;
 	uint16_t		flags;
 	void			*platform_data;
 };
 #define	I2C_BOARD_INFO(board_type, board_addr)		\
 	.type = (board_type),				\

 @@ -1,14 +1,14 @@
-/*	$NetBSD: linux_i2c.c,v 1.3 2015/03/05 17:29:18 riastradh Exp $	*/
+/*	$NetBSD: linux_i2c.c,v 1.4 2021/12/19 00:59:25 riastradh Exp $	*/
 /*-
  * Copyright (c) 2015 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Taylor R. Campbell.
+ *
  * 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: linux_i2c.c,v 1.3 2015/03/05 17:29:18 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_i2c.c,v 1.4 2021/12/19 00:59:25 riastradh Exp $");
 #include <sys/types.h>
 #include <sys/errno.h>
 #include <sys/kmem.h>
 #include <sys/queue.h>		/* XXX include order botch: i2cvar.h needs */
 #include <dev/i2c/i2cvar.h>
 #include <dev/i2c/i2c_bitbang.h> /* XXX include order botch */
 #include <linux/i2c.h>
 #include <linux/i2c-algo-bit.h>
 static int	netbsd_i2c_transfer(i2c_tag_t, struct i2c_msg *, int);
 @@ -117,28 +117,35 @@ i2c_master_recv(const struct i2c_client
 		return ret;
 	return count;
+}
 /*
  * Adapter operations: operations over an i2c bus via a particular
  * controller.
  */
 int
 i2c_transfer(struct i2c_adapter *adapter, struct i2c_msg *msgs, int n)
+{
 	int ret;
 	if (adapter->lock_ops)
 		(*adapter->lock_ops->lock_bus)(adapter, 0);
 	ret = (*adapter->algo->master_xfer)(adapter, msgs, n);
 	if (adapter->lock_ops)
 		(*adapter->lock_ops->unlock_bus)(adapter, 0);
-	return (*adapter->algo->master_xfer)(adapter, msgs, n);
+	return ret;
+}
 static int
 netbsd_i2c_transfer(i2c_tag_t i2c, struct i2c_msg *msgs, int n)
+{
 	int i;
 	int error;
 	for (i = 0; i < n; i++) {
 		const i2c_op_t op = linux_i2c_flags_op(msgs[i].flags,
 		    ((i + 1) == n));
 		const int flags = linux_i2c_flags_flags(msgs[i].flags);