Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754157AbbG3Sdk (ORCPT ); Thu, 30 Jul 2015 14:33:40 -0400 Received: from mail-pa0-f43.google.com ([209.85.220.43]:34916 "EHLO mail-pa0-f43.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751756AbbG3Sdi (ORCPT ); Thu, 30 Jul 2015 14:33:38 -0400 Date: Thu, 30 Jul 2015 11:33:34 -0700 From: Dmitry Torokhov To: Dudley Du Cc: mark.rutland@arm.com, robh+dt@kernel.org, bleung@google.com, jmmahler@gmail.com, devicetree@vger.kernel.org, linux-input@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH 3/3] input: cyapa: fix output unwanted warning issue Message-ID: <20150730183334.GJ13165@dtor-ws> References: <1437714359-2484-1-git-send-email-dudl@cypress.com> <1437714359-2484-4-git-send-email-dudl@cypress.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1437714359-2484-4-git-send-email-dudl@cypress.com> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1905 Lines: 54 On Fri, Jul 24, 2015 at 01:05:59PM +0800, Dudley Du wrote: > Avoid the driver generate warning message when the cyapa driver working > with the old Gen5 trackpad device which does not support the proximity function. > Those old Gen5 trackpad device all have the platform version less than 2. > > Signed-off-by: Dudley Du Applied, thank you. > --- > drivers/input/mouse/cyapa_gen5.c | 11 +++++++---- > 1 file changed, 7 insertions(+), 4 deletions(-) > > diff --git a/drivers/input/mouse/cyapa_gen5.c b/drivers/input/mouse/cyapa_gen5.c > index 6d7abbe..118ba97 100644 > --- a/drivers/input/mouse/cyapa_gen5.c > +++ b/drivers/input/mouse/cyapa_gen5.c > @@ -2519,10 +2519,13 @@ static int cyapa_gen5_do_operational_check(struct cyapa *cyapa) > __func__); > > /* By default, the trackpad proximity function is enabled. */ > - error = cyapa_pip_set_proximity(cyapa, true); > - if (error) > - dev_warn(dev, "%s: failed to enable proximity.\n", > - __func__); > + if (cyapa->platform_ver >= 2) { > + error = cyapa_pip_set_proximity(cyapa, true); > + if (error) > + dev_warn(dev, > + "%s: failed to enable proximity.\n", > + __func__); > + } > > /* Get trackpad product information. */ > error = cyapa_gen5_get_query_data(cyapa); > -- > 1.9.1 > > > --------------------------------------------------------------- > This message and any attachments may contain Cypress (or its > subsidiaries) confidential information. If it has been received > in error, please advise the sender and immediately delete this > message. > --------------------------------------------------------------- > -- Dmitry -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/