From: Alan Cox <alan@lxorguk.ukuu.org.uk>
To: linux-input@vger.kernel.org
Subject: [PATCH RESEND] tps6507: remove bogus unreachable code
Date: Thu, 25 Oct 2012 15:28:51 +0100 [thread overview]
Message-ID: <20121025142845.16911.4538.stgit@localhost.localdomain> (raw)
From: Alan Cox <alan@linux.intel.com>
tsc->polling is write only and the poll local is meaningless
Signed-off-by: Alan Cox <alan@linux.intel.com>
---
drivers/input/touchscreen/tps6507x-ts.c | 25 +++++--------------------
1 file changed, 5 insertions(+), 20 deletions(-)
diff --git a/drivers/input/touchscreen/tps6507x-ts.c b/drivers/input/touchscreen/tps6507x-ts.c
index f7eda3d..27f95ad 100644
--- a/drivers/input/touchscreen/tps6507x-ts.c
+++ b/drivers/input/touchscreen/tps6507x-ts.c
@@ -42,7 +42,6 @@ struct tps6507x_ts {
struct device *dev;
char phys[32];
struct delayed_work work;
- unsigned polling; /* polling is active */
struct ts_event tc;
struct tps6507x_dev *mfd;
u16 model;
@@ -168,7 +167,6 @@ static void tps6507x_ts_handler(struct work_struct *work)
struct input_dev *input_dev = tsc->input_dev;
int pendown;
int schd;
- int poll = 0;
s32 ret;
ret = tps6507x_adc_conversion(tsc, TPS6507X_TSCMODE_PRESSURE,
@@ -209,24 +207,14 @@ static void tps6507x_ts_handler(struct work_struct *work)
input_report_abs(input_dev, ABS_PRESSURE, tsc->tc.pressure);
input_sync(input_dev);
tsc->pendown = 1;
- poll = 1;
}
done:
/* always poll if not using interrupts */
- poll = 1;
-
- if (poll) {
- schd = schedule_delayed_work(&tsc->work,
- msecs_to_jiffies(tsc->poll_period));
- if (schd)
- tsc->polling = 1;
- else {
- tsc->polling = 0;
- dev_err(tsc->dev, "re-schedule failed");
- }
- } else
- tsc->polling = 0;
+ schd = schedule_delayed_work(&tsc->work,
+ msecs_to_jiffies(tsc->poll_period));
+ if (!schd)
+ dev_err(tsc->dev, "re-schedule failed");
ret = tps6507x_adc_standby(tsc);
}
@@ -324,10 +312,7 @@ static int tps6507x_ts_probe(struct platform_device *pdev)
schd = schedule_delayed_work(&tsc->work,
msecs_to_jiffies(tsc->poll_period));
- if (schd)
- tsc->polling = 1;
- else {
- tsc->polling = 0;
+ if (!schd) {
dev_err(tsc->dev, "schedule failed");
goto err2;
}
next reply other threads:[~2012-10-25 14:27 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-10-25 14:28 Alan Cox [this message]
2012-10-25 18:03 ` [PATCH RESEND] tps6507: remove bogus unreachable code 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=20121025142845.16911.4538.stgit@localhost.localdomain \
--to=alan@lxorguk.ukuu.org.uk \
--cc=linux-input@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.