Changeset 3765 for i2c/trunk/kernel/i2c.h

Timestamp:

01/21/03 09:08:16 (10 years ago)

Author:

kmalkki

Message:

(Kyösti) More cleanups

Redo i2c-core locks.

No longer pass controlling_mod in i2cproc_register_entry, use
client->driver->owner instead.

Comment out or remove obsolete parts of mkpatch for 2.5.
Currently it does not touch kernel build/configure system at all.

Cleanup #include order. Note that kernel headers are not to be
included for userland utilities, to promote binary compatibility of
utilities across kernel versions.

Remove bus_scans. Remove empty and unused algo_control and
debugging code that would not compile if uncommented.

Files:

• i2c/trunk/kernel/i2c.h (modified) (10 diffs)

i2c/trunk/kernel/i2c.h

@@ -32 +32 @@
 #define I2C_VERSION "2.7.0"
 
-#include "i2c-id.h"     /* id values of adapters et. al.        */
+#include <linux/module.h>
 #include <linux/types.h>
-
-
-struct i2c_msg;
-
-
-#ifdef __KERNEL__
-
-#include <linux/config.h>
+#include "i2c-id.h"
 #include <asm/semaphore.h>
-
 
 /* --- General options ------------------------------------------------ */
@@ -53 +45 @@
 #define I2C_DUMMY_MAX 4
 
+struct i2c_msg;
 struct i2c_algorithm;
 struct i2c_adapter;
@@ -59 +52 @@
 struct i2c_client_address_data;
 union i2c_smbus_data;
-
 
 /*
@@ -183 +175 @@
  */
 struct i2c_algorithm {
+        struct module *owner;                   /* future use --km      */
         char name[32];                          /* textual description  */
         unsigned int id;
@@ -207 +200 @@
 };
 
-
 /*
  * i2c_adapter is the structure used to identify a physical i2c bus along
@@ -230 +222 @@
 
                         /* data fields that are valid for all devices   */
-        struct semaphore lock;  
+        struct semaphore bus;
+        struct semaphore list;  
         unsigned int flags;/* flags specifying div. data                */
 
         struct i2c_client *clients[I2C_CLIENT_MAX];
-        int client_count;
 
         int timeout;
@@ -327 +319 @@
                 i2c_client_found_addr_proc *found_proc);
 
+static inline int i2c_client_command(struct i2c_client *client,
+                                     unsigned int cmd, void *arg)
+{
+        if (client->driver && client->driver->command)
+                return client->driver->command(client, cmd, arg);
+        else
+                return -EINVAL;
+}
+
 /* An ioctl like call to set div. parameters of the adapter.
  */
@@ -343 +344 @@
 /* Return 1 if adapter supports everything we need, 0 if not. */
 extern int i2c_check_functionality (struct i2c_adapter *adap, u32 func);
-
-#endif /* __KERNEL__ */
 
 /*
@@ -497 +496 @@
 #define I2C_MAJOR       89              /* Device major number          */
 
-#ifdef __KERNEL__
-
-#  ifndef NULL
-#    define NULL ( (void *) 0 )
-#  endif
-
-#  ifndef ENODEV
-#    include <asm/errno.h>
-#  endif
-
 /* These defines are used for probing i2c client addresses */
 /* Default fill of many variables */
@@ -568 +557 @@
         ((adapptr)->algo->id == I2C_ALGO_ISA)
 
-#endif /* def __KERNEL__ */
 #endif /* _LINUX_I2C_H */