aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorUwe Kleine-König <u.kleine-koenig@pengutronix.de>2010-03-05 16:44:26 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2010-03-06 14:26:47 -0500
commit2a83319182afe9ba7d958180b3bd3a32a9e3d1be (patch)
tree14ee3aa6f0e8534fdbbf7ec81f5af048b7abbc17
parent57205026da070b59e9546df352fe465f1aeacf99 (diff)
input/mc13783-ts: don't use deprecated mc13783 API calls
mc13783_ackirq is deprecated, use the drop in replacement mc13783_irq_ack. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Cc: Alessandro Zummo <a.zummo@towertech.it> Cc: Paul Gortmaker <p_gortmaker@yahoo.com> Cc: Valentin Longchamp <valentin.longchamp@epfl.ch> Cc: Sascha Hauer <s.hauer@pengutronix.de> Cc: Samuel Ortiz <sameo@linux.intel.com> Acked-by: Dmitry Torokhov <dtor@mail.ru> Cc: Luotao Fu <l.fu@pengutronix.de> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--drivers/input/touchscreen/mc13783_ts.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/input/touchscreen/mc13783_ts.c b/drivers/input/touchscreen/mc13783_ts.c
index be115b3b65eb..be54fd639aca 100644
--- a/drivers/input/touchscreen/mc13783_ts.c
+++ b/drivers/input/touchscreen/mc13783_ts.c
@@ -44,7 +44,7 @@ static irqreturn_t mc13783_ts_handler(int irq, void *data)
44{ 44{
45 struct mc13783_ts_priv *priv = data; 45 struct mc13783_ts_priv *priv = data;
46 46
47 mc13783_ackirq(priv->mc13783, irq); 47 mc13783_irq_ack(priv->mc13783, irq);
48 48
49 /* 49 /*
50 * Kick off reading coordinates. Note that if work happens already 50 * Kick off reading coordinates. Note that if work happens already
@@ -135,7 +135,7 @@ static int mc13783_ts_open(struct input_dev *dev)
135 135
136 mc13783_lock(priv->mc13783); 136 mc13783_lock(priv->mc13783);
137 137
138 mc13783_ackirq(priv->mc13783, MC13783_IRQ_TS); 138 mc13783_irq_ack(priv->mc13783, MC13783_IRQ_TS);
139 139
140 ret = mc13783_irq_request(priv->mc13783, MC13783_IRQ_TS, 140 ret = mc13783_irq_request(priv->mc13783, MC13783_IRQ_TS,
141 mc13783_ts_handler, MC13783_TS_NAME, priv); 141 mc13783_ts_handler, MC13783_TS_NAME, priv);