Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S936167AbcCQOFe (ORCPT ); Thu, 17 Mar 2016 10:05:34 -0400 Received: from relay4-d.mail.gandi.net ([217.70.183.196]:57569 "EHLO relay4-d.mail.gandi.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753066AbcCQOFb (ORCPT ); Thu, 17 Mar 2016 10:05:31 -0400 From: Maarten ter Huurne To: Mark Brown Cc: Zubair Lutfullah Kakakhel , linux-kernel@vger.kernel.org, Maarten ter Huurne Subject: [PATCH v2 2/4] regulator: act8865: Remove "too many regulators" error handler Date: Thu, 17 Mar 2016 15:05:06 +0100 Message-Id: <1458223508-20740-2-git-send-email-maarten@treewalker.org> X-Mailer: git-send-email 2.6.2 In-Reply-To: <1458223508-20740-1-git-send-email-maarten@treewalker.org> References: <1458223508-20740-1-git-send-email-maarten@treewalker.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1256 Lines: 36 The check would dereference pdata, which can be NULL in the non-DT use case. Nothing will break if pdata->num_regulators is larger than the number of regulators that the driver defines: pdata->num_regulators is only read in act8865_get_init_data() to iterate through pdata->regulators. The error handler might have some value as a sanity check on the platform data, but the platform data could be broken in many other ways that are not checked for (unknown IDs, duplicate IDs), so I see no reason to perform only this specific check. Signed-off-by: Maarten ter Huurne --- drivers/regulator/act8865-regulator.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/drivers/regulator/act8865-regulator.c b/drivers/regulator/act8865-regulator.c index 89f856f..69cdad0 100644 --- a/drivers/regulator/act8865-regulator.c +++ b/drivers/regulator/act8865-regulator.c @@ -485,12 +485,6 @@ static int act8865_pmic_probe(struct i2c_client *client, pdata = &pdata_of; } - if (pdata->num_regulators > num_regulators) { - dev_err(dev, "too many regulators: %d\n", - pdata->num_regulators); - return -EINVAL; - } - act8865 = devm_kzalloc(dev, sizeof(struct act8865), GFP_KERNEL); if (!act8865) return -ENOMEM; -- 2.6.2