From nobody Wed Apr 8 02:48:23 2026 Received: from mail-pj1-f48.google.com (mail-pj1-f48.google.com [209.85.216.48]) (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 E2C372D97BB for ; Wed, 11 Mar 2026 02:55:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.48 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773197761; cv=none; b=ogIT18/rDmAZdM9I06c62Ahr3nlWFrRvnqSl6pF1WikOxM7Z1hfLZ3xOYznle5c/Nh2E4odkPuFLIT+GdfRiZrI5dDsB/e0oX7GKLYmNZEvnUtm4Q4G4AAOH66WkG2nLWkjZznvJht+uJKJppAcwi7IKK4LKKRPzeBT3ifnPc9g= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773197761; c=relaxed/simple; bh=hyjfQXklLqkW/i7CefJGecdgWhNnoQXJHNE3mTmlTlQ=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=f+xAvcCtlDJDg84mwEp4FBLu7LsmSoA0z0vxu4N1vWplR5zugB5ZI6mYdCuQf/+mGM/fVMRkZHTRpUS3rdxt4xElf0r0wGMExtLEo1Ze7QFBZ6f+mvxtFU2+ttrgjKj/g5acaCW3wIt5mV0Mi4iHZZ/SHNxzqRYyNsaDDFg68zs= 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=YzkuIDEq; arc=none smtp.client-ip=209.85.216.48 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="YzkuIDEq" Received: by mail-pj1-f48.google.com with SMTP id 98e67ed59e1d1-35983877dc5so4566198a91.2 for ; Tue, 10 Mar 2026 19:55:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1773197759; x=1773802559; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=8c6OjZm0+U7pnN7pJa7FIN5Z/TewF/LGu73XtmiIMW0=; b=YzkuIDEqy5ODAAozRB2nCuj1FJeWLHr+B1ftxolqwW6nJYdvRTz1C2f2e6vLjxlo66 S/NFD2yAvxXirm4fejOdWxcYwbdUevdjGYQ8wkq/vucIMPmxKj31l2jnra/jv+tbkyNL YUePD1QwbElOJUq9svnEs1Z+meiPica1XLi9An2bgLV8YOpyw+1umJvnNxj1UUehrzHo 7/W1zKN9AqcGdxFy5om+/Y0o0vBWN4iKzATcrSjQw6Yv+qhULGAzuHBfXnuuJf5fxuE6 sYycTIbNu6QE8MiY3G5AdmNiNlzMMwptsAx4EVBuoqzvI4LaCM4+tKC3MMNoIA3nbxRc +6sA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773197759; x=1773802559; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=8c6OjZm0+U7pnN7pJa7FIN5Z/TewF/LGu73XtmiIMW0=; b=G2ICmNrss2VJD3XIIR0MtqYXl467j0OamwdhI48WeCl0EhZaDprjzrCmPjn1u2Fjy4 Lu+RKTodXm4SkZH0H6dnzYlA/6MevUFwh4OVzFToaPz/AVwGiDBgrJHn+f3ZrxvKk8sS xxno2QNuKobkhtrBa+eE/igoAzxo/txh3dPqttxd7jwrHqrI9vt+L1mj4epe5iYD3kAp +Bk5X9LrsK/JPiPzPanj6vJBMD8SMACnBKXDrz8v+t8A0sStR8hzdib5D9xu37s5OUkk O3p+F6Rc53UZ6sWpWFlHWbc7sXj9KCsFY8R+0dK0NqUrE0raGrLkdtgPjCHvj1G3eO5w xldQ== X-Forwarded-Encrypted: i=1; AJvYcCVjj+8NqH4HpU/94No7gENGngb3SoIclsEamSmBwZI3OvWAPbmWjCHFnPHgVXVlZ6SGiMVqrTLvhqJOEJM=@vger.kernel.org X-Gm-Message-State: AOJu0Yzo2xkTwy52pziDSuQ3jV+BAhyv7tO0vWPYgYYrjdrNn+YPziL2 hGTxustUdZTFUrMbPANKEGngJg/r6WCbDW+KdguUjAPKwL5W6OdK2zD+ X-Gm-Gg: ATEYQzx0uLJORvBU0g+HkikYYX8boqWwyNARp8ak7qUyksCt5tDqfv8xihkTcPOgmwS dxPBeCPjEzS4R+55ruJtgkFAabBfQX0ef0dgyZyl9DzKs0XIklZSYkFtcI1Tj6lpy70sQ73kjZ5 Q0bowP8j62ezWYDql5MvfNh42y2KbkHtNY5JLuyofVDAFKyw1iM1N9TdqInzKuHZbNFw5eJQHJ9 V9/nHIVMBySCZcARwvoiG+qtPGzaQinLftmd3i84Gt8Wlqa651TppT2QRIwTSNnfUcOjITLZ6Z4 Zj3A1ez77b7FSg2BlouQunUKmWZzIC+lfFMqfUxu+VMwJswkNmTUxEUCVwVLsXKEeI9OlIuBGQ0 JHx5Zup6W8rT+8sBIA6Plng8p3xDmD/YWqOnqetlYIEWdN1F1TqgQQ1PkAKZC5l2LuLcc6/qQ7+ 9XO1jw0nsq5n6QUCqWYw+alqwHG415L3opoKiq7NLGxOeIJmo1ez1IRQ== X-Received: by 2002:a17:90b:3f45:b0:359:8d70:c4e6 with SMTP id 98e67ed59e1d1-35a012866b4mr885260a91.1.1773197759236; Tue, 10 Mar 2026 19:55:59 -0700 (PDT) Received: from ryzen ([2601:644:8000:56f5::8bd]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-35a02ba23adsm475448a91.0.2026.03.10.19.55.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Mar 2026 19:55:58 -0700 (PDT) From: Rosen Penev To: linux-gpio@vger.kernel.org Cc: "Enrico Weigelt, metux IT consult" , Viresh Kumar , Linus Walleij , Bartosz Golaszewski , virtualization@lists.linux.dev (open list:VIRTIO GPIO DRIVER), linux-kernel@vger.kernel.org (open list) Subject: [PATCHv2] gpio: virtio: remove one kcalloc Date: Tue, 10 Mar 2026 19:55:41 -0700 Message-ID: <20260311025541.53814-1-rosenp@gmail.com> X-Mailer: git-send-email 2.53.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" A flexible array member can be used to combine allocations. Signed-off-by: Rosen Penev Acked-by: Viresh Kumar --- v2: add space in struct drivers/gpio/gpio-virtio.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/drivers/gpio/gpio-virtio.c b/drivers/gpio/gpio-virtio.c index ed6e0e90fa8a..db66590ea5d3 100644 --- a/drivers/gpio/gpio-virtio.c +++ b/drivers/gpio/gpio-virtio.c @@ -52,7 +52,6 @@ struct virtio_gpio { struct virtio_device *vdev; struct mutex lock; /* Protects virtqueue operation */ struct gpio_chip gc; - struct virtio_gpio_line *lines; struct virtqueue *request_vq; /* irq support */ @@ -60,6 +59,8 @@ struct virtio_gpio { struct mutex irq_lock; /* Protects irq operation */ raw_spinlock_t eventq_lock; /* Protects queuing of the buffer */ struct vgpio_irq_line *irq_lines; + + struct virtio_gpio_line lines[]; }; static int _virtio_gpio_req(struct virtio_gpio *vgpio, u16 type, u16 gpio, @@ -541,10 +542,6 @@ static int virtio_gpio_probe(struct virtio_device *vde= v) u16 ngpio; int ret, i; - vgpio =3D devm_kzalloc(dev, sizeof(*vgpio), GFP_KERNEL); - if (!vgpio) - return -ENOMEM; - /* Read configuration */ gpio_names_size =3D virtio_cread32(vdev, offsetof(struct virtio_gpio_config, @@ -556,8 +553,8 @@ static int virtio_gpio_probe(struct virtio_device *vdev) return -EINVAL; } - vgpio->lines =3D devm_kcalloc(dev, ngpio, sizeof(*vgpio->lines), GFP_KERN= EL); - if (!vgpio->lines) + vgpio =3D devm_kzalloc(dev, struct_size(vgpio, lines, ngpio), GFP_KERNEL); + if (!vgpio) return -ENOMEM; for (i =3D 0; i < ngpio; i++) { -- 2.53.0