Commit 14e94143 authored by Dmitry Torokhov's avatar Dmitry Torokhov
Browse files

Input: lifebook - various cleanups: 


       - do not try to set rate and resolution in init method, let
         psmouse core do it for us. This also removes special quirks
         from the core;
       - do not disable mouse before doing full reset - meaningless;
       - some formatting and whitespace cleanups.

Signed-off-by: default avatarDmitry Torokhov <dtor@mail.ru>
parent 02d7f589

drivers/input/mouse/lifebook.c

+12 −25
Original line number Diff line number Diff line
@@ -20,12 +20,9 @@ 
#include "psmouse.h"

#include "lifebook.h"



static int max_y = 1024;





static struct dmi_system_id lifebook_dmi_table[] = {

       {

               .ident = "Fujitsu Siemens Lifebook B-Sereis",

               .ident = "Lifebook B",

               .matches = {

                       DMI_MATCH(DMI_PRODUCT_NAME, "LIFEBOOK B Series"),

               },
@@ -49,12 +46,12 @@ static psmouse_ret_t lifebook_process_byte(struct psmouse *psmouse, struct pt_re 
		input_report_abs(dev, ABS_X,

				 (packet[1] | ((packet[0] & 0x30) << 4)));

		input_report_abs(dev, ABS_Y,

				 max_y - (packet[2] | ((packet[0] & 0xC0) << 2)));

				 1024 - (packet[2] | ((packet[0] & 0xC0) << 2)));

	} else {

		input_report_rel(dev, REL_X,

				((packet[0] & 0x10) ? packet[1] - 256 : packet[1]));

		input_report_rel(dev, REL_Y,

				(- (int)((packet[0] & 0x20) ? packet[2]-256 : packet[2])));

				 -(int)((packet[0] & 0x20) ? packet[2] - 256 : packet[2]));

	}



	input_report_key(dev, BTN_LEFT, packet[0] & 0x01);
@@ -71,10 +68,7 @@ static int lifebook_initialize(struct psmouse *psmouse) 
	struct ps2dev *ps2dev = &psmouse->ps2dev;

	unsigned char param;



	if (ps2_command(ps2dev, NULL, PSMOUSE_CMD_DISABLE))

		return -1;



	if (ps2_command(ps2dev, NULL, PSMOUSE_CMD_RESET_BAT))

	if (psmouse_reset(psmouse))

		return -1;



	/*
@@ -85,12 +79,6 @@ static int lifebook_initialize(struct psmouse *psmouse) 
	param = 0x07;

	ps2_command(ps2dev, &param, PSMOUSE_CMD_SETRES);



	psmouse->set_rate(psmouse, psmouse->rate);

	psmouse->set_resolution(psmouse, psmouse->resolution);

	

	if (ps2_command(ps2dev, NULL, PSMOUSE_CMD_ENABLE))

		return -1;



	return 0;

}
@@ -102,8 +90,7 @@ static void lifebook_disconnect(struct psmouse *psmouse) 
int lifebook_detect(struct psmouse *psmouse, unsigned int max_proto,

                    int set_properties)

{

        if (!dmi_check_system(lifebook_dmi_table) && 

            (max_proto != PSMOUSE_LIFEBOOK) )

        if (!dmi_check_system(lifebook_dmi_table) && max_proto != PSMOUSE_LIFEBOOK)

                return -1;



	if (set_properties) {

drivers/input/mouse/psmouse-base.c

+0 −2
Original line number Diff line number Diff line
@@ -579,8 +579,6 @@ static void psmouse_set_rate(struct psmouse *psmouse, unsigned int rate) 


static void psmouse_initialize(struct psmouse *psmouse)

{

        if (psmouse->type==PSMOUSE_LIFEBOOK)

                return;

/*

 * We set the mouse into streaming mode.

 */

drivers/input/mouse/lifebook.h

+1 −1

File changed.

Contains only whitespace changes.

CRA Git | Maintained and supported by SUSTech CRA and CCSE