Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752827AbcDASm6 (ORCPT ); Fri, 1 Apr 2016 14:42:58 -0400 Received: from gloria.sntech.de ([95.129.55.99]:58842 "EHLO gloria.sntech.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751927AbcDASm5 convert rfc822-to-8bit (ORCPT ); Fri, 1 Apr 2016 14:42:57 -0400 From: Heiko Stuebner To: Guodong Xu Cc: shawn.lin@rock-chips.com, jh80.chung@samsung.com, robh+dt@kernel.org, pawel.moll@arm.com, mark.rutland@arm.com, ijc+devicetree@hellion.org.uk, galak@codeaurora.org, ulf.hansson@linaro.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Xinwei Kong , Zhangfei Gao Subject: Re: [PATCH v3 2/2] mmc: dw_mmc: add resets support to dw_mmc Date: Fri, 01 Apr 2016 20:42:40 +0200 Message-ID: <5552254.5pm4SI4ary@phil> User-Agent: KMail/4.14.10 (Linux/4.3.0-1-amd64; KDE/4.14.14; x86_64; ; ) In-Reply-To: <1459322696-29919-3-git-send-email-guodong.xu@linaro.org> References: <1459322696-29919-1-git-send-email-guodong.xu@linaro.org> <1459322696-29919-3-git-send-email-guodong.xu@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8BIT Content-Type: text/plain; charset="iso-8859-1" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1477 Lines: 57 Am Mittwoch, 30. M?rz 2016, 15:24:56 schrieb Guodong Xu: [...] > @@ -2949,7 +2956,9 @@ int dw_mci_probe(struct dw_mci *host) > > if (!host->pdata) { > host->pdata = dw_mci_parse_dt(host); > - if (IS_ERR(host->pdata)) { > + if (PTR_ERR(host->pdata) == -EPROBE_DEFER) { > + return -EPROBE_DEFER; > + } else if (IS_ERR(host->pdata)) { how is this related to adding the reset handling? Making the driver handle probe deferral better should be a separate patch. > dev_err(host->dev, "platform data not available\n"); > return -EINVAL; > } > @@ -3012,6 +3021,9 @@ int dw_mci_probe(struct dw_mci *host) > } > } > > + if (!IS_ERR(host->pdata->rstc)) > + reset_control_deassert(host->pdata->rstc); > + Wouldn't reset_control_reset be better? The way it is now it would expect the reset to be asserted somewhere else before dw_mmc probes? > setup_timer(&host->cmd11_timer, > dw_mci_cmd11_timer, (unsigned long)host); > [...] > diff --git a/include/linux/mmc/dw_mmc.h b/include/linux/mmc/dw_mmc.h > index 7b41c6d..b95cd84 100644 > --- a/include/linux/mmc/dw_mmc.h > +++ b/include/linux/mmc/dw_mmc.h > @@ -14,9 +14,10 @@ > #ifndef LINUX_MMC_DW_MMC_H > #define LINUX_MMC_DW_MMC_H > > -#include > -#include > #include > +#include > +#include > +#include unrelated changed regarding the reordering of includes. Heiko