From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752507AbbCXMIa (ORCPT ); Tue, 24 Mar 2015 08:08:30 -0400 Received: from metis.ext.pengutronix.de ([92.198.50.35]:44450 "EHLO metis.ext.pengutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752035AbbCXMI2 (ORCPT ); Tue, 24 Mar 2015 08:08:28 -0400 From: Markus Pargmann To: Mark Brown Cc: Liam Girdwood , Wolfram Sang , kernel@pengutronix.de, linux-kernel@vger.kernel.org, Markus Pargmann Subject: [PATCH 1/2] regulator: max8660: Remove boot_on handling Date: Tue, 24 Mar 2015 13:08:02 +0100 Message-Id: <1427198883-6577-1-git-send-email-mpa@pengutronix.de> X-Mailer: git-send-email 2.1.4 X-SA-Exim-Connect-IP: 2001:67c:670:100:1d::7 X-SA-Exim-Mail-From: mpa@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-kernel@vger.kernel.org Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org boot_on is handled by the regulator core. It will call enable() on the regulators that are specified to be boot_on. So we don't require any additional handling in this driver Signed-off-by: Markus Pargmann --- drivers/regulator/max8660.c | 22 ++-------------------- 1 file changed, 2 insertions(+), 20 deletions(-) diff --git a/drivers/regulator/max8660.c b/drivers/regulator/max8660.c index 7eee2ca18541..32cf277a7662 100644 --- a/drivers/regulator/max8660.c +++ b/drivers/regulator/max8660.c @@ -385,7 +385,7 @@ static int max8660_probe(struct i2c_client *client, struct max8660_platform_data *pdata = dev_get_platdata(dev); struct regulator_config config = { }; struct max8660 *max8660; - int boot_on, i, id, ret = -EINVAL; + int i, id, ret = -EINVAL; struct device_node *of_node[MAX8660_V_END]; unsigned long type; @@ -441,39 +441,21 @@ static int max8660_probe(struct i2c_client *client, max8660->shadow_regs[MAX8660_MDTV2] = 0x04; for (i = 0; i < pdata->num_subdevs; i++) { - if (!pdata->subdevs[i].platform_data) - return ret; - - boot_on = pdata->subdevs[i].platform_data->constraints.boot_on; + return -EINVAL; switch (pdata->subdevs[i].id) { case MAX8660_V3: - if (boot_on) - max8660->shadow_regs[MAX8660_OVER1] |= 1; - break; - case MAX8660_V4: - if (boot_on) - max8660->shadow_regs[MAX8660_OVER1] |= 4; - break; - case MAX8660_V5: - break; - case MAX8660_V6: - if (boot_on) - max8660->shadow_regs[MAX8660_OVER2] |= 2; break; - case MAX8660_V7: if (type == MAX8661) { dev_err(dev, "Regulator not on this chip!\n"); return -EINVAL; } - if (boot_on) - max8660->shadow_regs[MAX8660_OVER2] |= 4; break; default: -- 2.1.4