From patchwork Wed Dec 2 19:25:55 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Torokhov X-Patchwork-Id: 7751161 Return-Path: X-Original-To: patchwork-linux-input@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id AE2F99F387 for ; Wed, 2 Dec 2015 19:26:01 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D217620513 for ; Wed, 2 Dec 2015 19:26:00 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0190520503 for ; Wed, 2 Dec 2015 19:26:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751401AbbLBTZ6 (ORCPT ); Wed, 2 Dec 2015 14:25:58 -0500 Received: from mail-pa0-f46.google.com ([209.85.220.46]:35709 "EHLO mail-pa0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751112AbbLBTZ6 (ORCPT ); Wed, 2 Dec 2015 14:25:58 -0500 Received: by pacej9 with SMTP id ej9so49054152pac.2; Wed, 02 Dec 2015 11:25:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=date:from:to:cc:subject:message-id:mime-version:content-type :content-disposition:user-agent; bh=yRnmCyXXUeaxJCESOSYvNp2cehaENErkzu5cdgD42WE=; b=iPP+wODmPH4YTb5EXmMmOQtj5XDkMnTMQ13QD0GIvjZOIdL8OGvGizl66kAiplJvdp hJUtqIQJXSHSu+x9GTbMpNtaYrxn2R0jsmwLeBwKnxZT+v2+WFC3p0Y/B9dmyeX+Hlhl VdJc3mlaZWM/UBjTDU2pJ3hRGcADlumfEeWoy1NJmj0JmEhJIa6nrfIRwxkog4V18pDz tXihk/2PU878FGPH+JcAN+d6kGYpQ+ld7Vkc3WQyWoinwlzBdW8frl8qdHYievIKcpig mufBnDMrvzfCqvh/5L452oxwmlIytwid48uNCR0L5cYN4Bm+pGhD0xsifdwn/qNrDwex LJNw== X-Received: by 10.66.62.201 with SMTP id a9mr7131362pas.7.1449084357729; Wed, 02 Dec 2015 11:25:57 -0800 (PST) Received: from dtor-ws ([2620:0:1000:1301:99e8:fbe5:2ad4:7f8]) by smtp.gmail.com with ESMTPSA id g79sm5922090pfj.13.2015.12.02.11.25.56 (version=TLS1_2 cipher=AES128-SHA bits=128/128); Wed, 02 Dec 2015 11:25:56 -0800 (PST) Date: Wed, 2 Dec 2015 11:25:55 -0800 From: Dmitry Torokhov To: linux-input@vger.kernel.org, Hans de Goede Cc: linux-kernel@vger.kernel.org Subject: [PATCH v2] Input: psmouse - rename ps2pp_init() to ps2pp_detect() Message-ID: <20151202192555.GA25587@dtor-ws> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This makes Logitech PS2++ protocol implementation consistent with the naming in other protocols. Also mark the stub as "static inline" Signed-off-by: Dmitry Torokhov Reviewed-by: Hans de Goede --- V2: add forgotten drivers/input/mouse/logips2pp.c file. drivers/input/mouse/logips2pp.c | 2 +- drivers/input/mouse/logips2pp.h | 4 ++-- drivers/input/mouse/psmouse-base.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/input/mouse/logips2pp.c b/drivers/input/mouse/logips2pp.c index 136e222..422da1c 100644 --- a/drivers/input/mouse/logips2pp.c +++ b/drivers/input/mouse/logips2pp.c @@ -325,7 +325,7 @@ static void ps2pp_set_model_properties(struct psmouse *psmouse, * that support it. */ -int ps2pp_init(struct psmouse *psmouse, bool set_properties) +int ps2pp_detect(struct psmouse *psmouse, bool set_properties) { struct ps2dev *ps2dev = &psmouse->ps2dev; unsigned char param[4]; diff --git a/drivers/input/mouse/logips2pp.h b/drivers/input/mouse/logips2pp.h index 0c186f0..bf62945 100644 --- a/drivers/input/mouse/logips2pp.h +++ b/drivers/input/mouse/logips2pp.h @@ -12,9 +12,9 @@ #define _LOGIPS2PP_H #ifdef CONFIG_MOUSE_PS2_LOGIPS2PP -int ps2pp_init(struct psmouse *psmouse, bool set_properties); +int ps2pp_detect(struct psmouse *psmouse, bool set_properties); #else -inline int ps2pp_init(struct psmouse *psmouse, bool set_properties) +static inline int ps2pp_detect(struct psmouse *psmouse, bool set_properties) { return -ENOSYS; } diff --git a/drivers/input/mouse/psmouse-base.c b/drivers/input/mouse/psmouse-base.c index e909c6e..90d9218 100644 --- a/drivers/input/mouse/psmouse-base.c +++ b/drivers/input/mouse/psmouse-base.c @@ -699,7 +699,7 @@ static const struct psmouse_protocol psmouse_protocols[] = { .type = PSMOUSE_PS2PP, .name = "PS2++", .alias = "logitech", - .detect = ps2pp_init, + .detect = ps2pp_detect, }, #endif {