1 files changed, 35 insertions, 27 deletions

diff --git a/drivers/mfd/ab3100-core.c b/drivers/mfd/ab3100-core.c
index 13e7d7bfe85f..c533f86ff5ea 100644
--- a/drivers/mfd/ab3100-core.c
+++ b/drivers/mfd/ab3100-core.c
@@ -14,7 +14,6 @@
 #include <linux/platform_device.h>
 #include <linux/device.h>
 #include <linux/interrupt.h>
-#include <linux/workqueue.h>
 #include <linux/debugfs.h>
 #include <linux/seq_file.h>
 #include <linux/uaccess.h>
@@ -77,7 +76,7 @@ u8 ab3100_get_chip_type(struct ab3100 *ab3100)
 }
 EXPORT_SYMBOL(ab3100_get_chip_type);
 
-int ab3100_set_register(struct ab3100 *ab3100, u8 reg, u8 regval)
+int ab3100_set_register_interruptible(struct ab3100 *ab3100, u8 reg, u8 regval)
 {
         u8 regandval[2] = {reg, regval};
         int err;
@@ -107,9 +106,10 @@ int ab3100_set_register(struct ab3100 *ab3100, u8 reg, u8 regval)
                 err = 0;
         }
         mutex_unlock(&ab3100->access_mutex);
-        return 0;
+        return err;
 }
-EXPORT_SYMBOL(ab3100_set_register);
+EXPORT_SYMBOL(ab3100_set_register_interruptible);
+
 
 /*
  * The test registers exist at an I2C bus address up one
@@ -118,7 +118,7 @@ EXPORT_SYMBOL(ab3100_set_register);
  * anyway. It's currently only used from this file so declare
  * it static and do not export.
  */
-static int ab3100_set_test_register(struct ab3100 *ab3100,
+static int ab3100_set_test_register_interruptible(struct ab3100 *ab3100,
                                     u8 reg, u8 regval)
 {
         u8 regandval[2] = {reg, regval};
@@ -148,7 +148,8 @@ static int ab3100_set_test_register(struct ab3100 *ab3100,
         return err;
 }
 
-int ab3100_get_register(struct ab3100 *ab3100, u8 reg, u8 *regval)
+
+int ab3100_get_register_interruptible(struct ab3100 *ab3100, u8 reg, u8 *regval)
 {
         int err;
 
@@ -202,9 +203,10 @@ int ab3100_get_register(struct ab3100 *ab3100, u8 reg, u8 *regval)
         mutex_unlock(&ab3100->access_mutex);
         return err;
 }
-EXPORT_SYMBOL(ab3100_get_register);
+EXPORT_SYMBOL(ab3100_get_register_interruptible);
 
-int ab3100_get_register_page(struct ab3100 *ab3100,
+
+int ab3100_get_register_page_interruptible(struct ab3100 *ab3100,
                              u8 first_reg, u8 *regvals, u8 numregs)
 {
         int err;
@@ -258,9 +260,10 @@ int ab3100_get_register_page(struct ab3100 *ab3100,
         mutex_unlock(&ab3100->access_mutex);
         return err;
 }
-EXPORT_SYMBOL(ab3100_get_register_page);
+EXPORT_SYMBOL(ab3100_get_register_page_interruptible);
+
 
-int ab3100_mask_and_set_register(struct ab3100 *ab3100,
+int ab3100_mask_and_set_register_interruptible(struct ab3100 *ab3100,
                                  u8 reg, u8 andmask, u8 ormask)
 {
         u8 regandval[2] = {reg, 0};
@@ -328,7 +331,8 @@ int ab3100_mask_and_set_register(struct ab3100 *ab3100,
         mutex_unlock(&ab3100->access_mutex);
         return err;
 }
-EXPORT_SYMBOL(ab3100_mask_and_set_register);
+EXPORT_SYMBOL(ab3100_mask_and_set_register_interruptible);
+
 
 /*
  * Register a simple callback for handling any AB3100 events.
@@ -371,7 +375,7 @@ static void ab3100_work(struct work_struct *work)
         u32 fatevent;
         int err;
 
-        err = ab3100_get_register_page(ab3100, AB3100_EVENTA1,
+        err = ab3100_get_register_page_interruptible(ab3100, AB3100_EVENTA1,
                                        event_regs, 3);
         if (err)
                 goto err_event_wq;
@@ -417,7 +421,7 @@ static irqreturn_t ab3100_irq_handler(int irq, void *data)
          * stuff and we will re-enable the interrupts once th
          * worker has finished.
          */
-        disable_irq(ab3100->i2c_client->irq);
+        disable_irq_nosync(irq);
         schedule_work(&ab3100->work);
         return IRQ_HANDLED;
 }
@@ -435,7 +439,7 @@ static int ab3100_registers_print(struct seq_file *s, void *p)
         seq_printf(s, "AB3100 registers:\n");
 
         for (reg = 0; reg < 0xff; reg++) {
-                ab3100_get_register(ab3100, reg, &value);
+                ab3100_get_register_interruptible(ab3100, reg, &value);
                 seq_printf(s, "[0x%x]:  0x%x\n", reg, value);
         }
         return 0;
@@ -465,14 +469,14 @@ static int ab3100_get_set_reg_open_file(struct inode *inode, struct file *file)
         return 0;
 }
 
-static int ab3100_get_set_reg(struct file *file,
-                              const char __user *user_buf,
-                              size_t count, loff_t *ppos)
+static ssize_t ab3100_get_set_reg(struct file *file,
+                                  const char __user *user_buf,
+                                  size_t count, loff_t *ppos)
 {
         struct ab3100_get_set_reg_priv *priv = file->private_data;
         struct ab3100 *ab3100 = priv->ab3100;
         char buf[32];
-        int buf_size;
+        ssize_t buf_size;
         int regp;
         unsigned long user_reg;
         int err;
@@ -515,7 +519,7 @@ static int ab3100_get_set_reg(struct file *file,
                 u8 reg = (u8) user_reg;
                 u8 regvalue;
 
-                ab3100_get_register(ab3100, reg, &regvalue);
+                ab3100_get_register_interruptible(ab3100, reg, &regvalue);
 
                 dev_info(ab3100->dev,
                          "debug read AB3100 reg[0x%02x]: 0x%02x\n",
@@ -547,8 +551,8 @@ static int ab3100_get_set_reg(struct file *file,
                         return -EINVAL;
 
                 value = (u8) user_value;
-                ab3100_set_register(ab3100, reg, value);
-                ab3100_get_register(ab3100, reg, &regvalue);
+                ab3100_set_register_interruptible(ab3100, reg, value);
+                ab3100_get_register_interruptible(ab3100, reg, &regvalue);
 
                 dev_info(ab3100->dev,
                          "debug write reg[0x%02x] with 0x%02x, "
@@ -662,7 +666,7 @@ ab3100_init_settings[] = {
                 .setting = 0x01
         }, {
                 .abreg = AB3100_IMRB1,
-                .setting = 0xFF
+                .setting = 0xBF
         }, {
                 .abreg = AB3100_IMRB2,
                 .setting = 0xFF
@@ -696,7 +700,7 @@ static int __init ab3100_setup(struct ab3100 *ab3100)
         int i;
 
         for (i = 0; i < ARRAY_SIZE(ab3100_init_settings); i++) {
-                err = ab3100_set_register(ab3100,
+                err = ab3100_set_register_interruptible(ab3100,
                                           ab3100_init_settings[i].abreg,
                                           ab3100_init_settings[i].setting);
                 if (err)
@@ -705,14 +709,14 @@ static int __init ab3100_setup(struct ab3100 *ab3100)
 
         /*
          * Special trick to make the AB3100 use the 32kHz clock (RTC)
-         * bit 3 in test registe 0x02 is a special, undocumented test
+         * bit 3 in test register 0x02 is a special, undocumented test
          * register bit that only exist in AB3100 P1E
          */
         if (ab3100->chip_id == 0xc4) {
                 dev_warn(ab3100->dev,
                          "AB3100 P1E variant detected, "
                          "forcing chip to 32KHz\n");
-                err = ab3100_set_test_register(ab3100, 0x02, 0x08);
+                err = ab3100_set_test_register_interruptible(ab3100, 0x02, 0x08);
         }
 
  exit_no_setup:
@@ -833,6 +837,8 @@ static int __init ab3100_probe(struct i2c_client *client,
                         const struct i2c_device_id *id)
 {
         struct ab3100 *ab3100;
+        struct ab3100_platform_data *ab3100_plf_data =
+                client->dev.platform_data;
         int err;
         int i;
 
@@ -852,8 +858,8 @@ static int __init ab3100_probe(struct i2c_client *client,
         i2c_set_clientdata(client, ab3100);
 
         /* Read chip ID register */
-        err = ab3100_get_register(ab3100, AB3100_CID,
-                                  &ab3100->chip_id);
+        err = ab3100_get_register_interruptible(ab3100, AB3100_CID,
+                                                &ab3100->chip_id);
         if (err) {
                 dev_err(&client->dev,
                         "could not communicate with the AB3100 analog "
@@ -916,6 +922,8 @@ static int __init ab3100_probe(struct i2c_client *client,
         for (i = 0; i < ARRAY_SIZE(ab3100_platform_devs); i++) {
                 ab3100_platform_devs[i]->dev.parent =
                         &client->dev;
+                ab3100_platform_devs[i]->dev.platform_data =
+                        ab3100_plf_data;
                 platform_set_drvdata(ab3100_platform_devs[i], ab3100);
         }