From mboxrd@z Thu Jan 1 00:00:00 1970 From: Hans de Goede Subject: Re: [PATCH] Input: psmouse - clean up Cypress probe Date: Fri, 4 Dec 2015 08:16:34 +0100 Message-ID: <56613DD2.5060105@redhat.com> References: <20151203235648.GA29409@dtor-ws> Mime-Version: 1.0 Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit Return-path: Received: from mx1.redhat.com ([209.132.183.28]:41833 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751765AbbLDHQj (ORCPT ); Fri, 4 Dec 2015 02:16:39 -0500 In-Reply-To: <20151203235648.GA29409@dtor-ws> Sender: linux-input-owner@vger.kernel.org List-Id: linux-input@vger.kernel.org To: Dmitry Torokhov , linux-input@vger.kernel.org Cc: linux-kernel@vger.kernel.org Hi, On 04-12-15 00:56, Dmitry Torokhov wrote: > When Cypress protocol support is disabled cypress_init() is a stub that > always returns -ENOSYS, so there is not point in testing for > CONFIG_MOUSE_PS2_CYPRESS after we decided that we are dealing with a > Cypress device. Also, we should only be calling cypress_detect() when > set_properties argument is "true", like with other protocols. > > There is a slight change in behavior to make follow-up patches more > uniform: when we detect Cypress but its initialization fails, instead of > immediately returning PSMOUSE_PS2 protocol we now continue trying > IntelliMouse [Explorer]. Given that Cypress devices only have issue with > Sentelic probes probing Imtellimouse should be safe. > > Signed-off-by: Dmitry Torokhov Thanks, looks good to me: Reviewed-by: Hans de Goede Regards, Hans > --- > drivers/input/mouse/psmouse-base.c | 20 ++++++++------------ > 1 file changed, 8 insertions(+), 12 deletions(-) > > diff --git a/drivers/input/mouse/psmouse-base.c b/drivers/input/mouse/psmouse-base.c > index c2bd866..978ba0b 100644 > --- a/drivers/input/mouse/psmouse-base.c > +++ b/drivers/input/mouse/psmouse-base.c > @@ -836,19 +836,15 @@ static int psmouse_extensions(struct psmouse *psmouse, > * Trackpads. > */ > if (max_proto > PSMOUSE_IMEX && > - cypress_detect(psmouse, set_properties) == 0) { > - if (IS_ENABLED(CONFIG_MOUSE_PS2_CYPRESS)) { > - if (cypress_init(psmouse) == 0) > - return PSMOUSE_CYPRESS; > - > - /* > - * Finger Sensing Pad probe upsets some modules of > - * Cypress Trackpad, must avoid Finger Sensing Pad > - * probe if Cypress Trackpad device detected. > - */ > - return PSMOUSE_PS2; > - } > + psmouse_do_detect(cypress_detect, psmouse, set_properties) == 0) { > + if (!set_properties || cypress_init(psmouse) == 0) > + return PSMOUSE_CYPRESS; > > + /* > + * Finger Sensing Pad probe upsets some modules of > + * Cypress Trackpad, must avoid Finger Sensing Pad > + * probe if Cypress Trackpad device detected. > + */ > max_proto = PSMOUSE_IMEX; > } > >