From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=74.125.82.176 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1794466207; b=2kQg2nAqooZjWZ07BLevGl/eHwlAfu2H8IcEwl6qk4Rf8Avjfkh2l3A0k+Xexl9GttoV go+TSu0BP+ACT3Y0PXOCgkQs7fWsn0OHeUX0OksP6dshJQlffkBc8LcppeztyuT2uEkII 6GKebZlB4DbtSOc5hTnmHoc+I/1pd1f7/YcQ1OjumTLpdVMoGLlF9d5mrHnhupq+FFWme pCby60dQZa94l4UCPnCVamEHaNrZiQTIaR3gWQWYrLO2MTxbPbNGSyHsNaBNd/Pi35EMU Je7PHAOpFh5Js9cv8hH8Ul1dfOe3iOdWeDth0yXTT2liWwt2b6qf+XyWjZtVcDqjlEQ== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1794466207; h=DMARC-Filter:Received:DKIM-Signature:X-Google-DKIM-Signature: X-Forwarded-Encrypted:X-Gm-Message-State:X-Gm-Gg:X-Received:Received: From:To:Cc:Subject:Date:Message-ID:X-Mailer:In-Reply-To:References: MIME-Version:Content-Transfer-Encoding; bh=vVhsLL1Pu2n4j4YLMUMbDZ8LRYF6+iKldnx7jPCdxAo=; b=qqtBQ/OvpEFOMaVDbKcofdDWzp1vCM31N1DOHshxsC5Hoh86xqBn2taTGogsGeKshw5S FywByL+eKX/RM4vFJCUDzcNeWGmznuz7B2WzDdgHTh8acYvU3wi7OPb02tdG6s8Y1ELt2 LbjENJzHHUZHMT0fg2oAAqRc9Jd5S3ulFZ+ibYKJ6/HDnHQ/InDN+JrC0K50jQVGVadal L+zNpGfHVO/g5yjMqA6xvWLZv7D3S+4sYpd/ojD2x1pVm3cXZTwJDjaOfqXAfJh9yuSNg zrlYsX81Bn4oyEnxp44PfKAVQAXnPAzOCGNVtzcIxZ9AXxnKfeXkoMEZHX69kuP89Eg== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20260707 header.b="sQgENo/2"; arc=none smtp.remote-ip=74.125.82.176 Received: from mail-dy1-f176.google.com (mail-dy1-f176.google.com [74.125.82.176]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A819560A3807 for ; Thu, 12 Nov 2026 06:50:06 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org A819560A3807 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20260707 header.b=sQgENo/2 Received: by mail-dy1-f176.google.com with SMTP id 5a478bee46e88-37198ed3727so708775eec.0 for ; Wed, 11 Nov 2026 22:50:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20260707; t=1794466206; x=1795071006; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=vVhsLL1Pu2n4j4YLMUMbDZ8LRYF6+iKldnx7jPCdxAo=; b=sQgENo/24/gIstvnmHdJ37mKIaFHgWCiOdtzSyn1dzejSjFBNtRobRvtwpNQNPeYtR z02szg3y0g3T5rskLbVnlvmiOXvkPefGi6JnRDM1/RcCMZqK3OBx3t658Ao5JUnTn21l h/yRUraq8euyoLfKuRfXRjsAviaYNeQswX9jW4ksbB14lojPXeAGRiRZljXLgCpp/KlO DuLOiLUiJMKSpjs3zPlO5gupkPAHyDGAX+0JAFLnltRabMvbkpaLqOaknelstP8G+kAI s7vCPHFxs/Yu6WGQi+NHKeVG9mzicVMBuWa646rAKniF6KmmaXnEBEuBLzEz1ABnHx/9 luMQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1794466206; x=1795071006; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=vVhsLL1Pu2n4j4YLMUMbDZ8LRYF6+iKldnx7jPCdxAo=; b=wVtZ79Jq9VLt1oo64167TIt9ACRHPWftvPNsv5JyBb4tg28tS4d1GDooUdYROLR/SI 38SElz5Tot8RNwBMajb3lxjtIoAW/1nDWp5xG0b2ngEtEawOy+IEdslZE6vyVXbNV/jG 0EghziJRBR/Ru5qGXz7W9FJFhkoft2nrDV/PhGeyczXokWQInwQHPQE9Aml93FZpJHcR +3BcsbssdkJd+Y1GF5tr0clbs93Nvq8zvSmNGztOg8SZxY0ck8PADsdf9auTzrwah4i+ 71+66Nwp1rEm58NRdtYfWBhhNSnzVO5HlOLJuO8GbBcrMieYjD6U5dWhGC1GucOrkITC U58A== X-Forwarded-Encrypted: i=1; AL+hErHQKgWTk5eiBDHNw72fGO4WN/s5um1oGH0MS2i8/jSdm/dAcyOgAGsWbDzTg8joKqS3Z+Skw6nMq4bhaQ==@vger.kernel.org X-Gm-Message-State: APuU4Z9fq6DmWJKEAsepo02QuCQZ0rNpG56ycPHUGFhKOd99hAcilHVg YZSSNpehLIwOohIZV+L1PCylNjiFBuuhPI2TXePoXxr9oXAFAwEuQuox X-Gm-Gg: AYBFou3L2NLzrAfqDg2Z9J/8JCe10tdNkLll2Q6/TXWEkmfO4qa+n9WNPksMAHJ5ADU d/Fvq5Z0yp7cdCDvAudNt9slhzXSNNayRkVf6RWmktdWafcjzfmT+ZbV1I4U13Rdx03yhxBDdXX 8IlVnvlUgg+1XWZxhtzeeCDjIC20HM0Lnxw+MzMZnfiKd8wWjWTvaKuDvab/kDI2+cdiG+auLoX qK35ZBbIdIvPfHWy0If8afDoIkped8h1vU8Rore2ML0Z99ppMqC0BHe6ejh7bMs9Nhu3WazpPBg t3aXCSmx7k/tHboGcQsTVSn/qwLIDgoCmyt5fhefMwZEAipNssC0EA26eAtz3/NhuGlDZjwXBm+ mdI0l1KzaaEDLWNhiWaI0wwiP4bcYoLIfi4cFiXHL3emptm33J0LnHdmJrZabZVbIPfCcCCRzK6 kIEa/9kxrV7xIiS5Ew7vXLRhlDUrmIrehNdjR7bwZVmyMyKOsBPxwy7nP+cfKd+122hSlUVCyS+ mleaKI4i4BXmEOR8h+fXkDhIZuX1uFrx2HPL1zX3KTITUCmKL+lZRbXB5v8n6rgY/jsvA4DwUlb nJyS0glO0maMeexHYGrWwRfbNWwJTAvxpUq0PGsxIc3KZIfJ6UripH/2sPseBlXt4MNYYnUdkQS xp9pkJYRowG3sSzzt X-Received: by 2002:a05:7300:148c:b0:361:a195:c46e with SMTP id 5a478bee46e88-377de5f761amr2466577eec.1.1794466205719; Wed, 11 Nov 2026 22:50:05 -0800 (PST) Received: from dtor-ws.sjc.corp.google.com ([2a00:79e0:2ebe:8:182d:659:ffce:39a4]) by smtp.gmail.com with ESMTPSA id 5a478bee46e88-37520cfdfadsm27190961eec.19.2026.11.11.22.50.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Nov 2026 22:50:05 -0800 (PST) From: Dmitry Torokhov To: Linus Walleij , Aaro Koskinen , Daniel Mack , Haojian Zhuang , Robert Jarzmik , Arnd Bergmann Cc: Mark Brown , "H . Nikolaus Schaller" , Kris Bahnsen , Mark Featherston , Bartosz Golaszewski , linux-input@vger.kernel.org, linux-spi@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/5] Input: ads7846 - simplify sample filtering Date: Wed, 11 Nov 2026 22:49:54 -0800 Message-ID: <20261112064957.1796975-3-dmitry.torokhov@gmail.com> X-Mailer: git-send-email 2.56.0.567.gdb80ae8cd5-goog In-Reply-To: <20261112064957.1796975-1-dmitry.torokhov@gmail.com> References: <20261112064957.1796975-1-dmitry.torokhov@gmail.com> X-Mailing-List: linux-input@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit The filter and filter_data members of struct ads7846, along with the generic signature of ads7846_debounce_filter(), are leftovers from custom filter callbacks that were removed in commit 937f5d5ec642 ("Input: ads7846 - remove custom filter handling functions from pdata"). Drop the filter and filter_data function pointers, remove the unused ads7846_no_filter() stub, simplify ads7846_debounce_filter() to take struct ads7846 and the sample value directly, and call it without pointer indirection. Signed-off-by: Dmitry Torokhov --- drivers/input/touchscreen/ads7846.c | 72 ++++++++++++----------------- 1 file changed, 30 insertions(+), 42 deletions(-) diff --git a/drivers/input/touchscreen/ads7846.c b/drivers/input/touchscreen/ads7846.c index 9bcb2ef129cd..f1827684c902 100644 --- a/drivers/input/touchscreen/ads7846.c +++ b/drivers/input/touchscreen/ads7846.c @@ -135,8 +135,6 @@ struct ads7846 { bool suspended; /* P: lock */ void (*read_state)(struct ads7846 *ts); - int (*filter)(void *data, int data_idx, int *val); - void *filter_data; struct gpio_desc *gpio_pendown; struct gpio_desc *gpio_hsync; }; @@ -631,11 +629,12 @@ ATTRIBUTE_GROUPS(ads784x); /*--------------------------------------------------------------------------*/ -static int ads7846_debounce_filter(void *ads, int data_idx, int *val) +static enum ads7846_filter ads7846_debounce_filter(struct ads7846 *ts, int val) { - struct ads7846 *ts = ads; + if (!ts->debounce_max) + return ADS7846_FILTER_OK; - if (!ts->read_cnt || (abs(ts->last_read - *val) > ts->debounce_tol)) { + if (!ts->read_cnt || abs(ts->last_read - val) > ts->debounce_tol) { /* Start over collecting consistent readings. */ ts->read_rep = 0; /* @@ -643,39 +642,34 @@ static int ads7846_debounce_filter(void *ads, int data_idx, int *val) * wasn't consistent enough. */ if (ts->read_cnt < ts->debounce_max) { - ts->last_read = *val; - ts->read_cnt++; - return ADS7846_FILTER_REPEAT; - } else { - /* - * Maximum number of debouncing reached and still - * not enough number of consistent readings. Abort - * the whole sample, repeat it in the next sampling - * period. - */ - ts->read_cnt = 0; - return ADS7846_FILTER_IGNORE; - } - } else { - if (++ts->read_rep > ts->debounce_rep) { - /* - * Got a good reading for this coordinate, - * go for the next one. - */ - ts->read_cnt = 0; - ts->read_rep = 0; - return ADS7846_FILTER_OK; - } else { - /* Read more values that are consistent. */ + ts->last_read = val; ts->read_cnt++; return ADS7846_FILTER_REPEAT; } + + /* + * Maximum number of debouncing reached and still + * not enough number of consistent readings. Abort + * the whole sample, repeat it in the next sampling + * period. + */ + ts->read_cnt = 0; + return ADS7846_FILTER_IGNORE; } -} -static int ads7846_no_filter(void *ads, int data_idx, int *val) -{ - return ADS7846_FILTER_OK; + if (++ts->read_rep > ts->debounce_rep) { + /* + * Got a good reading for this coordinate, + * go for the next one. + */ + ts->read_cnt = 0; + ts->read_rep = 0; + return ADS7846_FILTER_OK; + } + + /* Read more values that are consistent. */ + ts->read_cnt++; + return ADS7846_FILTER_REPEAT; } static int ads7846_get_value(struct ads7846_buf *buf) @@ -759,7 +753,7 @@ static int ads7846_filter_cmd(struct ads7846 *ts, unsigned int cmd_idx) for (b = l->skip; b < l->count; b++) { int val = ads7846_get_value(&packet->rx[l->offset + b]); - switch (ts->filter(ts->filter_data, cmd_idx, &val)) { + switch (ads7846_debounce_filter(ts, val)) { case ADS7846_FILTER_REPEAT: if (b == l->count - 1) return -EAGAIN; @@ -1367,14 +1361,8 @@ static int ads7846_probe(struct spi_device *spi) device_property_read_u16(dev, "ti,debounce-tol", &ts->debounce_tol); device_property_read_u16(dev, "ti,debounce-rep", &ts->debounce_rep); - if (ts->debounce_max) { - if (ts->debounce_max < 2) - ts->debounce_max = 2; - ts->filter = ads7846_debounce_filter; - ts->filter_data = ts; - } else { - ts->filter = ads7846_no_filter; - } + if (ts->debounce_max && ts->debounce_max < 2) + ts->debounce_max = 2; err = ads7846_setup_pendown(ts); if (err) -- 2.56.0.567.gdb80ae8cd5-goog