aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/input/mouse/cypress_ps2.c
diff options
context:
space:
mode:
authorGeyslan G. Bem <geyslan@gmail.com>2013-10-16 16:52:14 -0700
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2013-10-31 01:01:30 -0700
commitc2e609599a57926f20b324d05b164aabe9e372ed (patch)
tree2476a6cfa2a8043add1b9055bdfc0a9423c096c1 /drivers/input/mouse/cypress_ps2.c
parentInput: fix PWM-related undefined reference errors (diff)
downloadlinux-dev-c2e609599a57926f20b324d05b164aabe9e372ed.tar.xz
linux-dev-c2e609599a57926f20b324d05b164aabe9e372ed.zip
Input: cypress_ps2 - remove useless cast
Get rid of unnecessary (void *) casting in 'cypress_init' function. Signed-off-by: Geyslan G. Bem <geyslan@gmail.com> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Diffstat (limited to 'drivers/input/mouse/cypress_ps2.c')
-rw-r--r--drivers/input/mouse/cypress_ps2.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/input/mouse/cypress_ps2.c b/drivers/input/mouse/cypress_ps2.c
index ef651ccf130f..1d81a7467501 100644
--- a/drivers/input/mouse/cypress_ps2.c
+++ b/drivers/input/mouse/cypress_ps2.c
@@ -680,14 +680,14 @@ int cypress_init(struct psmouse *psmouse)
struct cytp_data *cytp;
cytp = kzalloc(sizeof(struct cytp_data), GFP_KERNEL);
- psmouse->private = (void *)cytp;
- if (cytp == NULL)
+ if (!cytp)
return -ENOMEM;
- cypress_reset(psmouse);
-
+ psmouse->private = cytp;
psmouse->pktsize = 8;
+ cypress_reset(psmouse);
+
if (cypress_query_hardware(psmouse)) {
psmouse_err(psmouse, "Unable to query Trackpad hardware.\n");
goto err_exit;