From patchwork Mon May 9 20:11:09 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Antonio Ospite X-Patchwork-Id: 770782 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter2.kernel.org (8.14.4/8.14.3) with ESMTP id p49KBOjC008931 for ; Mon, 9 May 2011 20:11:25 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754381Ab1EIULY (ORCPT ); Mon, 9 May 2011 16:11:24 -0400 Received: from smtp207.alice.it ([82.57.200.103]:44387 "EHLO smtp207.alice.it" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752413Ab1EIULX (ORCPT ); Mon, 9 May 2011 16:11:23 -0400 Received: from jcn (82.60.124.22) by smtp207.alice.it (8.5.124.08) id 4DB1388701A3D155; Mon, 9 May 2011 22:11:22 +0200 Received: from ao2 by jcn with local (Exim 4.75) (envelope-from ) id 1QJWnY-0005Fj-7m; Mon, 09 May 2011 22:11:20 +0200 From: Antonio Ospite To: linux-mmc@vger.kernel.org Cc: Antonio Ospite , Chris Ball , Mark Brown , openezx-devel@lists.openezx.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH] pxamci: remove an ifdef about CONFIG_REGULATOR Date: Mon, 9 May 2011 22:11:09 +0200 Message-Id: <1304971869-20161-1-git-send-email-ospite@studenti.unina.it> X-Mailer: git-send-email 1.7.5.1 X-Face: z*RaLf`X<@C75u6Ig9}{oW$H; 1_\2t5)({*|jhM/Vb; ]yA5\I~93>J<_`<4)A{':UrE Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter2.kernel.org [140.211.167.43]); Mon, 09 May 2011 20:11:25 +0000 (UTC) Don't wrap regulator_get() inside an #ifdef CONFIG_REGULATOR anymore, as now (since be1a50d) it correctly degenerates and returns NULL when the regulator framework is disabled. Signed-off-by: Antonio Ospite Acked-by: Mark Brown Reviewed-by: Mark Brown --- This comes after the discussion at http://www.mail-archive.com/linux-mmc@vger.kernel.org/msg07443.html and following. Regards, Antonio Ospite http://ao2.it drivers/mmc/host/pxamci.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/drivers/mmc/host/pxamci.c b/drivers/mmc/host/pxamci.c index 7257738..07e1f22 100644 --- a/drivers/mmc/host/pxamci.c +++ b/drivers/mmc/host/pxamci.c @@ -79,7 +79,6 @@ struct pxamci_host { static inline void pxamci_init_ocr(struct pxamci_host *host) { -#ifdef CONFIG_REGULATOR host->vcc = regulator_get(mmc_dev(host->mmc), "vmmc"); if (IS_ERR(host->vcc)) @@ -90,7 +89,7 @@ static inline void pxamci_init_ocr(struct pxamci_host *host) dev_warn(mmc_dev(host->mmc), "ocr_mask/setpower will not be used\n"); } -#endif + if (host->vcc == NULL) { /* fall-back to platform data */ host->mmc->ocr_avail = host->pdata ?