Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus

[linux-2.6-omap-h63xx.git] / arch / arm / mach-pxa / akita-ioexp.c

diff --git a/arch/arm/mach-pxa/akita-ioexp.c b/arch/arm/mach-pxa/akita-ioexp.c
index f6d73cc01f783b1f6c572be87300a97238d0a0b8..12d2fe0ceff6c8032fc90eab06370f114146d1a6 100644 (file)
--- a/arch/arm/mach-pxa/akita-ioexp.c
+++ b/arch/arm/mach-pxa/akita-ioexp.c
@@ -36,11 +36,11 @@ I2C_CLIENT_INSMOD;
 
 static int max7310_write(struct i2c_client *client, int address, int data);
 static struct i2c_client max7310_template;
-static void akita_ioexp_work(void *private_);
+static void akita_ioexp_work(struct work_struct *private_);
 
 static struct device *akita_ioexp_device;
 static unsigned char ioexp_output_value = AKITA_IOEXP_IO_OUT;
-DECLARE_WORK(akita_ioexp, akita_ioexp_work, NULL);
+DECLARE_WORK(akita_ioexp, akita_ioexp_work);
 
 
 /*
@@ -124,17 +124,16 @@ static int max7310_detach_client(struct i2c_client *client)
 }
 
 static struct i2c_driver max7310_i2c_driver = {
-       .owner          = THIS_MODULE,
-       .name           = "akita-max7310",
+       .driver = {
+               .name   = "akita-max7310",
+       },
        .id             = I2C_DRIVERID_AKITAIOEXP,
-       .flags          = I2C_DF_NOTIFY,
        .attach_adapter = max7310_attach_adapter,
        .detach_client  = max7310_detach_client,
 };
 
 static struct i2c_client max7310_template = {
        name:   "akita-max7310",
-       flags:  I2C_CLIENT_ALLOW_USE,
        driver: &max7310_i2c_driver,
 };
 
@@ -159,7 +158,7 @@ void akita_reset_ioexp(struct device *dev, unsigned char bit)
 EXPORT_SYMBOL(akita_set_ioexp);
 EXPORT_SYMBOL(akita_reset_ioexp);
 
-static void akita_ioexp_work(void *private_)
+static void akita_ioexp_work(struct work_struct *private_)
 {
        if (akita_ioexp_device)
                max7310_set_ouputs(akita_ioexp_device, ioexp_output_value);