Hi, Chris, I have reworked it and send it to the maillist, please review it. > -----Original Message----- > From: linux-mmc-owner@xxxxxxxxxxxxxxx [mailto:linux-mmc- > owner@xxxxxxxxxxxxxxx] On Behalf Of Chris Ball > Sent: Monday, February 06, 2012 7:20 PM > To: Jaehoon Chung > Cc: linux-mmc; linux-samsung-soc@xxxxxxxxxxxxxxx; Kyungmin Park; 'kgene > kim'; Girish K S > Subject: Re: [PATCH v3 2/2] mmc: sdhci-s3c: add platform data for the > second capability > > Hi, > > On Mon, Feb 06 2012, Jaehoon Chung wrote: > > This patch is added host_caps2 in sdhci-s3c.c It's necessary that use > > the second capabilities. > > And removed the duplicated host_caps. > > > > Signed-off-by: Jaehoon Chung <jh80.chung@xxxxxxxxxxx> > > Signed-off-by: Kyungmin Park <kyungmin.park@xxxxxxxxxxx> > > --- > > Changelog v3: > > - based-on latest mmc-next tree > > Changelog v2: > > - remove the duplicated host_caps. > > > > drivers/mmc/host/sdhci-s3c.c | 6 +++--- > > 1 files changed, 3 insertions(+), 3 deletions(-) > > > > diff --git a/drivers/mmc/host/sdhci-s3c.c > > b/drivers/mmc/host/sdhci-s3c.c index d065e37..46b9782 100644 > > --- a/drivers/mmc/host/sdhci-s3c.c > > +++ b/drivers/mmc/host/sdhci-s3c.c > > @@ -521,9 +521,6 @@ static int __devinit sdhci_s3c_probe(struct > platform_device *pdev) > > if (pdata->cd_type == S3C_SDHCI_CD_PERMANENT) > > host->mmc->caps = MMC_CAP_NONREMOVABLE; > > > > - if (pdata->host_caps) > > - host->mmc->caps |= pdata->host_caps; > > - > > if (pdata->pm_caps) > > host->mmc->pm_caps |= pdata->pm_caps; > > > > @@ -547,6 +544,9 @@ static int __devinit sdhci_s3c_probe(struct > platform_device *pdev) > > if (pdata->host_caps) > > host->mmc->caps |= pdata->host_caps; > > > > + if (pdata->host_caps2) > > + host->mmc->caps2 |= pdata->host_caps2; > > + > > ret = sdhci_add_host(host); > > if (ret) { > > dev_err(dev, "sdhci_add_host() failed\n"); > > In case you'd rather merge both of these via the samsung-soc tree: > > Acked-by: Chris Ball <cjb@xxxxxxxxxx> > > - Chris. > -- > Chris Ball <cjb@xxxxxxxxxx> <http://printf.net/> > One Laptop Per Child > -- > To unsubscribe from this list: send the line "unsubscribe linux-mmc" in > the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at > http://vger.kernel.org/majordomo-info.html -- To unsubscribe from this list: send the line "unsubscribe linux-mmc" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
