From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1162001AbcBRAfV (ORCPT ); Wed, 17 Feb 2016 19:35:21 -0500 Received: from mailout3.w1.samsung.com ([210.118.77.13]:21796 "EHLO mailout3.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1161084AbcBRAfT (ORCPT ); Wed, 17 Feb 2016 19:35:19 -0500 X-AuditID: cbfec7f4-f79026d00000418a-af-56c511c490eb From: Krzysztof Kozlowski To: Sangbeom Kim , Krzysztof Kozlowski , Liam Girdwood , Mark Brown , linux-kernel@vger.kernel.org, linux-samsung-soc@vger.kernel.org Cc: jacob.e.keller@intel.com, Arnd Bergmann Subject: [PATCH v2] regulator: s2mps11: Simplify expression used in BUILD_BUG_ON Date: Thu, 18 Feb 2016 09:35:07 +0900 Message-id: <1455755707-16844-1-git-send-email-k.kozlowski@samsung.com> X-Mailer: git-send-email 2.5.0 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFmplluLIzCtJLcpLzFFi42I5/e/4Nd0jgkfDDFYdMLD4O+kYu8XUh0/Y LE4cW8hi8fqFocW3Kx1MFpd3zWGzmHF+H5PFxRVfmBw4PH7/msTosXPWXXaPxXteMnlsWtXJ 5tG3ZRWjx+dNcgFsUVw2Kak5mWWpRfp2CVwZ00+9YCl4JlRx+OpR5gbGLoEuRk4OCQETiX0L ZjBC2GISF+6tZ+ti5OIQEljKKHHz/msWCOc/o8TB0/fYQarYBIwlNi9fAlYlIvAIKLHpPxtI glnAWqKtYQcriC0sECBxd+1nFhCbRUBVYvfkh2A1vALuEqdPfmLuYuQAWicnseBC+gRG7gWM DKsYRVNLkwuKk9JzDfWKE3OLS/PS9ZLzczcxQgLnyw7GxcesDjEKcDAq8fByvD4SJsSaWFZc mXuIUYKDWUmE15fvaJgQb0piZVVqUX58UWlOavEhRmkOFiVx3rm73ocICaQnlqRmp6YWpBbB ZJk4OKUaGKftW/dt2RePe8urT9/S+798uvanB/OE2t+t77+iUXVQpGyhvp/Mij+LlQIf+eWb 5/HO7XForqrN+NGya7a6gu+9YuZfmwx3LK5d3chiZFwll8adefbG0Rvm6jKfP/ybHP60+MHV oxLrF67XKbu5tJp1g/l+87bU7Hv/uwzUirU7BD8+i6pR9FRiKc5INNRiLipOBABfqaX+GAIA AA== Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Following BUILD_BUG_ON using a variable fails for some of the compilers and optimization levels (reported for gcc 4.9): var = ARRAY_SIZE(s2mps15_regulators); BUILD_BUG_ON(S2MPS_REGULATOR_MAX < var); Fix this by using ARRAY_SIZE directly. Additionally add missing BUILD_BUG_ON check for S2MPS15 device (the check ensures that internal arrays are big enough to hold data for all of regulators on all devices). Reported-by: Arnd Bergmann Signed-off-by: Krzysztof Kozlowski --- Changes since v1: 1. Rewritten description after comments from Jacob. See results when UBSAN is enabled: http://arm-soc.lixom.net/buildlogs/arm-soc/v4.5-rc4-39-g0d7baf0/buildall.arm.exynos_defconfig.log.failed --- drivers/regulator/s2mps11.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/drivers/regulator/s2mps11.c b/drivers/regulator/s2mps11.c index 3242ffc0cb25..df553fb40d82 100644 --- a/drivers/regulator/s2mps11.c +++ b/drivers/regulator/s2mps11.c @@ -1090,26 +1090,27 @@ static int s2mps11_pmic_probe(struct platform_device *pdev) case S2MPS11X: s2mps11->rdev_num = ARRAY_SIZE(s2mps11_regulators); regulators = s2mps11_regulators; - BUILD_BUG_ON(S2MPS_REGULATOR_MAX < s2mps11->rdev_num); + BUILD_BUG_ON(S2MPS_REGULATOR_MAX < ARRAY_SIZE(s2mps11_regulators)); break; case S2MPS13X: s2mps11->rdev_num = ARRAY_SIZE(s2mps13_regulators); regulators = s2mps13_regulators; - BUILD_BUG_ON(S2MPS_REGULATOR_MAX < s2mps11->rdev_num); + BUILD_BUG_ON(S2MPS_REGULATOR_MAX < ARRAY_SIZE(s2mps13_regulators)); break; case S2MPS14X: s2mps11->rdev_num = ARRAY_SIZE(s2mps14_regulators); regulators = s2mps14_regulators; - BUILD_BUG_ON(S2MPS_REGULATOR_MAX < s2mps11->rdev_num); + BUILD_BUG_ON(S2MPS_REGULATOR_MAX < ARRAY_SIZE(s2mps14_regulators)); break; case S2MPS15X: s2mps11->rdev_num = ARRAY_SIZE(s2mps15_regulators); regulators = s2mps15_regulators; + BUILD_BUG_ON(S2MPS_REGULATOR_MAX < ARRAY_SIZE(s2mps15_regulators)); break; case S2MPU02: s2mps11->rdev_num = ARRAY_SIZE(s2mpu02_regulators); regulators = s2mpu02_regulators; - BUILD_BUG_ON(S2MPS_REGULATOR_MAX < s2mps11->rdev_num); + BUILD_BUG_ON(S2MPS_REGULATOR_MAX < ARRAY_SIZE(s2mpu02_regulators)); break; default: dev_err(&pdev->dev, "Invalid device type: %u\n", -- 2.5.0