Hi,
On Thu, Dec 22 2011, Seungwon Jeon wrote:
> This patch adds caps2 filed for second capability in dw_mmc.
> It corresponds with MMC_CAPS2_XXX. And this patch removes the
> unnecessary condition statement for assigning caps.
>
> 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, 3 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c
> index 3aaeb08..3f5a77a 100644
> --- a/drivers/mmc/host/dw_mmc.c
> +++ b/drivers/mmc/host/dw_mmc.c
> @@ -1676,10 +1676,8 @@ static int __init dw_mci_init_slot(struct dw_mci *host, unsigned int id)
> if (host->pdata->setpower)
> host->pdata->setpower(id, 0);
>
> - if (host->pdata->caps)
> - mmc->caps = host->pdata->caps;
> - else
> - mmc->caps = 0;
> + mmc->caps |= host->pdata->caps;
> + mmc->caps2 |= host->pdata->caps2;
Ah, I replied earlier without having seen this patch. I still prefer
the version I proposed, which doesn't dereference host->pdata->caps{,2}
without testing it first.
- 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
