tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

Input: synaptics - reduce verboseness of synaptics driver - there is no reason one driver should take 10 lines in dmesg.

Signed-off-by: Dmitry Torokhov <dtor@mail.ru>

Dmitry Torokhov 409b7506 b4ff99b6

+5 -34
+5 -34
drivers/input/mouse/synaptics.c
··· 143 143 return -1; 144 144 } 145 145 146 - static void print_ident(struct synaptics_data *priv) 147 - { 148 - printk(KERN_INFO "Synaptics Touchpad, model: %ld\n", SYN_ID_MODEL(priv->identity)); 149 - printk(KERN_INFO " Firmware: %ld.%ld\n", SYN_ID_MAJOR(priv->identity), 150 - SYN_ID_MINOR(priv->identity)); 151 - if (SYN_MODEL_ROT180(priv->model_id)) 152 - printk(KERN_INFO " 180 degree mounted touchpad\n"); 153 - if (SYN_MODEL_PORTRAIT(priv->model_id)) 154 - printk(KERN_INFO " portrait touchpad\n"); 155 - printk(KERN_INFO " Sensor: %ld\n", SYN_MODEL_SENSOR(priv->model_id)); 156 - if (SYN_MODEL_NEWABS(priv->model_id)) 157 - printk(KERN_INFO " new absolute packet format\n"); 158 - if (SYN_MODEL_PEN(priv->model_id)) 159 - printk(KERN_INFO " pen detection\n"); 160 - 161 - if (SYN_CAP_EXTENDED(priv->capabilities)) { 162 - printk(KERN_INFO " Touchpad has extended capability bits\n"); 163 - if (SYN_CAP_MULTI_BUTTON_NO(priv->ext_cap)) 164 - printk(KERN_INFO " -> %d multi-buttons, i.e. besides standard buttons\n", 165 - (int)(SYN_CAP_MULTI_BUTTON_NO(priv->ext_cap))); 166 - if (SYN_CAP_MIDDLE_BUTTON(priv->capabilities)) 167 - printk(KERN_INFO " -> middle button\n"); 168 - if (SYN_CAP_FOUR_BUTTON(priv->capabilities)) 169 - printk(KERN_INFO " -> four buttons\n"); 170 - if (SYN_CAP_MULTIFINGER(priv->capabilities)) 171 - printk(KERN_INFO " -> multifinger detection\n"); 172 - if (SYN_CAP_PALMDETECT(priv->capabilities)) 173 - printk(KERN_INFO " -> palm detection\n"); 174 - if (SYN_CAP_PASS_THROUGH(priv->capabilities)) 175 - printk(KERN_INFO " -> pass-through port\n"); 176 - } 177 - } 178 - 179 146 static int synaptics_query_hardware(struct psmouse *psmouse) 180 147 { 181 148 int retries = 0; ··· 633 666 634 667 priv->pkt_type = SYN_MODEL_NEWABS(priv->model_id) ? SYN_NEWABS : SYN_OLDABS; 635 668 636 - print_ident(priv); 669 + printk(KERN_INFO "Synaptics Touchpad, model: %ld, fw: %ld.%ld, id: %#lx, caps: %#lx/%#lx\n", 670 + SYN_ID_MODEL(priv->identity), 671 + SYN_ID_MAJOR(priv->identity), SYN_ID_MINOR(priv->identity), 672 + priv->model_id, priv->capabilities, priv->ext_cap); 673 + 637 674 set_input_params(&psmouse->dev, priv); 638 675 639 676 psmouse->protocol_handler = synaptics_process_byte;