From 1cca8746984daf047251c14269ceec36ab05c75a Mon Sep 17 00:00:00 2001 From: Wolfram Sang Date: Mon, 24 Dec 2012 09:48:55 -0800 Subject: [PATCH] --- yaml --- r: 350664 b: refs/heads/master c: ad4e58b0478ba8d34a3ddf695b3ceabe9510a839 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/input/misc/adxl34x.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 213626b9daee..74a884b74cb0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5d3caa442e0858fa07b9a6a68d05e1ba2cf246a4 +refs/heads/master: ad4e58b0478ba8d34a3ddf695b3ceabe9510a839 diff --git a/trunk/drivers/input/misc/adxl34x.c b/trunk/drivers/input/misc/adxl34x.c index 1cf72fe513e6..b18d3e2a6ea5 100644 --- a/trunk/drivers/input/misc/adxl34x.c +++ b/trunk/drivers/input/misc/adxl34x.c @@ -732,7 +732,7 @@ struct adxl34x *adxl34x_probe(struct device *dev, int irq, mutex_init(&ac->mutex); input_dev->name = "ADXL34x accelerometer"; - revid = ac->bops->read(dev, DEVID); + revid = AC_READ(ac, DEVID); switch (revid) { case ID_ADXL345: @@ -809,7 +809,7 @@ struct adxl34x *adxl34x_probe(struct device *dev, int irq, if (FIFO_MODE(pdata->fifo_mode) == FIFO_BYPASS) ac->fifo_delay = false; - ac->bops->write(dev, POWER_CTL, 0); + AC_WRITE(ac, POWER_CTL, 0); err = request_threaded_irq(ac->irq, NULL, adxl34x_irq, IRQF_TRIGGER_HIGH | IRQF_ONESHOT,