linux-input.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: stephen lu <lumotuwe@gmail.com>
To: dmitry.torokhov@gmail.com
Cc: linux-input@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH] input: ad7877: Convert timers to use timer_setup()
Date: Mon, 23 Oct 2017 16:40:27 +0800	[thread overview]
Message-ID: <CABCPcVXPOrHziTY18oSP9FCjto5skMj3HazGH8oeCv1cyPSZ7g@mail.gmail.com> (raw)

In preparation for unconditionally passing the struct
 timer_list pointer to all timer callbacks, switch to using the new
 timer_setup() and from_timer() to pass the timer pointer explicitly.

Signed-off-by: Stephen Lu <lumotuwe@gmail.com>

---
 drivers/input/touchscreen/ad7877.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/input/touchscreen/ad7877.c
b/drivers/input/touchscreen/ad7877.c
index 9c250ae..0381c78 100644
--- a/drivers/input/touchscreen/ad7877.c
+++ b/drivers/input/touchscreen/ad7877.c
@@ -385,9 +385,9 @@ static inline void ad7877_ts_event_release(struct
ad7877 *ts)
        input_sync(input_dev);
 }

-static void ad7877_timer(unsigned long handle)
+static void ad7877_timer(struct timer_list *t)
 {
-       struct ad7877 *ts = (void *)handle;
+       struct ad7877 *ts = from_timer(ts, t, timer);
        unsigned long flags;

        spin_lock_irqsave(&ts->lock, flags);
@@ -718,7 +718,7 @@ static int ad7877_probe(struct spi_device *spi)
        ts->spi = spi;
        ts->input = input_dev;

-       setup_timer(&ts->timer, ad7877_timer, (unsigned long) ts);
+       timer_setup(&ts->timer, ad7877_timer, 0);
        mutex_init(&ts->mutex);
        spin_lock_init(&ts->lock);

-- 
1.9.1

             reply	other threads:[~2017-10-23  8:40 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-10-23  8:40 stephen lu [this message]
2017-10-23 21:54 ` [PATCH] input: ad7877: Convert timers to use timer_setup() Dmitry Torokhov

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=CABCPcVXPOrHziTY18oSP9FCjto5skMj3HazGH8oeCv1cyPSZ7g@mail.gmail.com \
    --to=lumotuwe@gmail.com \
    --cc=dmitry.torokhov@gmail.com \
    --cc=linux-input@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).