Received: from mail-qk2-f43.google.com (mail-qk2-f43.google.com [74.125.230.235]) (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 28C244BFE75 for ; Thu, 24 Sep 2026 18:56:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.230.235 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790276207; cv=none; b=QN6pZ4HfXwNgRhXD4gtf5Bc0PqKL+kqNB8gBIAGsj9+lNISuawysTO5c1Nox7FXEO6qig+HtsK+SWAPm7a8gt2oMLDePDxXA6Nl1xgCrjuZbEgnarWOwbRGHm3TMGkAAvKHilnDYX1CE2cGL0drLTZIozNelyf+DrN/EC8ECuJA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790276207; c=relaxed/simple; bh=8FwKlIoS1YJr20q5/GeHL/Z3vtXW795veMaqn77uBQo=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=tQo1bB3Vs9hmTul5d7AaugNjunXyn4n4EnTKk+Q7DfNOpHSm32ym7E2vRb8Q6rIf/zjEznEUFuIuqwAfTAa7kbRxO1vKxPToAQsImWWf8Q+n36JZoaQnlWNn7XAf1vfVuXm/qq1VOvsroeo7vCbNcTeMmD3wzGFouoA7CI4q3/k= 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=LuV6eZKx; arc=none smtp.client-ip=74.125.230.235 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="LuV6eZKx" Received: by mail-qk2-f43.google.com with SMTP id d75a77b69052e-530d8a00bcdso1414561cf.2 for ; Thu, 24 Sep 2026 11:56:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1790276204; x=1790881004; 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:content-type; bh=u7if64GBDyZRxjhYKdKsp7wUaEGoHDi7prbfVqVtWGk=; b=LuV6eZKxUNbU6vMEM/jg3I6yLUVOcymB6k600VuDJXdIIRUIlmHuxWRcDL8MUbPFAF z0rBDLqvyGI53WoQLOU7n3EKJLsMJHV2F3uzEftp9sQRn3625jofBxVpXptoC1zVFYjL Smgv8salaZoCmzGNuEUm4LnupsmPdp06UqMWMLS4TbeAgOfY9SVxqa6ioUj41hS0oUuo grq57IgejoKSHiAolUB+4aBrdI/tEZ485dQVe/n7qgt3Jyb3/rjlnWmCMntfBxl1ZpEW QNIontV0nwS8XqJHduojGRWg85EyDihW1fH1z8TfKaIIxsEiZTo4FhDWhFn3gACN64Kk RuFQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1790276204; x=1790881004; 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:content-type; bh=u7if64GBDyZRxjhYKdKsp7wUaEGoHDi7prbfVqVtWGk=; b=i417jzqVhQJwbNPLF8SX1dv9Tmt3DV3TaRBqIjIAD/0VvD1+FmJ9QqBqjFpA8vx+XR NhC/XfbXfMh1i61uEfbgAhVMqlquYkwwd7qnohQgmAs57d1w5dzic1hfFz3HDHwhFWqg PojqbrQeRHj/wIYQ+UJNp9ML9VnHyIJ33KKSjOMzdbBlsI3Rg1pasOrQLEDnnV6+IbqF gicobMgCCgUkGUpWKjhuJ7FNLejWrAMgmzCKZ9ZoQMHW7mp7sVdXj4UUqj43oJVEz8kT db3HOdEuLzEe6L7Z7xvLjhWyghko6Ug1oK8h5dydnxJamXa6Wq6XMtgZ6dZKNyqav7xt 00ug== X-Forwarded-Encrypted: i=1; AKwUvBy0V8NuoyoXqmawLuI95GgzDpLLR7YDGfbcMNB1qz/2vAfYBnDFNAGmzgvK+ft83TX7WlYtEv2am6yP@vger.kernel.org X-Gm-Message-State: AFuF++lN3SWRSnjV9r2LKCVIelTA9nB1uFwiW7CEw7GmmiU6nIjNAqqx wPomueW4zHr+deRcm9CV4dFMPw8R51qQYC5qxaxx+2UB1ZD8zgRqqDt2 X-Gm-Gg: AYBFou3GCHzhZm+uzXMoqYeCUHAjCQRFvj8/EZVyjnVFTzra9rEG1YJIe70BI8JFhOI QuVOZL7r36Hb7vNPHoctzZzlm0WCg898KzQ0nICAKVmRw7sxG8H8DdE4FzlUdjJaZZbsHzZs+gD 3BrIXepKjZPM7VARs/FNOMLmgjr/O24ljujKEpVFsGC3HXFwnTOJGJgZaoWxt7tES3xzy8Axehs dtHQFk5Bp3vgI4wQoTSgz7Sft4Q9WRAnj78h064HC7jbojV/WmlXvPG7UUYoYNuKZhyYEB7KNGD wCVRqZ+LX50alTnh5jDuxVG5yHu0GlvYGq3c5cg4jGoFTe1V7TgvgxZSUxJnoQnvf1UQrzQ0kb6 dCJAVEpdjYGs6Lf2ceoooDdWb6X782t71vxzA/HiuwtJKzJQt+zbv15x18NevNBV1zmFAJlUuhY U24JWTe6DraQuYnMv94vni2B1GZ6Fg3kWqCgbq/tAgf879iJO8gxGqE4OOMkSCRnshzQac3mM9Q 8c2OWXTd3xOXgg9GaQU8ojF/PX8piqpBjbVG5u1GrC5iM6v3o6y404IugjmEcEWFLImvWYKW0fz CO9MHdp7cT3w4WG2uuRocJtZqPVRBPw9v4xR5m1QJzrbJZuIOUl+Qqx84Hw= X-Received: by 2002:a05:622a:130e:b0:532:d743:33e6 with SMTP id d75a77b69052e-5330b5881b9mr3667121cf.9.1790276203621; Thu, 24 Sep 2026 11:56:43 -0700 (PDT) Received: from ryzen.lan ([2601:644:8000:7a86::e34]) by smtp.gmail.com with ESMTPSA id d75a77b69052e-5330beed557sm286031cf.15.2026.09.24.11.56.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 24 Sep 2026 11:56:42 -0700 (PDT) From: Rosen Penev To: mfd@lists.linux.dev Cc: Aaro Koskinen , Andreas Kemnade , Kevin Hilman , Roger Quadros , Tony Lindgren , Lee Jones , linux-omap@vger.kernel.org (open list:OMAP2+ SUPPORT), linux-kernel@vger.kernel.org (open list) Subject: [PATCHv2] mfd: twl-core: allocate modules with twl_private Date: Thu, 24 Sep 2026 11:56:39 -0700 Message-ID: <20260924185639.30913-1-rosenp@gmail.com> X-Mailer: git-send-email 2.55.0 Precedence: bulk X-Mailing-List: linux-omap@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Use a flexible array member to allocate the twl_client array together with struct twl_private. This removes a separate devm_kcalloc() and keeps the module data tied to the main private structure. Can't use twl_get_num_slaves() for this as that bases its value on twl_priv->twl_id , which is unallocated at this point. Signed-off-by: Rosen Penev --- v2: don't use twl_get_num_slaves(). drivers/mfd/twl-core.c | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/drivers/mfd/twl-core.c b/drivers/mfd/twl-core.c index f86df356d658..0b78fe30e047 100644 --- a/drivers/mfd/twl-core.c +++ b/drivers/mfd/twl-core.c @@ -159,7 +159,7 @@ struct twl_private { unsigned int twl_id; struct twl_mapping *twl_map; - struct twl_client *twl_modules; + struct twl_client twl_modules[]; }; static struct twl_private *twl_priv; @@ -770,7 +770,9 @@ twl_probe(struct i2c_client *client) goto out; } - twl_priv = devm_kzalloc(&client->dev, sizeof(struct twl_private), + num_slaves = (id->driver_data & TWL6030_CLASS) ? 3 : 4; + twl_priv = devm_kzalloc(&client->dev, + struct_size(twl_priv, twl_modules, num_slaves), GFP_KERNEL); if (!twl_priv) { status = -ENOMEM; @@ -787,16 +789,6 @@ twl_probe(struct i2c_client *client) twl_regmap_config = twl4030_regmap_config; } - num_slaves = twl_get_num_slaves(); - twl_priv->twl_modules = devm_kcalloc(&client->dev, - num_slaves, - sizeof(struct twl_client), - GFP_KERNEL); - if (!twl_priv->twl_modules) { - status = -ENOMEM; - goto out; - } - for (i = 0; i < num_slaves; i++) { struct twl_client *twl = &twl_priv->twl_modules[i]; -- 2.55.0