From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj1-f53.google.com (mail-pj1-f53.google.com [209.85.216.53]) (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 74D7139891C for ; Thu, 30 Apr 2026 22:04:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.53 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777586670; cv=none; b=VO+G3lBjZ/+Ff//s/beMN0qg6jNuA/eS22t3bed99PwvXZMxreHDUyOeHY+vYCDHERAn90PF5AXKl/svMVr/CsBHCVpmklKTPWJs2S+0duioHlEowAqTrW6mW3Zi21LcpMjkwkQiXb60R0L0FeUDNdrGNrae8fRVJV3dLDi4/Hs= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777586670; c=relaxed/simple; bh=FzT8M5UU1weUXaINx90b7t49VGOaivvhZQQlTWbJv7U=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=qXTOs0kckbMqE4qHiWvcmjRTs9b3zU+vUecrgrhUhpcTYNU48+NS9EG7XGhoUkEpED/9KpMzKLNxJy+2/iVRBS7rb7Br2jWy+3Zdfcm6Cg4tTjwmvcWftlRj3O02k956xgMVeDw9lKBijU1tqoLNvQ/vSYX/zEHyfnC839AEbpU= 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=dqZkIWy2; arc=none smtp.client-ip=209.85.216.53 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="dqZkIWy2" Received: by mail-pj1-f53.google.com with SMTP id 98e67ed59e1d1-3567e2b4159so1128527a91.0 for ; Thu, 30 Apr 2026 15:04:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1777586668; x=1778191468; 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=2aWrznEs6/axBvcga/bF04l+nJ16I8rpklN4FoR4hQI=; b=dqZkIWy2arcWHy5SN0fs66zaFXgp19TKoQbYkOPyVeGm8r8EanSs/BSCKvcfYhQjbS +wIahNGVsMIE97vMTSp4v4gOTmm/9CQ6ClKxr3cj54KgTHq4DF+Kg8UEWq1b25udF0kB pNvhI7IZI0fE3ob+xYnkmSnIiPdu6+L8tE7oyhOZ07Y0tFQkW8u1EeIrG+a8VtstiTf1 DT+aXktmlPtfKss4uvW2N7uVDPvBqPYObQRL40qCt7x3NFQoOQ6GZf1QfhADF0UpuZMt EdyR1Dm/3eiQ7Cq5ffYXK2P1TxKIyLT6FvQBkery+V9l71VmUCv8sGpq/whrfAYEMbg0 mz3Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1777586668; x=1778191468; 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=2aWrznEs6/axBvcga/bF04l+nJ16I8rpklN4FoR4hQI=; b=Ai/d7qg7M8MXFg1L8WvWY3IcwRdtCx9vRHTvDjLJ9J1Rcir+3zbT4U/zm5XrSEccC5 tU4fGwZ6svBppXj9oB//mLHXVjMXrlXZCXS7G7YVvbSYgo4zoT124/Z15xJeIxYUyNOZ vleVZFkj3sY7qJLWJ/OPDMZK2R7aShTeSkA9H/0gNiXMq0Cq7QTqO/bjT1gLY/J7hNMu WycUvJCDw3ztSUXsxaS82lKE70K7Dv9PuNEPsMi+n2jHDsnD1L9FjvdXVj3KputpIzxc B5IMe0ZV7ARf2bzU9Tk02jF/L2IMEhktzQZFfmlEqtNJYa3GQLPVqZEJxapw0XnO60cq uurA== X-Forwarded-Encrypted: i=1; AFNElJ8f/PjJHMd7OQzVryqZOLkzaAlmyAkNBki3U/Vg0em23QLXLncXlevlnrCVCIAHHnz/1/h1b3+MYykPMZE=@vger.kernel.org X-Gm-Message-State: AOJu0YyvMhLcA0mV2oSnpeMvm4JMwUkFRQZzrd/lcN5wSMtDaDvCrhTf HIBcM4eZrVyhCcZg9XbZCwivrqjDg4mGzlzhn5v6yAgseOMizfCaxOh9 X-Gm-Gg: AeBDietXgJIzouPfqihrtVQrmkdNVSdHYbPYOp4HRSx/TxiXkTbU7irdtcXCkNmqs0L i4fkEhWsxE2zgCx4IDoRemE8JqzyuZBa+NLW5FVTCKU9PkWrdxjqo5lZMYpwp49/eiuttRoxspP bYcQzQV6ky+3KX9ciJetvEeUth45vKyGT3UyGoNoZb9phP7IowxIRBEBahoep+GB9KZatwBmPia dMBm74dtzQ2WNvOb7DikyQ1Hv4FnGwqYn5q288Xt0BZc/K50Vno+wK6qyio2VtJot8H3SX/fB6e Y5q1RB2QPfcIJLvtXJ9K7wabZR3v1SPM7IFiI5mR5i4lXNwbXMXyHj0mtue6O2fHHRh96ZLkGMd nbeaBsUCAuz89Nuu/4cv1GNSUPzybYyuvl+AJ+PXixbDQJiutk3Z5zM4xFPeQ5gp0keCi68USPu 8FChTUCHUCbWx4qC2T+6LuG6c2FerY3P3zB2Sdm7cSbncM3M3BSyShdHgclzI1cOn0Ihs1d1sDc o2bflO9SG35EdrTWRJdE6Edqb39TiWeJ+5K1+6xMfK9Kskl3CAPbq3o X-Received: by 2002:a17:90b:2e42:b0:35f:b9ea:8fa5 with SMTP id 98e67ed59e1d1-364c30e2dc9mr4448720a91.20.1777586667823; Thu, 30 Apr 2026 15:04:27 -0700 (PDT) Received: from ryzen ([2601:644:8000:5b5d:7285:c2ff:fe45:8a32]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-364dd3e9a3dsm1431791a91.16.2026.04.30.15.04.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Apr 2026 15:04:27 -0700 (PDT) From: Rosen Penev To: linux-gpio@vger.kernel.org Cc: Linus Walleij , Chen Wang , Inochi Amaoto , sophgo@lists.linux.dev (open list:SOPHGO DEVICETREES and DRIVERS), linux-kernel@vger.kernel.org (open list) Subject: [PATCH] pinctrl: sophgo: allocate power_cfg with priv Date: Thu, 30 Apr 2026 15:04:09 -0700 Message-ID: <20260430220409.74885-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 combine allocations and simplify code slightly. Signed-off-by: Rosen Penev --- drivers/pinctrl/sophgo/pinctrl-cv18xx.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/drivers/pinctrl/sophgo/pinctrl-cv18xx.c b/drivers/pinctrl/sophgo/pinctrl-cv18xx.c index c3a2dcf71f2a..154ba9a4f08c 100644 --- a/drivers/pinctrl/sophgo/pinctrl-cv18xx.c +++ b/drivers/pinctrl/sophgo/pinctrl-cv18xx.c @@ -27,8 +27,8 @@ #include "pinctrl-cv18xx.h" struct cv1800_priv { - u32 *power_cfg; void __iomem *regs[2]; + u32 power_cfg[]; }; static unsigned int cv1800_dt_get_pin_mux(u32 value) @@ -417,15 +417,11 @@ static int cv1800_pinctrl_init(struct platform_device *pdev, const struct sophgo_pinctrl_data *pctrl_data = pctrl->data; struct cv1800_priv *priv; - priv = devm_kzalloc(&pdev->dev, sizeof(struct cv1800_priv), GFP_KERNEL); + priv = devm_kzalloc(&pdev->dev, struct_size(priv, power_cfg, pctrl_data->npds), + GFP_KERNEL); if (!priv) return -ENOMEM; - priv->power_cfg = devm_kcalloc(&pdev->dev, pctrl_data->npds, - sizeof(u32), GFP_KERNEL); - if (!priv->power_cfg) - return -ENOMEM; - priv->regs[0] = devm_platform_ioremap_resource_byname(pdev, "sys"); if (IS_ERR(priv->regs[0])) return PTR_ERR(priv->regs[0]); -- 2.54.0