From patchwork Fri Oct 6 02:53:13 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masaki Ota <012nexus@gmail.com> X-Patchwork-Id: 9988317 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id D93DF60216 for ; Fri, 6 Oct 2017 02:55:06 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C4A1128C9D for ; Fri, 6 Oct 2017 02:55:06 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B5A6C28CCA; Fri, 6 Oct 2017 02:55:06 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.5 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,FROM_STARTS_WITH_NUMS,RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 13F4228C9D for ; Fri, 6 Oct 2017 02:55:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751522AbdJFCxa (ORCPT ); Thu, 5 Oct 2017 22:53:30 -0400 Received: from mail-pf0-f194.google.com ([209.85.192.194]:38761 "EHLO mail-pf0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751083AbdJFCx2 (ORCPT ); Thu, 5 Oct 2017 22:53:28 -0400 Received: by mail-pf0-f194.google.com with SMTP id a7so15761634pfj.5; Thu, 05 Oct 2017 19:53:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=EjOEmjdh2hdn943iwQMPz8aYX1SRyj892xRiCy5qqQM=; b=ok4J8Nj2mmLUCvZy4wXNGNqt3bS/SV5uwaDkiQnw6aOXcHiYGFTNTX92Nvab/JarTc 07tww/2yO4xpJ+nzpQGNkJtsNWbY+C1dsPnfL59NxLl+TF8HO+4XE+NEIxddJPjX334O IrBlTVfKcQFF/PXZVUcqls4mrk5AOfiEd2bkWq5wL+y6FeUEPEzLsDLwOmYiOnoLvZMn InwXM0qE4P+fmBeR+5FxopSTlRhabO4Q1QE94RPUKjcHCHeTfZRAn22bABi7zhRV5LB7 s93wg5bBIdb+IMik3kmecgDO9oaGdKSAayyl5hro5aOCAidUeyuC78D84ver7F+MKj4V 2KzQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=EjOEmjdh2hdn943iwQMPz8aYX1SRyj892xRiCy5qqQM=; b=SvVjZR0mY3jJBKI6nqN6udRTQkdVvjugwB0UrE6aR5GeTy7P4bGdL1iA1nKQ85SOJE VRdl17AFA40mnUXcFw9JRoXnDGop/ahE3wLUFVpWX521kamg1Z8Z2Qv/JZMzz+uVykrc S6joo2FYgmJq4AT7HA2jgu5T0gu2QWqTyPed3Z9mMgXdYhjYTqf3nvYa5+X6pEamK8ae pZpHEQ2InW0Y+FYRwx+1BC1ji2zEcLJ9FxnAk2ElyX+7qpFgCr6m5u6UOylbwHGtVQy7 HFaEDk6eraf5aVxmf8quwChdPp/bQ5w/1ST/zT4N270oPzXWKaIIjzBvUXKwwDihv802 MsEA== X-Gm-Message-State: AMCzsaW8/59nEizS+LzNknP47Q7eIhHOo4HTsQbbfbBrZeIo0tkEtrar 634tkiems2/FEbZtdQZPrTE= X-Google-Smtp-Source: AOwi7QD2JKl0YwiNDUVxJ48i1rSfpXDVczsC17DimycWVW0dyevjShz8DRIt1B9kyT52h0Hmy7rmhA== X-Received: by 10.98.186.6 with SMTP id k6mr709870pff.166.1507258407988; Thu, 05 Oct 2017 19:53:27 -0700 (PDT) Received: from localhost (p2218-ipad303aobadori.miyagi.ocn.ne.jp. [123.216.73.218]) by smtp.gmail.com with ESMTPSA id h125sm505083pfg.84.2017.10.05.19.53.26 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 05 Oct 2017 19:53:27 -0700 (PDT) From: Masaki Ota <012nexus@gmail.com> X-Google-Original-From: Masaki Ota To: jikos@kernel.org, benjamin.tissoires@redhat.com Cc: linux-input@vger.kernel.org, linux-kernel@vger.kernel.org, masaki.ota@jp.alps.com Subject: [PATCH 1/7] Delete unnecessary structure Date: Fri, 6 Oct 2017 11:53:13 +0900 Message-Id: <20171006025319.2505-2-masaki.ota@jp.alps.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20171006025319.2505-1-masaki.ota@jp.alps.com> References: <20171006025319.2505-1-masaki.ota@jp.alps.com> Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Masaki Ota -Delete "struct u1_dev devInfo" structure, because u1_dev structure is already declared as "struct u1_dev *data", and this structure is used for getting U1 data in [PATCH 2/7]. Signed-off-by: Masaki Ota --- drivers/hid/hid-alps.c | 69 +++++++++++++++++++++++++------------------------- 1 file changed, 34 insertions(+), 35 deletions(-) diff --git a/drivers/hid/hid-alps.c b/drivers/hid/hid-alps.c index ed9c0ea5b026..519bfcf9eaf0 100644 --- a/drivers/hid/hid-alps.c +++ b/drivers/hid/hid-alps.c @@ -259,7 +259,6 @@ static int alps_input_configured(struct hid_device *hdev, struct hid_input *hi) { struct u1_dev *data = hid_get_drvdata(hdev); struct input_dev *input = hi->input, *input2; - struct u1_dev devInfo; int ret; int res_x, res_y, i; @@ -275,58 +274,58 @@ static int alps_input_configured(struct hid_device *hdev, struct hid_input *hi) /* Device initialization */ ret = u1_read_write_register(hdev, ADDRESS_U1_DEV_CTRL_1, - &devInfo.dev_ctrl, 0, true); + &data->dev_ctrl, 0, true); if (ret < 0) { dev_err(&hdev->dev, "failed U1_DEV_CTRL_1 (%d)\n", ret); goto exit; } - devInfo.dev_ctrl &= ~U1_DISABLE_DEV; - devInfo.dev_ctrl |= U1_TP_ABS_MODE; + data->dev_ctrl &= ~U1_DISABLE_DEV; + data->dev_ctrl |= U1_TP_ABS_MODE; ret = u1_read_write_register(hdev, ADDRESS_U1_DEV_CTRL_1, - NULL, devInfo.dev_ctrl, false); + NULL, data->dev_ctrl, false); if (ret < 0) { dev_err(&hdev->dev, "failed to change TP mode (%d)\n", ret); goto exit; } ret = u1_read_write_register(hdev, ADDRESS_U1_NUM_SENS_X, - &devInfo.sen_line_num_x, 0, true); + &data->sen_line_num_x, 0, true); if (ret < 0) { dev_err(&hdev->dev, "failed U1_NUM_SENS_X (%d)\n", ret); goto exit; } ret = u1_read_write_register(hdev, ADDRESS_U1_NUM_SENS_Y, - &devInfo.sen_line_num_y, 0, true); + &data->sen_line_num_y, 0, true); if (ret < 0) { dev_err(&hdev->dev, "failed U1_NUM_SENS_Y (%d)\n", ret); goto exit; } ret = u1_read_write_register(hdev, ADDRESS_U1_PITCH_SENS_X, - &devInfo.pitch_x, 0, true); + &data->pitch_x, 0, true); if (ret < 0) { dev_err(&hdev->dev, "failed U1_PITCH_SENS_X (%d)\n", ret); goto exit; } ret = u1_read_write_register(hdev, ADDRESS_U1_PITCH_SENS_Y, - &devInfo.pitch_y, 0, true); + &data->pitch_y, 0, true); if (ret < 0) { dev_err(&hdev->dev, "failed U1_PITCH_SENS_Y (%d)\n", ret); goto exit; } ret = u1_read_write_register(hdev, ADDRESS_U1_RESO_DWN_ABS, - &devInfo.resolution, 0, true); + &data->resolution, 0, true); if (ret < 0) { dev_err(&hdev->dev, "failed U1_RESO_DWN_ABS (%d)\n", ret); goto exit; } ret = u1_read_write_register(hdev, ADDRESS_U1_PAD_BTN, - &devInfo.btn_info, 0, true); + &data->btn_info, 0, true); if (ret < 0) { dev_err(&hdev->dev, "failed U1_PAD_BTN (%d)\n", ret); goto exit; @@ -334,29 +333,29 @@ static int alps_input_configured(struct hid_device *hdev, struct hid_input *hi) /* Check StickPointer device */ ret = u1_read_write_register(hdev, ADDRESS_U1_DEVICE_TYP, - &devInfo.dev_type, 0, true); + &data->dev_type, 0, true); if (ret < 0) { dev_err(&hdev->dev, "failed U1_DEVICE_TYP (%d)\n", ret); goto exit; } - devInfo.x_active_len_mm = - (devInfo.pitch_x * (devInfo.sen_line_num_x - 1)) / 10; - devInfo.y_active_len_mm = - (devInfo.pitch_y * (devInfo.sen_line_num_y - 1)) / 10; + data->x_active_len_mm = + (data->pitch_x * (data->sen_line_num_x - 1)) / 10; + data->y_active_len_mm = + (data->pitch_y * (data->sen_line_num_y - 1)) / 10; - devInfo.x_max = - (devInfo.resolution << 2) * (devInfo.sen_line_num_x - 1); - devInfo.y_max = - (devInfo.resolution << 2) * (devInfo.sen_line_num_y - 1); + data->x_max = + (data->resolution << 2) * (data->sen_line_num_x - 1); + data->y_max = + (data->resolution << 2) * (data->sen_line_num_y - 1); __set_bit(EV_ABS, input->evbit); - input_set_abs_params(input, ABS_MT_POSITION_X, 1, devInfo.x_max, 0, 0); - input_set_abs_params(input, ABS_MT_POSITION_Y, 1, devInfo.y_max, 0, 0); + input_set_abs_params(input, ABS_MT_POSITION_X, 1, data->x_max, 0, 0); + input_set_abs_params(input, ABS_MT_POSITION_Y, 1, data->y_max, 0, 0); - if (devInfo.x_active_len_mm && devInfo.y_active_len_mm) { - res_x = (devInfo.x_max - 1) / devInfo.x_active_len_mm; - res_y = (devInfo.y_max - 1) / devInfo.y_active_len_mm; + if (data->x_active_len_mm && data->y_active_len_mm) { + res_x = (data->x_max - 1) / data->x_active_len_mm; + res_y = (data->y_max - 1) / data->y_active_len_mm; input_abs_set_res(input, ABS_MT_POSITION_X, res_x); input_abs_set_res(input, ABS_MT_POSITION_Y, res_y); @@ -367,20 +366,20 @@ static int alps_input_configured(struct hid_device *hdev, struct hid_input *hi) input_mt_init_slots(input, MAX_TOUCHES, INPUT_MT_POINTER); __set_bit(EV_KEY, input->evbit); - if ((devInfo.btn_info & 0x0F) == (devInfo.btn_info & 0xF0) >> 4) { - devInfo.btn_cnt = (devInfo.btn_info & 0x0F); + if ((data->btn_info & 0x0F) == (data->btn_info & 0xF0) >> 4) { + data->btn_cnt = (data->btn_info & 0x0F); } else { /* Button pad */ - devInfo.btn_cnt = 1; + data->btn_cnt = 1; __set_bit(INPUT_PROP_BUTTONPAD, input->propbit); } - for (i = 0; i < devInfo.btn_cnt; i++) + for (i = 0; i < data->btn_cnt; i++) __set_bit(BTN_LEFT + i, input->keybit); /* Stick device initialization */ - if (devInfo.dev_type & U1_DEVTYPE_SP_SUPPORT) { + if (data->dev_type & U1_DEVTYPE_SP_SUPPORT) { input2 = input_allocate_device(); if (!input2) { @@ -390,9 +389,9 @@ static int alps_input_configured(struct hid_device *hdev, struct hid_input *hi) data->input2 = input2; - devInfo.dev_ctrl |= U1_SP_ABS_MODE; + data->dev_ctrl |= U1_SP_ABS_MODE; ret = u1_read_write_register(hdev, ADDRESS_U1_DEV_CTRL_1, - NULL, devInfo.dev_ctrl, false); + NULL, data->dev_ctrl, false); if (ret < 0) { dev_err(&hdev->dev, "failed SP mode (%d)\n", ret); input_free_device(input2); @@ -400,7 +399,7 @@ static int alps_input_configured(struct hid_device *hdev, struct hid_input *hi) } ret = u1_read_write_register(hdev, ADDRESS_U1_SP_BTN, - &devInfo.sp_btn_info, 0, true); + &data->sp_btn_info, 0, true); if (ret < 0) { dev_err(&hdev->dev, "failed U1_SP_BTN (%d)\n", ret); input_free_device(input2); @@ -416,8 +415,8 @@ static int alps_input_configured(struct hid_device *hdev, struct hid_input *hi) input2->dev.parent = input->dev.parent; __set_bit(EV_KEY, input2->evbit); - devInfo.sp_btn_cnt = (devInfo.sp_btn_info & 0x0F); - for (i = 0; i < devInfo.sp_btn_cnt; i++) + data->sp_btn_cnt = (data->sp_btn_info & 0x0F); + for (i = 0; i < data->sp_btn_cnt; i++) __set_bit(BTN_LEFT + i, input2->keybit); __set_bit(EV_REL, input2->evbit);