From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-dl1-f45.google.com (mail-dl1-f45.google.com [74.125.82.45]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B67BD3C660C for ; Tue, 5 May 2026 05:00:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.45 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777957238; cv=none; b=DPYle94tdFxhwlaM7OgXmFncV3dOLI2KB1TtlnVOH5QVi9DF27t1cOXGodEYPbpKZH0y1lsiimlf34bl5RJFdly77gegBud206Mh5t4/nT/8L0DpweWYveI+6lDY92ntsH8fl8qAdSdYsVwhFGj4menCdaTuhwSJ9Xm12zLwEng= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777957238; c=relaxed/simple; bh=nnvi31riH1G9v8r8ZETGWZl064XIY1R+443Ve15JF+M=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=S/t+WSHABlKgc2kDUC7Bmt93iKlle0UOqqfUFB1//W05YV6p0T0pbtar7J/cW0sNOi/iSyu23Egr/PdHrWZgczQrNmm7IOqV/nWUE763zZHhCLgJi/lwQEgk1WQAwsiNX7YCeV0bassoqncGbJS/GHkZnNBpGqa0Xil3YeWSHb8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=W+AH28Kn; arc=none smtp.client-ip=74.125.82.45 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.b="W+AH28Kn" Received: by mail-dl1-f45.google.com with SMTP id a92af1059eb24-12ddbe104ccso4925193c88.0 for ; Mon, 04 May 2026 22:00:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1777957236; x=1778562036; 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; bh=TUFP0ClBVPwyBO4ZKu9uXCfmRxglSQ3lWA8R1UrvOpw=; b=W+AH28KnYWiIxIrJIV1JvMMgZfFMun7BZ+GTzfHypzvaV8FaYBR1dWIyuVW95xkMn+ B1Q1R7WhwGGIQccyLTfi7VnwZYNy6oNHJ56XISd8le28m+gBfolNrhgHaU05jWMHnMcY BbuDyJCu3WXUIBn8s6XOLa3vfn7yjT+dDbun/XqBYrcdGANsDN8DSvCnsEF7Bh7T+7G3 xCcZlEzSdP5LTpKBQ90JBs7HFtSFf9jzSGrK374jTJ43UxaVs/2C7mIHcWzsvDFcHVKM TSSFA0aoObYPm7ZcfH/jgS+PRRIYzF48vkqvkLaTG89ndurQzp58x90vdGDn3dIS/aYu NpGQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1777957236; x=1778562036; 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; bh=TUFP0ClBVPwyBO4ZKu9uXCfmRxglSQ3lWA8R1UrvOpw=; b=DnEZp6QhUlUvwFu3Z7kWWHiJXB0FWcLTIDoU00rnMKBt9W8vHl2zI0Wap1ZZdXX4Uv oTt+j6fI3Jqcs7xH8Ih986OtlCytZ90jvwZpp68M6sFHJE4kLART3iKdiaofWZT5O3l9 Cuz9UPJFFkiZ/r4UYCd8bGMRw2mg6vN/8j8nrXclZsGMHY0g29x8AlQ2I499ujHjs8DX m43qh2fEgIU9DANU3KlojVVjxRz1zU4X3AM1MzSVJyIPxOGgBVJkp58MCKsVsy6Ii6zx otZ21O+A24Cg2tEyYyIlR8TqvYE6avWMkyiHnm9lz2HYB9wMrRcOAeEFB5Q3S+pI4pg8 /hIw== X-Forwarded-Encrypted: i=1; AFNElJ88prnUrAsGydGwvKKziiY9P5sMhK3DL5JDiVMJEv7HyjqvZpJjLBZT8ag80BHJSt6ZrP9L3FuFlLWh+98=@vger.kernel.org X-Gm-Message-State: AOJu0YzTc5uzILFyW92Z/26CRDWU8xhy1MiI/X0tMXsRwXKOTaVGtqQS 4wK1rpXzPf6mvYleLv7pj2y/ALvHjqe0+NQ8TJ3mNcp9ypda4ditjt2+ X-Gm-Gg: AeBDieupL4pQUjjrvD0eYy2W84KCjtNYVnm6bP9jrxvnNewxQ3cRJmfhvQyPXEyH9J8 vRjz8ttii2Jj/PeIFmxJA9fJOdbveF8rrbyZrWr/7xQ3x5sKaOwWXXqw9CbnrPrjgTDvitamfqH /jHSS4dtzjrxrtvXX8JyjN50aFTRPvYO45/TcSvWzMSVqgWgkYRpQXVS1uk6UfrRIJ/PUJ0qb6X UCjiW37GrXO4lJy3FnJp8+Xu/HVpjnG8mvPJ1iruVEikbP+lKmY7HlcKUHM1Iv74t1KdtuZOxHL vqh0PN4EQa/k+HeLNTW7pFxuFwfSVVzwdQPppIRm0+oXZ6+XXTKyyPjNMkeJMVW3fhbKMxZH4Us XtkqtM/awUnF95RLVEkb6MP1TZc588rPuz7BIma7J9J2yC2p+J0rBIlpf2f93Y1sXPsj/Qqcvql m+QjkLXvjGcB93gMc4GnZGBI6L5E8Uo1vbrfr3PoUjZ1tCnaVFTSDBgW8yjDJExsY1oAj0c3g1a EpUfemwBCEZl7EcBErNeo65gw== X-Received: by 2002:a05:7022:ec11:b0:128:d5f1:d595 with SMTP id a92af1059eb24-130b1744e7fmr875111c88.10.1777957231080; Mon, 04 May 2026 22:00:31 -0700 (PDT) Received: from dtor-ws.sjc.corp.google.com ([2a00:79e0:2ebe:8:94ef:a6f3:2c96:2d58]) by smtp.gmail.com with ESMTPSA id a92af1059eb24-12df827a73fsm16897502c88.1.2026.05.04.22.00.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 May 2026 22:00:29 -0700 (PDT) From: Dmitry Torokhov To: linux-input@vger.kernel.org Cc: Marge Yang , Greg Kroah-Hartman , linux-kernel@vger.kernel.org Subject: [PATCH v2 18/20] Input: rmi4 - simplify size calculations in F12 Date: Mon, 4 May 2026 21:59:48 -0700 Message-ID: <20260505045952.1570713-18-dmitry.torokhov@gmail.com> X-Mailer: git-send-email 2.54.0.545.g6539524ca2-goog In-Reply-To: <20260505045952.1570713-1-dmitry.torokhov@gmail.com> References: <20260505045952.1570713-1-dmitry.torokhov@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Use min_t() to simplify the clamping logic when calculating the number of objects to process and the number of valid bytes in the attention handler. Assisted-by: Gemini:gemini-3.1-pro Signed-off-by: Dmitry Torokhov --- drivers/input/rmi4/rmi_f12.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/drivers/input/rmi4/rmi_f12.c b/drivers/input/rmi4/rmi_f12.c index 34ed02b7f30f..ea72d5ce8050 100644 --- a/drivers/input/rmi4/rmi_f12.c +++ b/drivers/input/rmi4/rmi_f12.c @@ -195,14 +195,11 @@ static int rmi_f12_read_sensor_tuning(struct f12_data *f12) return 0; } -static void rmi_f12_process_objects(struct f12_data *f12, u8 *data1, int size) +static void rmi_f12_process_objects(struct f12_data *f12, u8 *data1, u32 size) { - int i; struct rmi_2d_sensor *sensor = &f12->sensor; - int objects = f12->data1->num_subpackets; - - if ((f12->data1->num_subpackets * F12_DATA1_BYTES_PER_OBJ) > size) - objects = size / F12_DATA1_BYTES_PER_OBJ; + u32 objects = min(f12->data1->num_subpackets, size / F12_DATA1_BYTES_PER_OBJ); + int i; for (i = 0; i < objects; i++) { struct rmi_2d_sensor_abs_object *obj = &sensor->objs[i]; @@ -260,10 +257,7 @@ static irqreturn_t rmi_f12_attention(int irq, void *ctx) u32 valid_bytes = sensor->pkt_size; if (drvdata->attn_data.data) { - if (sensor->attn_size > drvdata->attn_data.size) - valid_bytes = drvdata->attn_data.size; - else - valid_bytes = sensor->attn_size; + valid_bytes = min_t(u32, sensor->attn_size, drvdata->attn_data.size); memcpy(sensor->data_pkt, drvdata->attn_data.data, valid_bytes); drvdata->attn_data.data += valid_bytes; -- 2.54.0.545.g6539524ca2-goog