cpqarray: switch to seq_file

[safe/jmp/linux-2.6] / drivers / mfd / wm8350-core.c

diff --git a/drivers/mfd/wm8350-core.c b/drivers/mfd/wm8350-core.c
index a285cc0..ba27c9d 100644 (file)
--- a/drivers/mfd/wm8350-core.c
+++ b/drivers/mfd/wm8350-core.c
@@ -79,10 +79,6 @@ static int wm8350_phys_read(struct wm8350 *wm8350, u8 reg, int num_regs,
                /* Cache is CPU endian */
                dest[i - reg] = be16_to_cpu(dest[i - reg]);
 
-               /* Satisfy non-volatile bits from cache */
-               dest[i - reg] &= wm8350_reg_io_map[i].vol;
-               dest[i - reg] |= wm8350->reg_cache[i];
-
                /* Mask out non-readable bits */
                dest[i - reg] &= wm8350_reg_io_map[i].readable;
        }
@@ -182,9 +178,6 @@ static int wm8350_write(struct wm8350 *wm8350, u8 reg, int num_regs, u16 *src)
                        (wm8350->reg_cache[i] & ~wm8350_reg_io_map[i].writable)
                        | src[i - reg];
 
-               /* Don't store volatile bits */
-               wm8350->reg_cache[i] &= ~wm8350_reg_io_map[i].vol;
-
                src[i - reg] = cpu_to_be16(src[i - reg]);
        }
 
@@ -360,15 +353,15 @@ static void wm8350_irq_call_handler(struct wm8350 *wm8350, int irq)
 }
 
 /*
- * wm8350_irq_worker actually handles the interrupts.  Since all
+ * This is a threaded IRQ handler so can access I2C/SPI.  Since all
  * interrupts are clear on read the IRQ line will be reasserted and
  * the physical IRQ will be handled again if another interrupt is
  * asserted while we run - in the normal course of events this is a
  * rare occurrence so we save I2C/SPI reads.
  */
-static void wm8350_irq_worker(struct work_struct *work)
+static irqreturn_t wm8350_irq(int irq, void *data)
 {
-       struct wm8350 *wm8350 = container_of(work, struct wm8350, irq_work);
+       struct wm8350 *wm8350 = data;
        u16 level_one, status1, status2, comp;
 
        /* TODO: Use block reads to improve performance? */
@@ -559,16 +552,6 @@ static void wm8350_irq_worker(struct work_struct *work)
                }
        }
 
-       enable_irq(wm8350->chip_irq);
-}
-
-static irqreturn_t wm8350_irq(int irq, void *data)
-{
-       struct wm8350 *wm8350 = data;
-
-       disable_irq_nosync(irq);
-       schedule_work(&wm8350->irq_work);
-
        return IRQ_HANDLED;
 }
 
@@ -1111,7 +1094,7 @@ int wm8350_read_auxadc(struct wm8350 *wm8350, int channel, int scale, int vref)
        do {
                schedule_timeout_interruptible(1);
                reg = wm8350_reg_read(wm8350, WM8350_DIGITISER_CONTROL_1);
-       } while (--tries && (reg & WM8350_AUXADC_POLL));
+       } while ((reg & WM8350_AUXADC_POLL) && --tries);
 
        if (!tries)
                dev_err(wm8350->dev, "adc chn %d read timeout\n", channel);
@@ -1261,7 +1244,6 @@ static int wm8350_create_cache(struct wm8350 *wm8350, int type, int mode)
                    (i < WM8350_CLOCK_CONTROL_1 || i > WM8350_AIF_TEST)) {
                        value = be16_to_cpu(wm8350->reg_cache[i]);
                        value &= wm8350_reg_io_map[i].readable;
-                       value &= ~wm8350_reg_io_map[i].vol;
                        wm8350->reg_cache[i] = value;
                } else
                        wm8350->reg_cache[i] = reg_map[i];
@@ -1436,9 +1418,8 @@ int wm8350_device_init(struct wm8350 *wm8350, int irq,
 
        mutex_init(&wm8350->auxadc_mutex);
        mutex_init(&wm8350->irq_mutex);
-       INIT_WORK(&wm8350->irq_work, wm8350_irq_worker);
        if (irq) {
-               int flags = 0;
+               int flags = IRQF_ONESHOT;
 
                if (pdata && pdata->irq_high) {
                        flags |= IRQF_TRIGGER_HIGH;
@@ -1452,8 +1433,8 @@ int wm8350_device_init(struct wm8350 *wm8350, int irq,
                                          WM8350_IRQ_POL);
                }
 
-               ret = request_irq(irq, wm8350_irq, flags,
-                                 "wm8350", wm8350);
+               ret = request_threaded_irq(irq, NULL, wm8350_irq, flags,
+                                          "wm8350", wm8350);
                if (ret != 0) {
                        dev_err(wm8350->dev, "Failed to request IRQ: %d\n",
                                ret);
@@ -1480,6 +1461,8 @@ int wm8350_device_init(struct wm8350 *wm8350, int irq,
                                   &(wm8350->codec.pdev));
        wm8350_client_dev_register(wm8350, "wm8350-gpio",
                                   &(wm8350->gpio.pdev));
+       wm8350_client_dev_register(wm8350, "wm8350-hwmon",
+                                  &(wm8350->hwmon.pdev));
        wm8350_client_dev_register(wm8350, "wm8350-power",
                                   &(wm8350->power.pdev));
        wm8350_client_dev_register(wm8350, "wm8350-rtc", &(wm8350->rtc.pdev));
@@ -1506,11 +1489,11 @@ void wm8350_device_exit(struct wm8350 *wm8350)
        platform_device_unregister(wm8350->wdt.pdev);
        platform_device_unregister(wm8350->rtc.pdev);
        platform_device_unregister(wm8350->power.pdev);
+       platform_device_unregister(wm8350->hwmon.pdev);
        platform_device_unregister(wm8350->gpio.pdev);
        platform_device_unregister(wm8350->codec.pdev);
 
        free_irq(wm8350->chip_irq, wm8350);
-       flush_work(&wm8350->irq_work);
        kfree(wm8350->reg_cache);
 }
 EXPORT_SYMBOL_GPL(wm8350_device_exit);