[PATCH] remove many unneeded #includes of sched.h
[linux-2.6.git] / drivers / i2c / busses / i2c-ocores.c
index d5c0610..e417c2c 100644 (file)
@@ -9,10 +9,8 @@
  * kind, whether express or implied.
  */
 
-#include <linux/config.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
-#include <linux/sched.h>
 #include <linux/init.h>
 #include <linux/errno.h>
 #include <linux/platform_device.h>
@@ -38,8 +36,8 @@ struct ocores_i2c {
 #define OCI2C_PREHIGH          1
 #define OCI2C_CONTROL          2
 #define OCI2C_DATA             3
-#define OCI2C_CMD              4
-#define OCI2C_STATUS           4
+#define OCI2C_CMD              4 /* write only */
+#define OCI2C_STATUS           4 /* read only, same address as OCI2C_CMD */
 
 #define OCI2C_CTRL_IEN         0x40
 #define OCI2C_CTRL_EN          0x80
@@ -144,7 +142,7 @@ static void ocores_process(struct ocores_i2c *i2c)
        }
 }
 
-static irqreturn_t ocores_isr(int irq, void *dev_id, struct pt_regs *regs)
+static irqreturn_t ocores_isr(int irq, void *dev_id)
 {
        struct ocores_i2c *i2c = dev_id;
 
@@ -199,7 +197,7 @@ static u32 ocores_func(struct i2c_adapter *adap)
        return I2C_FUNC_I2C | I2C_FUNC_SMBUS_EMUL;
 }
 
-static struct i2c_algorithm ocores_algorithm = {
+static const struct i2c_algorithm ocores_algorithm = {
        .master_xfer    = ocores_xfer,
        .functionality  = ocores_func,
 };
@@ -209,8 +207,6 @@ static struct i2c_adapter ocores_adapter = {
        .name           = "i2c-ocores",
        .class          = I2C_CLASS_HWMON,
        .algo           = &ocores_algorithm,
-       .timeout        = 2,
-       .retries        = 1,
 };