aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2018-01-17 14:58:31 -0500
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2018-01-22 19:27:40 -0500
commit9f87b9fc369f7719ccdac5077855c5c03b625571 (patch)
tree9b10344cc02444aa38decda7219c86d1b69f1674
parent6abe534f0776d2437c8302f58d8eb5abd483e926 (diff)
Input: synaptics-rmi4 - log when we create a guest serio port
To ease analyzing boot behavior from logs, let's log when we are about to register the pass-through serio port. Also, let's drop "Synaptics" prefix from the port name, as RMI4 is good enough indicator already, and having the prefix means that the name does not fit into serio->name field. While at it move from hard-coded seio->phys to one mentioning the sensor ID (such as "rmi4-00.fn03/serio0"). Reviewed-by: Lyude Paul <lyude@redhat.com> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
-rw-r--r--drivers/input/rmi4/rmi_f03.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/input/rmi4/rmi_f03.c b/drivers/input/rmi4/rmi_f03.c
index 7ccbb370a9a8..88822196d6b7 100644
--- a/drivers/input/rmi4/rmi_f03.c
+++ b/drivers/input/rmi4/rmi_f03.c
@@ -184,14 +184,15 @@ static int rmi_f03_register_pt(struct f03_data *f03)
184 serio->close = rmi_f03_pt_close; 184 serio->close = rmi_f03_pt_close;
185 serio->port_data = f03; 185 serio->port_data = f03;
186 186
187 strlcpy(serio->name, "Synaptics RMI4 PS/2 pass-through", 187 strlcpy(serio->name, "RMI4 PS/2 pass-through", sizeof(serio->name));
188 sizeof(serio->name)); 188 snprintf(serio->phys, sizeof(serio->phys), "%s/serio0",
189 strlcpy(serio->phys, "synaptics-rmi4-pt/serio1", 189 dev_name(&f03->fn->dev));
190 sizeof(serio->phys));
191 serio->dev.parent = &f03->fn->dev; 190 serio->dev.parent = &f03->fn->dev;
192 191
193 f03->serio = serio; 192 f03->serio = serio;
194 193
194 printk(KERN_INFO "serio: %s port at %s\n",
195 serio->name, dev_name(&f03->fn->dev));
195 serio_register_port(serio); 196 serio_register_port(serio);
196 197
197 return 0; 198 return 0;