From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755211Ab2BFNBU (ORCPT ); Mon, 6 Feb 2012 08:01:20 -0500 Received: from mail-pw0-f46.google.com ([209.85.160.46]:45410 "EHLO mail-pw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754944Ab2BFNBT (ORCPT ); Mon, 6 Feb 2012 08:01:19 -0500 Message-ID: <1328533274.4535.5.camel@phoenix> Subject: [PATCH RESEND] regulator: Remove redundant regmap_update_bits call for TPS65023_REG_CON_CTRL2 From: Axel Lin To: linux-kernel@vger.kernel.org Cc: Marcus Folkesson , Anuj Aggarwal , Mark Brown , Liam Girdwood Date: Mon, 06 Feb 2012 21:01:14 +0800 Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.2.1- Content-Transfer-Encoding: 7bit Mime-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This looks like a merge mistake. Calling regmap_update_bits once is enough. Signed-off-by: Axel Lin --- This resend fix a typo in the prefix of the subject. drivers/regulator/tps65023-regulator.c | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/drivers/regulator/tps65023-regulator.c b/drivers/regulator/tps65023-regulator.c index 18d61a0..43e4902 100644 --- a/drivers/regulator/tps65023-regulator.c +++ b/drivers/regulator/tps65023-regulator.c @@ -491,10 +491,6 @@ static int __devinit tps_65023_probe(struct i2c_client *client, regmap_update_bits(tps->regmap, TPS65023_REG_CON_CTRL2, TPS65023_REG_CTRL2_CORE_ADJ, TPS65023_REG_CTRL2_CORE_ADJ); - /* Enable setting output voltage by I2C */ - regmap_update_bits(tps->regmap, TPS65023_REG_CON_CTRL2, - TPS65023_REG_CTRL2_CORE_ADJ, TPS65023_REG_CTRL2_CORE_ADJ); - return 0; fail: -- 1.7.5.4