From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj1-f50.google.com (mail-pj1-f50.google.com [209.85.216.50]) (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 2383536728B for ; Tue, 30 Jun 2026 01:30:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.50 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782783012; cv=none; b=jB9FHy62ep+QrNiFrM1Z/C44C0IyrpW5JvF4uG/lTN5MmBzO7HTDdHlcZdUKzJKhdFbdlWlG8zVLH/W1rWniMktZtcmYGaI0xwT7e3PKk8z5P57eIv7ifjLNnmipef0Qg4VAWQM1zTOojwIc7gvVRWOa9I6cN/lCQ6wHQ6rEh+A= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782783012; c=relaxed/simple; bh=bXq+zgUWFqiQ0o2Lg+6U13J89mOnPzmZWo0e+EaO3GE=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=jZS+O8bP7etRbJFQXTQKoN9GsMHuaLDcytYIF1sueoRsvl4HJydqpXGSoxeUOt7lAirwecMXf62uRQFpFYSLEGzsRwKsydCXjXXXkEdmFJhKxKv5r9RGjtnXY3+SCYGH3Auyi2GeG7YkvrynUGAGC7PqpuQTdkozrOZmrZ65X9Y= 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=YEUmtRwv; arc=none smtp.client-ip=209.85.216.50 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="YEUmtRwv" Received: by mail-pj1-f50.google.com with SMTP id 98e67ed59e1d1-37f816d01e3so2726021a91.2 for ; Mon, 29 Jun 2026 18:30:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1782783001; x=1783387801; 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=KYEsXemwGTTK1ewS6tBft6CHPQFa/c3l/+EJIKVBxps=; b=YEUmtRwv8JqhJz1Dp84DuXJqYuOJaHhwGhTc4vNrgK6XQshxZ8FMMsegSJQHrnb0F7 U7ol6K1ZJZY50ajjyzlSRaVBjN65gzGXoaqL4RO+UeD3bYtVMRramz2sZs7MtoIzTvqN P7ZqRzJnwChXlNqj8JXUCP1c6QPj5ai2w5vu4TSfFO2eXGFHIxOz25ZvQ19esLpWYoh5 Z6GiTx1+QQ4thv77oE3il5PuqXA2erFI+xKllFPBuV1zEiWs63+jylTUEsRK2udN0h04 yf9bs+ecNyVxAdHvTnGrtPAheDlvG58lk4tQiGnr1Ai0h+aJm1xn9knLQC2yvz/SyBbw LnkA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782783001; x=1783387801; 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=KYEsXemwGTTK1ewS6tBft6CHPQFa/c3l/+EJIKVBxps=; b=YloCQEDIs3EvcrT8/sYbadod1RSMou+5OSLeCPs2cmDAeSOm4znF5eShjnvo2gzXEl JSlZdhP3F/i0MGQV9v4nWb/w61DKKDJdwyt5/OlA8WcRDg0psZzbYl5ohFHsdl1dvWGb u/CJlDJiWR6gX5A4WWcPGjTcjz560p1Tj5xK+SH3IPwlAnzHzxQxwTS9PbsvQfex4nkq +9BMBnu7+dIOYkEYy+gnbQOZgR+2hs81tHeI0PWWOeqovYTrtKCRmBtAASI/JAEAWbFR 93Ns58SS2L/P+3p2XRqiuX8IeS/W/G8loTgsMDFcgaRfvmEFOB5zDEZ50p8Jsp+JT3F0 8RNg== X-Forwarded-Encrypted: i=1; AHgh+RoHCyxAQK1NDr5WQdweAUHJKPJ6FuLrpFXm0My9FxvsbGQ3/30nf7EYKDyAMMsG/AinoAwQhxLLk2RQocI=@vger.kernel.org X-Gm-Message-State: AOJu0YzRDWYK7zkJn17ZzSxc1ZCbnBGbXalTKK7ZFE4yiywIvtExpwuK GU5uZfK3E9GlnsgUyjl2hS69lBZADTPK/EPIHxufIPnL2ZMejt6pIrbH X-Gm-Gg: AfdE7cmHXhOq+vAvAsMp0RohqbOCBbc0yfIcrrmv1pQn31psL7k8Sy/HXDKMldfEwXF KZa/w/bUBdHiu8/QcxA3h94cDC6ViAHBjWYqec+pzt6Z0prbSChNK2PpZQGz8CPPrmSvEFwHAKm zdm6oSXxotYJFhPddi8baitOCiCfzUt8splpnY0uBQytR+da37kh3jXTbWDycmPsMnTamfWopMO Wwyi3PHp/pQPyNsYoe8E5ye1o7k0Pd4gxW2OArAvg1gXolJ7guTomWDUxbkmjb1PtfJw7/kdloE nYbiOjXzKOI1inZCRg5wk63ZqpxstlnGE+rGRaY9oxOuUNbhTIPkuGisDA+YocYo8cJty62QQNB pxlc7F7uua9pQcVApZnbyB1KJJqUxM1F7Ne6K4xyiBkohrCyNklySwOAxrRJxnZCjlNiL+QrgCn epLP4rLI8AEzsGajznwdXMvmCagXcCVaKd2PN59fSRLqMs+ttFrLq3Q0mMqvLuT//EbYU+IcD2D oZm57+4nw== X-Received: by 2002:a17:90b:2808:b0:37f:b0a9:1a55 with SMTP id 98e67ed59e1d1-380525651b9mr1105722a91.11.1782783000906; Mon, 29 Jun 2026 18:30:00 -0700 (PDT) Received: from ryzen.lan ([2601:644:8000:7a86::e34]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-3805b7dd427sm63092a91.0.2026.06.29.18.29.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 29 Jun 2026 18:30:00 -0700 (PDT) From: Rosen Penev To: linux-omap@vger.kernel.org Cc: Aaro Koskinen , Andreas Kemnade , Kevin Hilman , Roger Quadros , Tony Lindgren , Lee Jones , linux-kernel@vger.kernel.org (open list) Subject: [PATCH] mfd: twl-core: allocate modules with twl_private Date: Mon, 29 Jun 2026 18:29:58 -0700 Message-ID: <20260630012958.1498689-1-rosenp@gmail.com> X-Mailer: git-send-email 2.54.0 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 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. Signed-off-by: Rosen Penev --- drivers/mfd/twl-core.c | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/drivers/mfd/twl-core.c b/drivers/mfd/twl-core.c index c024a28b057e..a7754b7ccae0 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; @@ -760,7 +760,8 @@ twl_probe(struct i2c_client *client) goto free; } - twl_priv = devm_kzalloc(&client->dev, sizeof(struct twl_private), + num_slaves = twl_get_num_slaves(); + twl_priv = devm_kzalloc(&client->dev, struct_size(twl_priv, twl_modules, num_slaves), GFP_KERNEL); if (!twl_priv) { status = -ENOMEM; @@ -777,16 +778,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 free; - } - for (i = 0; i < num_slaves; i++) { struct twl_client *twl = &twl_priv->twl_modules[i]; -- 2.54.0