From 31114b475c46780790ee7646e4eb3cc3639392be Mon Sep 17 00:00:00 2001 From: Lars-Peter Clausen Date: Sat, 12 May 2012 15:39:38 +0200 Subject: [PATCH] --- yaml --- r: 304671 b: refs/heads/master c: 8dc5afd8cb9b9a1253fdaa4e25d3ac1dccca6319 h: refs/heads/master i: 304669: faf386801440bdd47dee407290bb3311e52628fa 304667: b395790e0ef3c395a44c156ba68e115c6ab03ff8 304663: f124ee37ca661a40fa54b1465da0516e62bc31ac 304655: 6eeb1c4952fbec0f65b50c5b50c898134ca4c087 304639: f9ef6119662089e7b3b0c9dd768a57c1fa141629 v: v3 --- [refs] | 2 +- trunk/drivers/staging/iio/accel/lis3l02dq_ring.c | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 278693d02afe..9d5428278aa8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4a5b7610807a01156bc626be1718d8e423a75101 +refs/heads/master: 8dc5afd8cb9b9a1253fdaa4e25d3ac1dccca6319 diff --git a/trunk/drivers/staging/iio/accel/lis3l02dq_ring.c b/trunk/drivers/staging/iio/accel/lis3l02dq_ring.c index 9306f934e333..51b00dfc0465 100644 --- a/trunk/drivers/staging/iio/accel/lis3l02dq_ring.c +++ b/trunk/drivers/staging/iio/accel/lis3l02dq_ring.c @@ -163,12 +163,11 @@ static irqreturn_t lis3l02dq_trigger_handler(int irq, void *p) /* Caller responsible for locking as necessary. */ static int -__lis3l02dq_write_data_ready_config(struct device *dev, bool state) +__lis3l02dq_write_data_ready_config(struct iio_dev *indio_dev, bool state) { int ret; u8 valold; bool currentlyset; - struct iio_dev *indio_dev = dev_get_drvdata(dev); struct lis3l02dq_state *st = iio_priv(indio_dev); /* Get the current event mask register */ @@ -236,7 +235,7 @@ static int lis3l02dq_data_rdy_trigger_set_state(struct iio_trigger *trig, int ret = 0; u8 t; - __lis3l02dq_write_data_ready_config(&indio_dev->dev, state); + __lis3l02dq_write_data_ready_config(indio_dev, state); if (state == false) { /* * A possible quirk with the handler is currently worked around