Hi, On Fri, Dec 09 2011, Seungwon Jeon wrote: > This patch adds another capabilities field for MMC_CAPS2_XXX. > > Signed-off-by: Seungwon Jeon <tgih.jun@xxxxxxxxxxx> > --- > drivers/mmc/host/dw_mmc.c | 6 ++++++ > include/linux/mmc/dw_mmc.h | 1 + > 2 files changed, 7 insertions(+), 0 deletions(-) > > diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c > index 3aaeb08..366df6b 100644 > --- a/drivers/mmc/host/dw_mmc.c > +++ b/drivers/mmc/host/dw_mmc.c > @@ -1681,6 +1681,12 @@ static int __init dw_mci_init_slot(struct dw_mci *host, unsigned int id) > else > mmc->caps = 0; > > + if (host->pdata->caps2) > + mmc->caps2 = host->pdata->caps2; > + else > + mmc->caps2 = 0; > + > + I think the else clause is unnecessary here (and above), so I'll suggest merging this patch to mmc-next for 3.3 and also adding: From: Chris Ball <cjb@xxxxxxxxxx> Subject: [PATCH] mmc: dw_mmc: Remove unnecessary else clauses. Signed-off-by: Chris Ball <cjb@xxxxxxxxxx> diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c index 69e5889..9b839fa 100644 --- a/drivers/mmc/host/dw_mmc.c +++ b/drivers/mmc/host/dw_mmc.c @@ -1678,14 +1678,9 @@ static int __init dw_mci_init_slot(struct dw_mci *host, unsigned int id) if (host->pdata->caps) mmc->caps = host->pdata->caps; - else - mmc->caps = 0; if (host->pdata->caps2) mmc->caps2 = host->pdata->caps2; - else - mmc->caps2 = 0; - if (host->pdata->get_bus_wd) if (host->pdata->get_bus_wd(slot->id) >= 4) Thanks, -- 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
