linuxkpi: Allow recursive calls to i2c_transfer

Fixes FreeBSDDesktop/kms-drm#134 This was FreeBSDDesktop/kms-drm@78e51d0
freebsd · Nov 6, 2020 · 8bac060 · 8bac060
1 parent 7601f86
commit 8bac060
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/linuxkpi/gplv2/include/linux/i2c.h b/linuxkpi/gplv2/include/linux/i2c.h
@@ -225,11 +225,10 @@ extern int i2c_register_driver(struct module *, struct i2c_driver *);
 extern void i2c_del_driver(struct i2c_driver *);
 
 
+extern int __i2c_transfer(struct i2c_adapter *adap, struct i2c_msg *msgs,
+                        int num);
 extern int i2c_transfer(struct i2c_adapter *adap, struct i2c_msg *msgs,
                         int num);
-// XXX: locked or unlocked, does it matter since we have our own lock
-// and don't lock with provided lock_bus function?
-#define	__i2c_transfer(a, m, n)	i2c_transfer(a, m, n)
 
 static inline void
 i2c_unregister_device(struct i2c_client *client)

diff --git a/linuxkpi/gplv2/src/linux_i2c.c b/linuxkpi/gplv2/src/linux_i2c.c
@@ -564,6 +564,18 @@ linux_i2c_transfer(struct i2c_adapter *adap, struct i2c_msg *msgs, int num)
 	return (rc);
 }
 
+int
+__i2c_transfer(struct i2c_adapter *adap, struct i2c_msg *msgs, int num)
+{
+	int rc;
+
+	if (adap->algo->master_xfer == NULL)
+		return (-EOPNOTSUPP);
+
+	rc = linux_i2c_transfer(adap, msgs, num);
+	return (rc);
+}
+
 int
 i2c_transfer(struct i2c_adapter *adap, struct i2c_msg *msgs, int num)
 {