From patchwork Tue Feb 28 22:46:23 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Torokhov X-Patchwork-Id: 9597105 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 BAC0260574 for ; Tue, 28 Feb 2017 22:55:49 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AC92420246 for ; Tue, 28 Feb 2017 22:55:49 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A172D28113; Tue, 28 Feb 2017 22:55:49 +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=-6.3 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID autolearn=ham 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 173C12807E for ; Tue, 28 Feb 2017 22:55:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750957AbdB1Wzs (ORCPT ); Tue, 28 Feb 2017 17:55:48 -0500 Received: from mail-pg0-f66.google.com ([74.125.83.66]:33809 "EHLO mail-pg0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751154AbdB1Wzq (ORCPT ); Tue, 28 Feb 2017 17:55:46 -0500 Received: by mail-pg0-f66.google.com with SMTP id s67so3296152pgb.1; Tue, 28 Feb 2017 14:53:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=/DcNtEVItjd81DiCoWDWvAtuRdEXrD6C+CCeuZ4xeAQ=; b=e3XieudFilf2z83cueEvgqKYLRcVXkym+m31toRWNA02B84BsjZuF2/ljlGXXDTcgC OpobActJ5qCeLp8pjOjS3OcPr4E8VjOebdmcoesxGThC9RoOOmDTyXlnmuYl8seApswD 0M1VG/DtfITv1ip83T1rvX/ZVREfHFmgMZB0TYdpyQ9F3JfRW4gxSrJqMt9y7IiW3wGf GMIY223CVdmRsAAozma9C/OJ8Nw+tWysBYewguaf5iZzTj8aTyxCgtTnMM+vgdPZBqfz GpaDGjMxs6G/6Te6Hh8vS6lnXAvRFHqyeJLQb0sJVuzt4wokBIxgcVHDjC+HgR+7+K9p IYsA== 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; bh=/DcNtEVItjd81DiCoWDWvAtuRdEXrD6C+CCeuZ4xeAQ=; b=DZ9tXTCnfXtn4SumKUw8/E+MkkFTwljQeCHjffqY/NinY3A7VyaeZ/WR3A7jCO2h3J KZg26xOxIuqEkjcHeS0YW2iewc9LhYHzihi2fZScil2Hag99gsMcbC6qhzk45Vql+GSJ HRWogx82487IpZZOPRTuJTWcp69+XHhdJYg4Cn2V8KK6FLc7O0pCSCnuGumuSXp9E699 wNFc18IHbGe+LyOX17uHuAMWCuNgaGf6rY7BONianI7V3xEqPH+P2mox1aUH/kejzc0m c8Kk80tkDzhYDik6As39hrsWdSkxdwGHqZcP7Qph9zvhMIqvVx0yIPu3b75MTuwQuSg1 48CA== X-Gm-Message-State: AMke39kvwjdg+PbeqgqDs2rRR1cZ9uP2FaNztsn8mV4xTn0G9sPNbCvl9xMHoFGlvAUBsQ== X-Received: by 10.99.184.18 with SMTP id p18mr5256411pge.20.1488321994770; Tue, 28 Feb 2017 14:46:34 -0800 (PST) Received: from dtor-ws.mtv.corp.google.com ([172.22.152.34]) by smtp.gmail.com with ESMTPSA id u80sm6155359pgb.32.2017.02.28.14.46.33 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 28 Feb 2017 14:46:34 -0800 (PST) From: Dmitry Torokhov To: Daniel Mack Cc: Haojian Zhuang , Robert Jarzmik , linux-kernel@vger.kernel.org, linux-input@vger.kernel.org Subject: [PATCH 01/10] Input: eeti_ts - rename eeti_ts_priv to eeti_ts Date: Tue, 28 Feb 2017 14:46:23 -0800 Message-Id: <20170228224632.3401-1-dmitry.torokhov@gmail.com> X-Mailer: git-send-email 2.11.0.483.g087da7b7c-goog 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 Also rename 'priv' variables to eeti. Signed-off-by: Dmitry Torokhov --- Hi, This is all is not tested as I do not have the hardware, so if anyone has raumfeld device that would be awesome. drivers/input/touchscreen/eeti_ts.c | 115 ++++++++++++++++++------------------ 1 file changed, 58 insertions(+), 57 deletions(-) diff --git a/drivers/input/touchscreen/eeti_ts.c b/drivers/input/touchscreen/eeti_ts.c index 16023867b9da..74d57ef68663 100644 --- a/drivers/input/touchscreen/eeti_ts.c +++ b/drivers/input/touchscreen/eeti_ts.c @@ -43,7 +43,7 @@ static bool flip_y; module_param(flip_y, bool, 0644); MODULE_PARM_DESC(flip_y, "flip y coordinate"); -struct eeti_ts_priv { +struct eeti_ts { struct i2c_client *client; struct input_dev *input; struct work_struct work; @@ -60,25 +60,25 @@ struct eeti_ts_priv { #define REPORT_BIT_HAS_PRESSURE (1 << 6) #define REPORT_RES_BITS(v) (((v) >> 1) + EETI_TS_BITDEPTH) -static inline int eeti_ts_irq_active(struct eeti_ts_priv *priv) +static inline int eeti_ts_irq_active(struct eeti_ts *eeti) { - return gpio_get_value(priv->irq_gpio) == priv->irq_active_high; + return gpio_get_value(eeti->irq_gpio) == eeti->irq_active_high; } static void eeti_ts_read(struct work_struct *work) { char buf[6]; unsigned int x, y, res, pressed, to = 100; - struct eeti_ts_priv *priv = - container_of(work, struct eeti_ts_priv, work); + struct eeti_ts *eeti = + container_of(work, struct eeti_ts, work); - mutex_lock(&priv->mutex); + mutex_lock(&eeti->mutex); - while (eeti_ts_irq_active(priv) && --to) - i2c_master_recv(priv->client, buf, sizeof(buf)); + while (eeti_ts_irq_active(eeti) && --to) + i2c_master_recv(eeti->client, buf, sizeof(buf)); if (!to) { - dev_err(&priv->client->dev, + dev_err(&eeti->client->dev, "unable to clear IRQ - line stuck?\n"); goto out; } @@ -103,62 +103,62 @@ static void eeti_ts_read(struct work_struct *work) y = EETI_MAXVAL - y; if (buf[0] & REPORT_BIT_HAS_PRESSURE) - input_report_abs(priv->input, ABS_PRESSURE, buf[5]); + input_report_abs(eeti->input, ABS_PRESSURE, buf[5]); - input_report_abs(priv->input, ABS_X, x); - input_report_abs(priv->input, ABS_Y, y); - input_report_key(priv->input, BTN_TOUCH, !!pressed); - input_sync(priv->input); + input_report_abs(eeti->input, ABS_X, x); + input_report_abs(eeti->input, ABS_Y, y); + input_report_key(eeti->input, BTN_TOUCH, !!pressed); + input_sync(eeti->input); out: - mutex_unlock(&priv->mutex); + mutex_unlock(&eeti->mutex); } static irqreturn_t eeti_ts_isr(int irq, void *dev_id) { - struct eeti_ts_priv *priv = dev_id; + struct eeti_ts *eeti = dev_id; /* postpone I2C transactions as we are atomic */ - schedule_work(&priv->work); + schedule_work(&eeti->work); return IRQ_HANDLED; } -static void eeti_ts_start(struct eeti_ts_priv *priv) +static void eeti_ts_start(struct eeti_ts *eeti) { - enable_irq(priv->irq); + enable_irq(eeti->irq); /* Read the events once to arm the IRQ */ - eeti_ts_read(&priv->work); + eeti_ts_read(&eeti->work); } -static void eeti_ts_stop(struct eeti_ts_priv *priv) +static void eeti_ts_stop(struct eeti_ts *eeti) { - disable_irq(priv->irq); - cancel_work_sync(&priv->work); + disable_irq(eeti->irq); + cancel_work_sync(&eeti->work); } static int eeti_ts_open(struct input_dev *dev) { - struct eeti_ts_priv *priv = input_get_drvdata(dev); + struct eeti_ts *eeti = input_get_drvdata(dev); - eeti_ts_start(priv); + eeti_ts_start(eeti); return 0; } static void eeti_ts_close(struct input_dev *dev) { - struct eeti_ts_priv *priv = input_get_drvdata(dev); + struct eeti_ts *eeti = input_get_drvdata(dev); - eeti_ts_stop(priv); + eeti_ts_stop(eeti); } static int eeti_ts_probe(struct i2c_client *client, const struct i2c_device_id *idp) { struct eeti_ts_platform_data *pdata = dev_get_platdata(&client->dev); - struct eeti_ts_priv *priv; + struct eeti_ts *eeti; struct input_dev *input; unsigned int irq_flags; int err = -ENOMEM; @@ -170,13 +170,14 @@ static int eeti_ts_probe(struct i2c_client *client, * for interrupts to occur. */ - priv = kzalloc(sizeof(*priv), GFP_KERNEL); - if (!priv) { + eeti = kzalloc(sizeof(*eeti), GFP_KERNEL); + if (!eeti) { dev_err(&client->dev, "failed to allocate driver data\n"); return -ENOMEM; } - mutex_init(&priv->mutex); + mutex_init(&eeti->mutex); + input = input_allocate_device(); if (!input) { dev_err(&client->dev, "Failed to allocate input device.\n"); @@ -196,30 +197,30 @@ static int eeti_ts_probe(struct i2c_client *client, input->open = eeti_ts_open; input->close = eeti_ts_close; - priv->client = client; - priv->input = input; - priv->irq_gpio = pdata->irq_gpio; - priv->irq = gpio_to_irq(pdata->irq_gpio); + eeti->client = client; + eeti->input = input; + eeti->irq_gpio = pdata->irq_gpio; + eeti->irq = gpio_to_irq(pdata->irq_gpio); err = gpio_request_one(pdata->irq_gpio, GPIOF_IN, client->name); if (err < 0) goto err1; - priv->irq_active_high = pdata->irq_active_high; + eeti->irq_active_high = pdata->irq_active_high; - irq_flags = priv->irq_active_high ? + irq_flags = eeti->irq_active_high ? IRQF_TRIGGER_RISING : IRQF_TRIGGER_FALLING; - INIT_WORK(&priv->work, eeti_ts_read); - i2c_set_clientdata(client, priv); - input_set_drvdata(input, priv); + INIT_WORK(&eeti->work, eeti_ts_read); + i2c_set_clientdata(client, eeti); + input_set_drvdata(input, eeti); err = input_register_device(input); if (err) goto err2; - err = request_irq(priv->irq, eeti_ts_isr, irq_flags, - client->name, priv); + err = request_irq(eeti->irq, eeti_ts_isr, irq_flags, + client->name, eeti); if (err) { dev_err(&client->dev, "Unable to request touchscreen IRQ.\n"); goto err3; @@ -229,7 +230,7 @@ static int eeti_ts_probe(struct i2c_client *client, * Disable the device for now. It will be enabled once the * input device is opened. */ - eeti_ts_stop(priv); + eeti_ts_stop(eeti); return 0; @@ -240,23 +241,23 @@ static int eeti_ts_probe(struct i2c_client *client, gpio_free(pdata->irq_gpio); err1: input_free_device(input); - kfree(priv); + kfree(eeti); return err; } static int eeti_ts_remove(struct i2c_client *client) { - struct eeti_ts_priv *priv = i2c_get_clientdata(client); + struct eeti_ts *eeti = i2c_get_clientdata(client); - free_irq(priv->irq, priv); + free_irq(eeti->irq, eeti); /* * eeti_ts_stop() leaves IRQ disabled. We need to re-enable it * so that device still works if we reload the driver. */ - enable_irq(priv->irq); + enable_irq(eeti->irq); - input_unregister_device(priv->input); - kfree(priv); + input_unregister_device(eeti->input); + kfree(eeti); return 0; } @@ -264,18 +265,18 @@ static int eeti_ts_remove(struct i2c_client *client) static int __maybe_unused eeti_ts_suspend(struct device *dev) { struct i2c_client *client = to_i2c_client(dev); - struct eeti_ts_priv *priv = i2c_get_clientdata(client); - struct input_dev *input_dev = priv->input; + struct eeti_ts *eeti = i2c_get_clientdata(client); + struct input_dev *input_dev = eeti->input; mutex_lock(&input_dev->mutex); if (input_dev->users) - eeti_ts_stop(priv); + eeti_ts_stop(eeti); mutex_unlock(&input_dev->mutex); if (device_may_wakeup(&client->dev)) - enable_irq_wake(priv->irq); + enable_irq_wake(eeti->irq); return 0; } @@ -283,16 +284,16 @@ static int __maybe_unused eeti_ts_suspend(struct device *dev) static int __maybe_unused eeti_ts_resume(struct device *dev) { struct i2c_client *client = to_i2c_client(dev); - struct eeti_ts_priv *priv = i2c_get_clientdata(client); - struct input_dev *input_dev = priv->input; + struct eeti_ts *eeti = i2c_get_clientdata(client); + struct input_dev *input_dev = eeti->input; if (device_may_wakeup(&client->dev)) - disable_irq_wake(priv->irq); + disable_irq_wake(eeti->irq); mutex_lock(&input_dev->mutex); if (input_dev->users) - eeti_ts_start(priv); + eeti_ts_start(eeti); mutex_unlock(&input_dev->mutex);