Input: psmouse - cleanup Focaltech code

hanipouspilot · dtor · commit 324ae0958cab · 2016-10-24T17:19:25.000-07:00
psmouse-&gt;name "Focaltech Touchpad" is an overkill. In xinput it is too long
as "FocaltechPS/2 Focaltech Focaltech Touchpad"

In focaltech_report_state() pointer to psmouse-&gt;dev is already stored as
*dev

Signed-off-by: Dmitry Tunin &lt;hanipouspilot@gmail.com&gt;
Signed-off-by: Dmitry Torokhov &lt;dmitry.torokhov@gmail.com&gt;
diff --git a/drivers/input/mouse/focaltech.c b/drivers/input/mouse/focaltech.c
@@ -43,7 +43,7 @@ int focaltech_detect(struct psmouse *psmouse, bool set_properties)
 
 	if (set_properties) {
 		psmouse->vendor = "FocalTech";
-		psmouse->name = "FocalTech Touchpad";
+		psmouse->name = "Touchpad";
 	}
 
 	return 0;
@@ -146,8 +146,8 @@ static void focaltech_report_state(struct psmouse *psmouse)
 	}
 	input_mt_report_pointer_emulation(dev, true);
 
-	input_report_key(psmouse->dev, BTN_LEFT, state->pressed);
-	input_sync(psmouse->dev);
+	input_report_key(dev, BTN_LEFT, state->pressed);
+	input_sync(dev);
 }
 
 static void focaltech_process_touch_packet(struct psmouse *psmouse,

Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ int focaltech_detect(struct psmouse *psmouse, bool set_properties)`
`43`	`43`
`44`	`44`	`if (set_properties) {`
`45`	`45`	`psmouse->vendor = "FocalTech";`
`46`		`- psmouse->name = "FocalTech Touchpad";`
	`46`	`+ psmouse->name = "Touchpad";`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`return 0;`
`@@ -146,8 +146,8 @@ static void focaltech_report_state(struct psmouse *psmouse)`
`146`	`146`	`}`
`147`	`147`	`input_mt_report_pointer_emulation(dev, true);`
`148`	`148`
`149`		`- input_report_key(psmouse->dev, BTN_LEFT, state->pressed);`
`150`		`- input_sync(psmouse->dev);`
	`149`	`+ input_report_key(dev, BTN_LEFT, state->pressed);`
	`150`	`+ input_sync(dev);`
`151`	`151`	`}`
`152`	`152`
`153`	`153`	`static void focaltech_process_touch_packet(struct psmouse *psmouse,`