From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-dl1-f51.google.com (mail-dl1-f51.google.com [74.125.82.51]) (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 793BA3CEB8E for ; Tue, 5 May 2026 05:00:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.51 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777957218; cv=none; b=W4RR7JRVF1soKnidXSvYd9UZiyQ4xIVHJeM02zOEGWZo1t9+BJqDqu/Wh46F2WON0vf3+nedufDRV26qNHllyXkr185hFO+paCWWzwDUmhNM46ZY8KTnFDskRuR/SIIjkfBJRQf7GEz9jKIhoQQW+PyytZbH4n+P0zSx6Y9Yd4c= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777957218; c=relaxed/simple; bh=+j6UST8T7/rqDpInMrYEJxa35ttSBlioBojgrsKk74o=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ZYaClBmltWiflfIIxO3n05sQAffQOmGBb0xrP+lOOFKj+7JIC7YWA6vadbrL3MZAECZFZ0aKuDEDz9ZZzYHFHBilAJfYc9vd+MAOKlGNUoZ9GrKLfjQ9eL0hQfx12ATH6ofqpfiw03oT9z44lfyyE2Eu79kKKAINWvuLnDfSqnM= 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=PHBXuxv5; arc=none smtp.client-ip=74.125.82.51 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="PHBXuxv5" Received: by mail-dl1-f51.google.com with SMTP id a92af1059eb24-12dfee30612so2048299c88.0 for ; Mon, 04 May 2026 22:00:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1777957217; x=1778562017; 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=8+gGcl/944U3F8F8GDunPMH9kl1f17h8w0DZqDYpc2Y=; b=PHBXuxv5urt2R++iuZK9EBz/1FSnVml/p9kg7D6fIjEg50LOJ5Gebp3oNY3qJ17wEz x1E1AYsF4XKEqHWNQDfDqJ4nAk1G8QEK+Stu02b/qM9H6vCFzGIQRccpd7KFhefmUbDx cQ7+t6IMnKaqQ8zQFxJMxrLMi61SQnL4m96fNsyxRHDGZ1YL6uJmhiNgkUu4Jl2KFz1E nYO5Xkoj2xdOr3UY70GpIZ9bkBE+cphYayxQMYL8IOLwJLWv8954nWaepmKLwRJzbaV3 CnxL60biBQx24wM5QoERXf/z2sOyheYOwSAyX5H4KdfZakLp7q1nFtU3VdJRzPMikD7n Iivw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1777957217; x=1778562017; 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=8+gGcl/944U3F8F8GDunPMH9kl1f17h8w0DZqDYpc2Y=; b=iWptQlSB3Nze/8miZjsJjFS4zYYBonMNqx11dauaOKRkRH1ehUzItvA/Yg/7WN9gpt xeyVzHe9cXBPJxOdLTbVHcd8jExFi1VFSHMeeFzoOgaENW4jiY8dm5tWXFJdkmmv6N9J 5IigRhpK3FA1MryY1CX6ZqwUWJwsZJJ6ldTWOQcfylv5KBju7SfelvhOajTnXHaLk74+ shfARlLc/zp8IGQQTW9EjzxZzLI+GN0cMo7fHppLS3uSJQMHhoVdfAjJJcGj8IaGXBwn xSOFiIobpyObT3kJqY/6+Lzl1AY0F1tSMoqmxPGTwuApQuRKmga/IzMUcbLFdghxRBQF CxbA== X-Forwarded-Encrypted: i=1; AFNElJ/xTwWyNSl7hQDqdq99gIsKp2qOy3ZV4c1ZYvxIptZXZMYnZnOcuUUpW2PHTubqAVH3VkIcv2kDHXK0p5M=@vger.kernel.org X-Gm-Message-State: AOJu0YxSFD4ZgEOuD/tm4+hj+xvwb2TGBllc36G9gvSKZC75voiWGKua 9BxbV0GTK9Vv6+9GBCE7RbNV7ftpAot7QVSEoRiIgQhFCEtOrn4pFuRw X-Gm-Gg: AeBDieuCHaKLe72uHr7hY6D8L1zT4BqT0fMQ6emHZEajoBkIH6PNeL8QEbdv9l4/s/+ uTvcRy/4jcSp5Xbzb30uXlO9nVOOMrjZlDLpkx6gma+TosTyg3E15GUlgRWtI9NFzbLM7uNVg2h BkXthaCeQWGqkIIT6ZrvsxjH1wrcdlUTnEtPtqVjsx/J3FAT5XJF0WjiR4+EL1S/+toHEKzljAR aqUog1MY5SEwNiboxLOTP7QqBK8oh+1rRYTq0rfEskG/PBdzRuxbDE+UxVGsyLk6OdVkkCW64XS OIJuA7Cz+8VajnsjDxAnRP7AbcNHDftodk8JTZDIf785MNEmTy8cRbFjjI37Zzi5VzFjM6tPqW5 EB91Zr6gLv/QLbZ3NnZw050uzQFtQLWWv1+xfyrYAnykoo2lZ5aW4LmUiAwXst7roAi8f70FRMU QhXCi14KrcpB8nYEhJS9LfdHZHHGUZ/bVwHJNiiGLVk2oAwhWb5Bm0FYLiKFhzgSFEtBE4iST1r /E1+5RzlUxjtr9+QkGBpnYp6s3s4Foy8up8 X-Received: by 2002:a05:7022:68aa:b0:128:d5f1:d593 with SMTP id a92af1059eb24-12dfd7ae797mr6453452c88.1.1777957216539; Mon, 04 May 2026 22:00:16 -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.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 May 2026 22:00:14 -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 11/20] Input: rmi4 - use kzalloc_flex() for struct rmi_function Date: Mon, 4 May 2026 21:59:41 -0700 Message-ID: <20260505045952.1570713-11-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 struct rmi_function contains a flexible array member irq_mask. Convert the manual kzalloc size calculation to use the kzalloc_flex() macro. Assisted-by: Gemini:gemini-3.1-pro Signed-off-by: Dmitry Torokhov --- drivers/input/rmi4/rmi_bus.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/input/rmi4/rmi_bus.c b/drivers/input/rmi4/rmi_bus.c index 71a25df73984..64d5cb72e113 100644 --- a/drivers/input/rmi4/rmi_bus.c +++ b/drivers/input/rmi4/rmi_bus.c @@ -242,9 +242,7 @@ struct rmi_function *rmi_alloc_function(struct rmi_device *rmi_dev, u8 id) struct rmi_driver_data *data = dev_get_drvdata(&rmi_dev->dev); struct rmi_function *fn; - fn = kzalloc(sizeof(*fn) + - BITS_TO_LONGS(data->irq_count) * sizeof(unsigned long), - GFP_KERNEL); + fn = kzalloc_flex(*fn, irq_mask, BITS_TO_LONGS(data->irq_count)); if (!fn) return NULL; -- 2.54.0.545.g6539524ca2-goog