From patchwork Wed Jul 29 11:09:33 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kishon Vijay Abraham I X-Patchwork-Id: 6893321 Return-Path: X-Original-To: patchwork-linux-mmc@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id B1085C05AC for ; Wed, 29 Jul 2015 11:15:50 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id DF98C20379 for ; Wed, 29 Jul 2015 11:15:49 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 01FA72034A for ; Wed, 29 Jul 2015 11:15:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753441AbbG2LKf (ORCPT ); Wed, 29 Jul 2015 07:10:35 -0400 Received: from devils.ext.ti.com ([198.47.26.153]:59322 "EHLO devils.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752727AbbG2LKd (ORCPT ); Wed, 29 Jul 2015 07:10:33 -0400 Received: from dlelxv90.itg.ti.com ([172.17.2.17]) by devils.ext.ti.com (8.13.7/8.13.7) with ESMTP id t6TBA94r012557; Wed, 29 Jul 2015 06:10:09 -0500 Received: from DLEE71.ent.ti.com (dlee71.ent.ti.com [157.170.170.114]) by dlelxv90.itg.ti.com (8.14.3/8.13.8) with ESMTP id t6TBA9EC009594; Wed, 29 Jul 2015 06:10:09 -0500 Received: from dlep32.itg.ti.com (157.170.170.100) by DLEE71.ent.ti.com (157.170.170.114) with Microsoft SMTP Server id 14.3.224.2; Wed, 29 Jul 2015 06:10:09 -0500 Received: from a0393678ub.india.ti.com (ileax41-snat.itg.ti.com [10.172.224.153]) by dlep32.itg.ti.com (8.14.3/8.13.8) with ESMTP id t6TB9tYA016672; Wed, 29 Jul 2015 06:10:06 -0500 From: Kishon Vijay Abraham I To: , , , , , , , CC: , Subject: [PATCH 03/17] mmc: host: omap_hsmmc: cleanup omap_hsmmc_reg_get() Date: Wed, 29 Jul 2015 16:39:33 +0530 Message-ID: <1438168187-1614-4-git-send-email-kishon@ti.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1438168187-1614-1-git-send-email-kishon@ti.com> References: <1438168187-1614-1-git-send-email-kishon@ti.com> MIME-Version: 1.0 Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org X-Spam-Status: No, score=-8.3 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP No functional change. Instead of using a local regulator variable in omap_hsmmc_reg_get() for holding the return value of devm_regulator_get_optional() and then assigning to omap_hsmmc_host regulator members: vcc, vcc_aux and pbias, directly use the omap_hsmmc_host regulator members. Signed-off-by: Kishon Vijay Abraham I Reviewed-by: Roger Quadros --- drivers/mmc/host/omap_hsmmc.c | 38 ++++++++++++++++---------------------- 1 file changed, 16 insertions(+), 22 deletions(-) diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c index 7f7625d..a78e15e 100644 --- a/drivers/mmc/host/omap_hsmmc.c +++ b/drivers/mmc/host/omap_hsmmc.c @@ -341,19 +341,17 @@ error_set_power: static int omap_hsmmc_reg_get(struct omap_hsmmc_host *host) { - struct regulator *reg; int ocr_value = 0; - reg = devm_regulator_get_optional(host->dev, "vmmc"); - if (IS_ERR(reg)) { - if (PTR_ERR(reg) == -EPROBE_DEFER) + host->vcc = devm_regulator_get_optional(host->dev, "vmmc"); + if (IS_ERR(host->vcc)) { + if (PTR_ERR(host->vcc) == -EPROBE_DEFER) return -EPROBE_DEFER; - host->vcc = NULL; dev_dbg(host->dev, "unable to get vmmc regulator %ld\n", - PTR_ERR(reg)); + PTR_ERR(host->vcc)); + host->vcc = NULL; } else { - host->vcc = reg; - ocr_value = mmc_regulator_get_ocrmask(reg); + ocr_value = mmc_regulator_get_ocrmask(host->vcc); if (!mmc_pdata(host)->ocr_mask) { mmc_pdata(host)->ocr_mask = ocr_value; } else { @@ -368,26 +366,22 @@ static int omap_hsmmc_reg_get(struct omap_hsmmc_host *host) mmc_pdata(host)->set_power = omap_hsmmc_set_power; /* Allow an aux regulator */ - reg = devm_regulator_get_optional(host->dev, "vmmc_aux"); - if (IS_ERR(reg)) { - if (PTR_ERR(reg) == -EPROBE_DEFER) + host->vcc_aux = devm_regulator_get_optional(host->dev, "vmmc_aux"); + if (IS_ERR(host->vcc_aux)) { + if (PTR_ERR(host->vcc_aux) == -EPROBE_DEFER) return -EPROBE_DEFER; - host->vcc_aux = NULL; dev_dbg(host->dev, "unable to get vmmc_aux regulator %ld\n", - PTR_ERR(reg)); - } else { - host->vcc_aux = reg; + PTR_ERR(host->vcc_aux)); + host->vcc_aux = NULL; } - reg = devm_regulator_get_optional(host->dev, "pbias"); - if (IS_ERR(reg)) { - if (PTR_ERR(reg) == -EPROBE_DEFER) + host->pbias = devm_regulator_get_optional(host->dev, "pbias"); + if (IS_ERR(host->pbias)) { + if (PTR_ERR(host->pbias) == -EPROBE_DEFER) return -EPROBE_DEFER; - host->pbias = NULL; dev_dbg(host->dev, "unable to get pbias regulator %ld\n", - PTR_ERR(reg)); - } else { - host->pbias = reg; + PTR_ERR(host->pbias)); + host->pbias = NULL; } /* For eMMC do not power off when not in sleep state */