From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933775AbcBQILU (ORCPT ); Wed, 17 Feb 2016 03:11:20 -0500 Received: from mailout3.w1.samsung.com ([210.118.77.13]:41379 "EHLO mailout3.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932574AbcBQILS (ORCPT ); Wed, 17 Feb 2016 03:11:18 -0500 X-AuditID: cbfec7f5-f79b16d000005389-b3-56c42b23ed8f From: Krzysztof Kozlowski To: Sangbeom Kim , Krzysztof Kozlowski , Liam Girdwood , Mark Brown , linux-kernel@vger.kernel.org, linux-samsung-soc@vger.kernel.org Cc: Arnd Bergmann Subject: [RFT] regulator: s2mps11: Simplify expression used in BUILD_BUG_ON for some of preprocessors Date: Wed, 17 Feb 2016 17:10:53 +0900 Message-id: <1455696653-27023-1-git-send-email-k.kozlowski@samsung.com> X-Mailer: git-send-email 2.5.0 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrNJMWRmVeSWpSXmKPExsVy+t/xq7rK2kfCDDb8tLL4O+kYu8XUh0/Y LF6/MLT4dqWDyeLyrjlsFjPO72OyuLjiC5MDu8fvX5MYPXbOusvusWlVJ5tH35ZVjB6fN8kF sEZx2aSk5mSWpRbp2yVwZRy//o6t4Ltgxaq/x1gbGNfzdzFyckgImEjs3fKKBcIWk7hwbz1b FyMXh5DAUkaJx4v+sEI4/xklfu9+ygRSxSZgLLF5+RKwKhGBR4wSBzf9ZwNJMAsoSnRt/cIM YgsLpEtc6tkHZrMIqEq0330NVsMr4C5x80ArUJwDaJ2cxIIL6RMYuRcwMqxiFE0tTS4oTkrP NdIrTswtLs1L10vOz93ECAmSrzsYlx6zOsQowMGoxMO7IutwmBBrYllxZe4hRgkOZiUR3rfK R8KEeFMSK6tSi/Lji0pzUosPMUpzsCiJ887c9T5ESCA9sSQ1OzW1ILUIJsvEwSnVwBjSJcUW zXuP6dY0Pj/fhIRGmdIeHkEX1cw9atO1HNdO3vRn2ZFjHBHPVd8+cg6X/utRGeGQv3L2Od25 5vv0H83L+rGKT8hvoqLHjzX350T/zpLYL1TdxHCI96tKjJxIp5BreI+d8JIjaTm7ZA2N6xmC Ni1/eZJl5pHvDmxmBfsNzvF8lt33QomlOCPRUIu5qDgRABrnsFQOAgAA Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Apparently some preprocessors have problems with interpreting BUILD_BUG_ON such as: var = ARRAY_SIZE(s2mps15_regulators); BUILD_BUG_ON(S2MPS_REGULATOR_MAX < var); so let make it more obvious for them. 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 --- 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