From mboxrd@z Thu Jan 1 00:00:00 1970 From: fabio.estevam@freescale.com (Fabio Estevam) Date: Fri, 15 Jun 2012 14:23:05 -0300 Subject: [PATCH 2/4] mmc: sdhci-esdhc-imx: Remove unneeded '#ifdef CONFIG_OF' In-Reply-To: <1339780987-11063-1-git-send-email-fabio.estevam@freescale.com> References: <1339780987-11063-1-git-send-email-fabio.estevam@freescale.com> Message-ID: <1339780987-11063-2-git-send-email-fabio.estevam@freescale.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org CONFIG_OF is always selected for imx SoCs so it is safe to drop the '#ifdef CONFIG_OF'. Cc: Chris Ball Cc: Signed-off-by: Fabio Estevam --- drivers/mmc/host/sdhci-esdhc-imx.c | 9 --------- 1 files changed, 0 insertions(+), 9 deletions(-) diff --git a/drivers/mmc/host/sdhci-esdhc-imx.c b/drivers/mmc/host/sdhci-esdhc-imx.c index ebbe984..1b0c999 100644 --- a/drivers/mmc/host/sdhci-esdhc-imx.c +++ b/drivers/mmc/host/sdhci-esdhc-imx.c @@ -397,7 +397,6 @@ static irqreturn_t cd_irq(int irq, void *data) return IRQ_HANDLED; }; -#ifdef CONFIG_OF static int __devinit sdhci_esdhc_imx_probe_dt(struct platform_device *pdev, struct esdhc_platform_data *boarddata) @@ -426,14 +425,6 @@ sdhci_esdhc_imx_probe_dt(struct platform_device *pdev, return 0; } -#else -static inline int -sdhci_esdhc_imx_probe_dt(struct platform_device *pdev, - struct esdhc_platform_data *boarddata) -{ - return -ENODEV; -} -#endif static int __devinit sdhci_esdhc_imx_probe(struct platform_device *pdev) { -- 1.7.1