From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pg1-f178.google.com (mail-pg1-f178.google.com [209.85.215.178]) (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 BFAE31F192E for ; Sat, 25 Apr 2026 01:40:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.178 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777081249; cv=none; b=FNFQwiy1+qIGOCzlVlRSWbE5WDxtSHV2RO7n8sOc5ypMOCsJvQPN6T6q9UUsvOenZ0IzOPBioH2fYrKVGsvIJErwPu+GBafhFOULum5D8SbctlHHDyFSZMxqJHJYKVcEten7DNxui3YEXmgO4DCYJXUhUiyAxOh8MmzKlVStd4A= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777081249; c=relaxed/simple; bh=s7xRw2+FvzK5g98p/kRflojZycaFuy0Jd6uptcZKYT8=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=HVy3etuNFoot2hKGZ9qvKUUIigNBITXKGeMep6j266u6oTzjX2U6AIooIrIrdtVfv01PTVssRiquE/P0yyfcXYwx1eF8k7mDP9GEGBWo19R9GtqaahqLSimom/Y2fryb0c5s3mXn5sBwWVZ7JsvDnOp4FcAYfYPj8Kl4TROaxdA= 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=aJvTVP9i; arc=none smtp.client-ip=209.85.215.178 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="aJvTVP9i" Received: by mail-pg1-f178.google.com with SMTP id 41be03b00d2f7-c7358a7a8d1so5446033a12.3 for ; Fri, 24 Apr 2026 18:40:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1777081248; x=1777686048; 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=oxYF7ui2BPFGy0dMMzZR3KyJQqUuOE+azCNCA95w7Vk=; b=aJvTVP9irXwPzHfYR8rRujCbjERMNfW0EkjAh7QkYALbudMRPNPX6ftxsiK5/fOG0c RqtfwStOZnxirqfIOhwSlWa8sZzTO7e0NMeg6ABZ+ClHUjjOLHDG37MjHDJ5dJlun/Bq 0aIfTDyexDM7/tNiIspzV6NsPdQsCog3OdAVXqoy8L13c4DH5az9hI6dl2QCZK1gSfZ8 udG176foGiGoJnzVE3sqh2xs9fhx1xZ4FIeMqBdmXNwh8RmTp+fbPRYDrCB+daWeh8ap lX+it7Oxg6BRh7f8ZHFf2F3mr9JyioXrap1keY2ZwHQ33PhN/30E6g2+4gOmq7+vl0JK 782w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1777081248; x=1777686048; 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=oxYF7ui2BPFGy0dMMzZR3KyJQqUuOE+azCNCA95w7Vk=; b=ik2tHkt9ZicVOxqBll47K2gztXsGAkgAWBFX7SSzBxnn+5HIm5n7Pvd5BwYumcAlid jz05CVlGKonIeoLeYMS+l7WrPAVKAEZ/IBCMmuODRxhunDx8hq4MEIBfeMYw7G4wy986 xlAwOuJnFY89Pmyb0laklpxEyTGYjqY8ksHx09fkpi6B5xCt2+9mJ1gz7qafHq1Pw3TN WO+Y/W1nDaoYfyup10YgGhf9aC90s28bQ0bExD/HUYByeCy/b91h9WoxXvTxepKX/ELZ 8OMPuGbCAFxBNZZ5lPnrcYUZAanyc7OaXHqN8+5WYNI6puIFoNzXFYj5+iTlPx0cF69N 3/Xw== X-Forwarded-Encrypted: i=1; AFNElJ/1jG8YS2ZBh4ut+uY/EQPSlAJI6FKRggfZnMXWePFuZBq0AY83VV+/zi8/uKllnEeW+rNQ0cnKY+AaEL0=@vger.kernel.org X-Gm-Message-State: AOJu0YxOUTGlCD8NnaTT4h8jc3u8lRUYrEk423dP1PCFelTEN4Q3QZCj ysjEOMGunh+sRodKlIODr/7WglkKE0y33k64P4olsMVxqb4dlbA2kjaP X-Gm-Gg: AeBDieuEZig34wyyynSnMAT+zi7zF6+/7rlAhNnn82djxi4SENkdgye48AM8xIN+w/p dWYcGjiFVJxM/u7txedEu9vZ2sPgSNbeeWt+Zug79M7fc8LJK7NU6GizGAs1vXqriG8V9LYk+YW Jve+rKkUlL/NMN9bwPDnq5gc7ws5XuhWJc4SOcE/HLutrd6W2C5nAvun/X9XqttwS1DN6LWv0fb 5XHwWrX/hvid17+yUUR9x4Yd/6mvnrr0rXUQeUbDrli4HSd6NfH38+WMP8UahDBrCHmTBG1o6yi T7YcsR303577HSgr8m6xNwcz5D0im4q2jmelsJ5u5Kv9kDIzWZv7LXeQHDAEJB3sYpf5ggZct3o TUzVhDGW3wD/j3PIyjzV16RGmvl87Nk4+WjZkI7T5gZw3T6e88BS74LampCK6uC0dpMVcfNs+CN rOgHUN2JWwx/9d55V4alarBJu2Nof/hg03MKQSkiwvDGwei8fhjjis1C1H6j/4acMgjqNnEPn1g /b5vLKYKXDahlhOzeNr/vCZlg== X-Received: by 2002:a05:6a20:6a0d:b0:398:9d1e:1c6 with SMTP id adf61e73a8af0-3a08d28d04fmr37529929637.0.1777081248013; Fri, 24 Apr 2026 18:40:48 -0700 (PDT) Received: from ryzen ([2601:644:8000:5b5d::8bd]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-c7976f0811fsm18694358a12.0.2026.04.24.18.40.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Apr 2026 18:40:47 -0700 (PDT) From: Rosen Penev To: linux-gpio@vger.kernel.org Cc: Emil Renner Berthing , Hal Feng , Linus Walleij , linux-kernel@vger.kernel.org (open list) Subject: [PATCH] pinctrl: starfive: jh7110: use struct_size Date: Fri, 24 Apr 2026 18:40:29 -0700 Message-ID: <20260425014029.438186-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 Instead of an extra kcalloc, Use a flexible array member to combine allocations. Saves a pointer in the struct. Signed-off-by: Rosen Penev --- drivers/pinctrl/starfive/pinctrl-starfive-jh7110.c | 12 +++++------- drivers/pinctrl/starfive/pinctrl-starfive-jh7110.h | 2 +- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/drivers/pinctrl/starfive/pinctrl-starfive-jh7110.c b/drivers/pinctrl/starfive/pinctrl-starfive-jh7110.c index e44480e71ea8..3572e8edd9f3 100644 --- a/drivers/pinctrl/starfive/pinctrl-starfive-jh7110.c +++ b/drivers/pinctrl/starfive/pinctrl-starfive-jh7110.c @@ -857,17 +857,15 @@ int jh7110_pinctrl_probe(struct platform_device *pdev) return -EINVAL; } +#if IS_ENABLED(CONFIG_PM_SLEEP) + sfp = devm_kzalloc(dev, struct_size(sfp, saved_regs, info->nsaved_regs), + GFP_KERNEL); +#else sfp = devm_kzalloc(dev, sizeof(*sfp), GFP_KERNEL); +#endif if (!sfp) return -ENOMEM; -#if IS_ENABLED(CONFIG_PM_SLEEP) - sfp->saved_regs = devm_kcalloc(dev, info->nsaved_regs, - sizeof(*sfp->saved_regs), GFP_KERNEL); - if (!sfp->saved_regs) - return -ENOMEM; -#endif - sfp->base = devm_platform_ioremap_resource(pdev, 0); if (IS_ERR(sfp->base)) return PTR_ERR(sfp->base); diff --git a/drivers/pinctrl/starfive/pinctrl-starfive-jh7110.h b/drivers/pinctrl/starfive/pinctrl-starfive-jh7110.h index 2da2d6858008..188fc9d96269 100644 --- a/drivers/pinctrl/starfive/pinctrl-starfive-jh7110.h +++ b/drivers/pinctrl/starfive/pinctrl-starfive-jh7110.h @@ -21,7 +21,7 @@ struct jh7110_pinctrl { /* register read/write mutex */ struct mutex mutex; const struct jh7110_pinctrl_soc_info *info; - u32 *saved_regs; + u32 saved_regs[]; }; struct jh7110_gpio_irq_reg { -- 2.54.0