[PATCH] Input: psmouse - cleanup Focaltech code

psmouse->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->dev is already stored as *dev

Signed-off-by: Dmitry Tunin <redacted>
---
 drivers/input/mouse/focaltech.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/input/mouse/focaltech.c b/drivers/input/mouse/focaltech.c
index c8c6a8c..49a56f655 100644
--- 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,

-- 
2.7.4

The changes look good to me. However, what wording do other drivers use?
I've seen "TouchPad" with a capital P before. If this patch breaks
scripts searching for that string anyways, that's an opportunity to
unify the capitalization there. It probably doesn't matter, though... I
don't see a problem with this patch.

I can't test it because I no longer have the hardware.

Am 08.10.2016 um 12:38 schrieb Dmitry Tunin:

Other drivers, like Synaptics use the same as I suggested. They even
shorten in psmouse-base.c psmouse_protocol.name to SynPS/2.
You used FocaltechPS/2. I think it is OK.

I do not think it is a big problem of changing the naming. It happens a lot.

I still have the hardware and I am still thankful to you that you
wrote that driver.

Now I am trying to write my own for a new i2c touchpad that is used in
new Asus laptops ;-)

2016-10-17 20:27 GMT+03:00 Mathias Gottschlag [off-list ref]:

The changes look good to me. However, what wording do other drivers use?
I've seen "TouchPad" with a capital P before. If this patch breaks
scripts searching for that string anyways, that's an opportunity to
unify the capitalization there. It probably doesn't matter, though... I
don't see a problem with this patch.

I can't test it because I no longer have the hardware.

Am 08.10.2016 um 12:38 schrieb Dmitry Tunin:

quoted

psmouse->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->dev is already stored as *dev

Signed-off-by: Dmitry Tunin <redacted>
---
 drivers/input/mouse/focaltech.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/input/mouse/focaltech.c b/drivers/input/mouse/focaltech.c
index c8c6a8c..49a56f655 100644
--- 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,

On Sat, Oct 08, 2016 at 01:38:56PM +0300, Dmitry Tunin wrote:

psmouse->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->dev is already stored as *dev

Signed-off-by: Dmitry Tunin <redacted>

Applied, thank you.

-- 
Dmitry