From patchwork Sat Feb 4 14:51:30 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rajendra Nayak X-Patchwork-Id: 6659 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 3283723E0E for ; Sat, 4 Feb 2012 14:52:06 +0000 (UTC) Received: from mail-iy0-f180.google.com (mail-iy0-f180.google.com [209.85.210.180]) by fiordland.canonical.com (Postfix) with ESMTP id ECD28A18095 for ; Sat, 4 Feb 2012 14:52:05 +0000 (UTC) Received: by mail-iy0-f180.google.com with SMTP id z7so8410368iab.11 for ; Sat, 04 Feb 2012 06:52:05 -0800 (PST) Received: by 10.42.177.133 with SMTP id bi5mr12689432icb.40.1328367125720; Sat, 04 Feb 2012 06:52:05 -0800 (PST) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.231.169.210 with SMTP id a18cs44993ibz; Sat, 4 Feb 2012 06:52:05 -0800 (PST) Received: by 10.236.139.193 with SMTP id c41mr16492391yhj.24.1328367121639; Sat, 04 Feb 2012 06:52:01 -0800 (PST) Received: from comal.ext.ti.com (comal.ext.ti.com. [198.47.26.152]) by mx.google.com with ESMTPS id s61si10121030yhn.62.2012.02.04.06.52.01 (version=TLSv1/SSLv3 cipher=OTHER); Sat, 04 Feb 2012 06:52:01 -0800 (PST) Received-SPF: neutral (google.com: 198.47.26.152 is neither permitted nor denied by best guess record for domain of a0131687@ula0131687) client-ip=198.47.26.152; Authentication-Results: mx.google.com; spf=neutral (google.com: 198.47.26.152 is neither permitted nor denied by best guess record for domain of a0131687@ula0131687) smtp.mail=a0131687@ula0131687 Received: from dbdp20.itg.ti.com ([172.24.170.38]) by comal.ext.ti.com (8.13.7/8.13.7) with ESMTP id q14EpspK005162; Sat, 4 Feb 2012 08:51:55 -0600 Received: from DBDE70.ent.ti.com (localhost [127.0.0.1]) by dbdp20.itg.ti.com (8.13.8/8.13.8) with ESMTP id q14EpntE018204; Sat, 4 Feb 2012 20:21:51 +0530 (IST) Received: from dbdp31.itg.ti.com (172.24.170.98) by dbde70.ent.ti.com (172.24.170.148) with Microsoft SMTP Server id 14.1.323.3; Sat, 4 Feb 2012 20:21:49 +0530 Received: from ula0131687 (h81-226.vpn.ti.com [172.24.81.226]) by dbdp31.itg.ti.com (8.13.8/8.13.8) with ESMTP id q14EpmmE009875; Sat, 4 Feb 2012 20:21:48 +0530 (IST) Received: from a0131687 by ula0131687 with local (Exim 4.72) (envelope-from ) id 1Rtgxt-0002ic-J5; Sat, 04 Feb 2012 20:21:45 +0530 From: Rajendra Nayak To: , , CC: , , , , , Rajendra Nayak Subject: [PATCH 6/6] mmc: omap_hsmmc: Don't expect MMC1 to always have vmmc supply Date: Sat, 4 Feb 2012 20:21:30 +0530 Message-ID: <1328367090-10402-7-git-send-email-rnayak@ti.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1328367090-10402-1-git-send-email-rnayak@ti.com> References: <1328367090-10402-1-git-send-email-rnayak@ti.com> MIME-Version: 1.0 MMC1 is not the only instance that can be used/wired for SD. So remove this assumption from the driver. Signed-off-by: Rajendra Nayak --- drivers/mmc/host/omap_hsmmc.c | 14 -------------- 1 files changed, 0 insertions(+), 14 deletions(-) diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c index 17e264b..97d3065 100644 --- a/drivers/mmc/host/omap_hsmmc.c +++ b/drivers/mmc/host/omap_hsmmc.c @@ -300,7 +300,6 @@ static int omap_hsmmc_set_power(struct device *dev, int slot, int power_on, static int omap_hsmmc_reg_get(struct omap_hsmmc_host *host) { struct regulator *reg; - int ret = 0; int ocr_value = 0; mmc_slot(host).set_power = omap_hsmmc_set_power; @@ -308,15 +307,6 @@ static int omap_hsmmc_reg_get(struct omap_hsmmc_host *host) reg = regulator_get(host->dev, "vmmc"); if (IS_ERR(reg)) { dev_dbg(host->dev, "vmmc regulator missing\n"); - /* - * HACK: until fixed.c regulator is usable, - * we don't require a main regulator - * for MMC2 or MMC3 - */ - if (host->id == OMAP_MMC1_DEVID) { - ret = PTR_ERR(reg); - goto err; - } } else { host->vcc = reg; ocr_value = mmc_regulator_get_ocrmask(reg); @@ -358,10 +348,6 @@ static int omap_hsmmc_reg_get(struct omap_hsmmc_host *host) } return 0; - -err: - mmc_slot(host).set_power = NULL; - return ret; } static void omap_hsmmc_reg_put(struct omap_hsmmc_host *host)