Signed-off-by: Ilkka Koskinen <ilkka.koskinen@nokia.com>

Signed-off-by: Éric Piel <eric.piel@tremplin-utc.net>
Cc: Matthew Garrett <mjg@redhat.com>
Cc: Witold Pilat <witold.pilat@gmail.com>
Cc: Lyall Pearce <lyall.pearce@hp.com>
Cc: Malte Starostik <m-starostik@versanet.de>
Cc: Thadeu Lima de Souza Cascardo <cascardo@holoscopio.com>
Cc: Christian Lamparter <chunkeey@googlemail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

diff --git a/drivers/misc/lis3lv02d/lis3lv02d.c b/drivers/misc/lis3lv02d/lis3lv02d.c
index a9ee5f73bba5d3cf67f917fcb668f290a5160adc..3ab838976e2a01c164593339f1c14c608c5a024b 100644 (file)
--- a/drivers/misc/lis3lv02d/lis3lv02d.c
+++ b/drivers/misc/lis3lv02d/lis3lv02d.c
@@ -831,23 +831,23 @@ int lis3lv02d_remove_fs(struct lis3lv02d *lis3)
 }
 EXPORT_SYMBOL_GPL(lis3lv02d_remove_fs);
 
-static void lis3lv02d_8b_configure(struct lis3lv02d *dev,
+static void lis3lv02d_8b_configure(struct lis3lv02d *lis3,
                                struct lis3lv02d_platform_data *p)
 {
        int err;
        int ctrl2 = p->hipass_ctrl;
 
        if (p->click_flags) {
-               dev->write(dev, CLICK_CFG, p->click_flags);
-               dev->write(dev, CLICK_TIMELIMIT, p->click_time_limit);
-               dev->write(dev, CLICK_LATENCY, p->click_latency);
-               dev->write(dev, CLICK_WINDOW, p->click_window);
-               dev->write(dev, CLICK_THSZ, p->click_thresh_z & 0xf);
-               dev->write(dev, CLICK_THSY_X,
+               lis3->write(lis3, CLICK_CFG, p->click_flags);
+               lis3->write(lis3, CLICK_TIMELIMIT, p->click_time_limit);
+               lis3->write(lis3, CLICK_LATENCY, p->click_latency);
+               lis3->write(lis3, CLICK_WINDOW, p->click_window);
+               lis3->write(lis3, CLICK_THSZ, p->click_thresh_z & 0xf);
+               lis3->write(lis3, CLICK_THSY_X,
                        (p->click_thresh_x & 0xf) |
                        (p->click_thresh_y << 4));
 
-               if (dev->idev) {
+               if (lis3->idev) {
                        struct input_dev *input_dev = lis3_dev.idev->input;
                        input_set_capability(input_dev, EV_KEY, BTN_X);
                        input_set_capability(input_dev, EV_KEY, BTN_Y);
@@ -856,22 +856,22 @@ static void lis3lv02d_8b_configure(struct lis3lv02d *dev,
        }
 
        if (p->wakeup_flags) {
-               dev->write(dev, FF_WU_CFG_1, p->wakeup_flags);
-               dev->write(dev, FF_WU_THS_1, p->wakeup_thresh & 0x7f);
+               lis3->write(lis3, FF_WU_CFG_1, p->wakeup_flags);
+               lis3->write(lis3, FF_WU_THS_1, p->wakeup_thresh & 0x7f);
                /* pdata value + 1 to keep this backward compatible*/
-               dev->write(dev, FF_WU_DURATION_1, p->duration1 + 1);
+               lis3->write(lis3, FF_WU_DURATION_1, p->duration1 + 1);
                ctrl2 ^= HP_FF_WU1; /* Xor to keep compatible with old pdata*/
        }
 
        if (p->wakeup_flags2) {
-               dev->write(dev, FF_WU_CFG_2, p->wakeup_flags2);
-               dev->write(dev, FF_WU_THS_2, p->wakeup_thresh2 & 0x7f);
+               lis3->write(lis3, FF_WU_CFG_2, p->wakeup_flags2);
+               lis3->write(lis3, FF_WU_THS_2, p->wakeup_thresh2 & 0x7f);
                /* pdata value + 1 to keep this backward compatible*/
-               dev->write(dev, FF_WU_DURATION_2, p->duration2 + 1);
+               lis3->write(lis3, FF_WU_DURATION_2, p->duration2 + 1);
                ctrl2 ^= HP_FF_WU2; /* Xor to keep compatible with old pdata*/
        }
        /* Configure hipass filters */
-       dev->write(dev, CTRL_REG2, ctrl2);
+       lis3->write(lis3, CTRL_REG2, ctrl2);
 
        if (p->irq2) {
                err = request_threaded_irq(p->irq2,
@@ -889,72 +889,72 @@ static void lis3lv02d_8b_configure(struct lis3lv02d *dev,
  * Initialise the accelerometer and the various subsystems.
  * Should be rather independent of the bus system.
  */
-int lis3lv02d_init_device(struct lis3lv02d *dev)
+int lis3lv02d_init_device(struct lis3lv02d *lis3)
 {
        int err;
        irq_handler_t thread_fn;
        int irq_flags = 0;
 
-       dev->whoami = lis3lv02d_read_8(dev, WHO_AM_I);
+       lis3->whoami = lis3lv02d_read_8(lis3, WHO_AM_I);
 
-       switch (dev->whoami) {
+       switch (lis3->whoami) {
        case WAI_12B:
                pr_info("12 bits sensor found\n");
-               dev->read_data = lis3lv02d_read_12;
-               dev->mdps_max_val = 2048;
-               dev->pwron_delay = LIS3_PWRON_DELAY_WAI_12B;
-               dev->odrs = lis3_12_rates;
-               dev->odr_mask = CTRL1_DF0 | CTRL1_DF1;
-               dev->scale = LIS3_SENSITIVITY_12B;
-               dev->regs = lis3_wai12_regs;
-               dev->regs_size = ARRAY_SIZE(lis3_wai12_regs);
+               lis3->read_data = lis3lv02d_read_12;
+               lis3->mdps_max_val = 2048;
+               lis3->pwron_delay = LIS3_PWRON_DELAY_WAI_12B;
+               lis3->odrs = lis3_12_rates;
+               lis3->odr_mask = CTRL1_DF0 | CTRL1_DF1;
+               lis3->scale = LIS3_SENSITIVITY_12B;
+               lis3->regs = lis3_wai12_regs;
+               lis3->regs_size = ARRAY_SIZE(lis3_wai12_regs);
                break;
        case WAI_8B:
                pr_info("8 bits sensor found\n");
-               dev->read_data = lis3lv02d_read_8;
-               dev->mdps_max_val = 128;
-               dev->pwron_delay = LIS3_PWRON_DELAY_WAI_8B;
-               dev->odrs = lis3_8_rates;
-               dev->odr_mask = CTRL1_DR;
-               dev->scale = LIS3_SENSITIVITY_8B;
-               dev->regs = lis3_wai8_regs;
-               dev->regs_size = ARRAY_SIZE(lis3_wai8_regs);
+               lis3->read_data = lis3lv02d_read_8;
+               lis3->mdps_max_val = 128;
+               lis3->pwron_delay = LIS3_PWRON_DELAY_WAI_8B;
+               lis3->odrs = lis3_8_rates;
+               lis3->odr_mask = CTRL1_DR;
+               lis3->scale = LIS3_SENSITIVITY_8B;
+               lis3->regs = lis3_wai8_regs;
+               lis3->regs_size = ARRAY_SIZE(lis3_wai8_regs);
                break;
        case WAI_3DC:
                pr_info("8 bits 3DC sensor found\n");
-               dev->read_data = lis3lv02d_read_8;
-               dev->mdps_max_val = 128;
-               dev->pwron_delay = LIS3_PWRON_DELAY_WAI_8B;
-               dev->odrs = lis3_3dc_rates;
-               dev->odr_mask = CTRL1_ODR0|CTRL1_ODR1|CTRL1_ODR2|CTRL1_ODR3;
-               dev->scale = LIS3_SENSITIVITY_8B;
+               lis3->read_data = lis3lv02d_read_8;
+               lis3->mdps_max_val = 128;
+               lis3->pwron_delay = LIS3_PWRON_DELAY_WAI_8B;
+               lis3->odrs = lis3_3dc_rates;
+               lis3->odr_mask = CTRL1_ODR0|CTRL1_ODR1|CTRL1_ODR2|CTRL1_ODR3;
+               lis3->scale = LIS3_SENSITIVITY_8B;
                break;
        default:
-               pr_err("unknown sensor type 0x%X\n", dev->whoami);
+               pr_err("unknown sensor type 0x%X\n", lis3->whoami);
                return -EINVAL;
        }
 
-       dev->reg_cache = kzalloc(max(sizeof(lis3_wai8_regs),
+       lis3->reg_cache = kzalloc(max(sizeof(lis3_wai8_regs),
                                     sizeof(lis3_wai12_regs)), GFP_KERNEL);
 
-       if (dev->reg_cache == NULL) {
+       if (lis3->reg_cache == NULL) {
                printk(KERN_ERR DRIVER_NAME "out of memory\n");
                return -ENOMEM;
        }
 
-       mutex_init(&dev->mutex);
-       atomic_set(&dev->wake_thread, 0);
+       mutex_init(&lis3->mutex);
+       atomic_set(&lis3->wake_thread, 0);
 
-       lis3lv02d_add_fs(dev);
-       err = lis3lv02d_poweron(dev);
+       lis3lv02d_add_fs(lis3);
+       err = lis3lv02d_poweron(lis3);
        if (err) {
-               lis3lv02d_remove_fs(dev);
+               lis3lv02d_remove_fs(lis3);
                return err;
        }
 
-       if (dev->pm_dev) {
-               pm_runtime_set_active(dev->pm_dev);
-               pm_runtime_enable(dev->pm_dev);
+       if (lis3->pm_dev) {
+               pm_runtime_set_active(lis3->pm_dev);
+               pm_runtime_enable(lis3->pm_dev);
        }
 
        if (lis3lv02d_joystick_enable())
@@ -962,24 +962,24 @@ int lis3lv02d_init_device(struct lis3lv02d *dev)
 
        /* passing in platform specific data is purely optional and only
         * used by the SPI transport layer at the moment */
-       if (dev->pdata) {
-               struct lis3lv02d_platform_data *p = dev->pdata;
+       if (lis3->pdata) {
+               struct lis3lv02d_platform_data *p = lis3->pdata;
 
-               if (dev->whoami == WAI_8B)
-                       lis3lv02d_8b_configure(dev, p);
+               if (lis3->whoami == WAI_8B)
+                       lis3lv02d_8b_configure(lis3, p);
 
                irq_flags = p->irq_flags1 & IRQF_TRIGGER_MASK;
 
-               dev->irq_cfg = p->irq_cfg;
+               lis3->irq_cfg = p->irq_cfg;
                if (p->irq_cfg)
-                       dev->write(dev, CTRL_REG3, p->irq_cfg);
+                       lis3->write(lis3, CTRL_REG3, p->irq_cfg);
 
                if (p->default_rate)
                        lis3lv02d_set_odr(p->default_rate);
        }
 
        /* bail if we did not get an IRQ from the bus layer */
-       if (!dev->irq) {
+       if (!lis3->irq) {
                pr_debug("No IRQ. Disabling /dev/freefall\n");
                goto out;
        }
@@ -995,12 +995,12 @@ int lis3lv02d_init_device(struct lis3lv02d *dev)
         * io-apic is not configurable (and generates a warning) but I keep it
         * in case of support for other hardware.
         */
-       if (dev->pdata && dev->whoami == WAI_8B)
+       if (lis3->pdata && lis3->whoami == WAI_8B)
                thread_fn = lis302dl_interrupt_thread1_8b;
        else
                thread_fn = NULL;
 
-       err = request_threaded_irq(dev->irq, lis302dl_interrupt,
+       err = request_threaded_irq(lis3->irq, lis302dl_interrupt,
                                thread_fn,
                                IRQF_TRIGGER_RISING | IRQF_ONESHOT |
                                irq_flags,